diff --git a/YuMi.xcodeproj/project.pbxproj b/YuMi.xcodeproj/project.pbxproj index 2b453a36..a4241ec3 100644 --- a/YuMi.xcodeproj/project.pbxproj +++ b/YuMi.xcodeproj/project.pbxproj @@ -303,6 +303,7 @@ 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 */; }; 23D8DEF22AC5633300644637 /* PIIAPRegulate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23D8DEF12AC5633300644637 /* PIIAPRegulate.swift */; }; 23E45C052AC2B0A200D88BCA /* SessionDiscoverNewTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E45C042AC2B0A200D88BCA /* SessionDiscoverNewTableViewCell.m */; }; 23E9E9972A80C3A100B792F2 /* XPMineGuildPersonalBillRecordVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E9E9942A80C39F00B792F2 /* XPMineGuildPersonalBillRecordVC.m */; }; @@ -2028,6 +2029,8 @@ 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 = ""; }; 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 = ""; }; @@ -5968,6 +5971,8 @@ 9BA812D728BF538E00783EA7 /* Presenter */, 9BA812D428BF52E100783EA7 /* XPRoomSendRedPacketViewController.h */, 9BA812D528BF52E100783EA7 /* XPRoomSendRedPacketViewController.m */, + 23D321E32ADFE900006B259C /* PIRoomSendRedPacketVC.h */, + 23D321E42ADFE900006B259C /* PIRoomSendRedPacketVC.m */, 9BA812E228BF70A600783EA7 /* XPRoomRedPacketPwdView.h */, 9BA812E328BF70A600783EA7 /* XPRoomRedPacketPwdView.m */, 9B42868C28C1AE2D009034D2 /* XPReceiveRedPacketView.h */, @@ -10568,6 +10573,7 @@ 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 */, diff --git a/YuMi/Assets.xcassets/yna/RedPacket/redPacket_entrance.imageset/Contents.json b/YuMi/Assets.xcassets/yna/RedPacket/pi_red_packet_icon_logo.imageset/Contents.json similarity index 71% rename from YuMi/Assets.xcassets/yna/RedPacket/redPacket_entrance.imageset/Contents.json rename to YuMi/Assets.xcassets/yna/RedPacket/pi_red_packet_icon_logo.imageset/Contents.json index 1d8af2b3..6471939d 100644 --- a/YuMi/Assets.xcassets/yna/RedPacket/redPacket_entrance.imageset/Contents.json +++ b/YuMi/Assets.xcassets/yna/RedPacket/pi_red_packet_icon_logo.imageset/Contents.json @@ -1,15 +1,16 @@ { "images" : [ { - "filename" : "redPacket_entrance.png", "idiom" : "universal", "scale" : "1x" }, { + "filename" : "pi_red_packet_icon_logo@2x.png", "idiom" : "universal", "scale" : "2x" }, { + "filename" : "pi_red_packet_icon_logo@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/YuMi/Assets.xcassets/yna/RedPacket/pi_red_packet_icon_logo.imageset/pi_red_packet_icon_logo@2x.png b/YuMi/Assets.xcassets/yna/RedPacket/pi_red_packet_icon_logo.imageset/pi_red_packet_icon_logo@2x.png new file mode 100644 index 00000000..7c2811fe Binary files /dev/null and b/YuMi/Assets.xcassets/yna/RedPacket/pi_red_packet_icon_logo.imageset/pi_red_packet_icon_logo@2x.png differ diff --git a/YuMi/Assets.xcassets/yna/RedPacket/pi_red_packet_icon_logo.imageset/pi_red_packet_icon_logo@3x.png b/YuMi/Assets.xcassets/yna/RedPacket/pi_red_packet_icon_logo.imageset/pi_red_packet_icon_logo@3x.png new file mode 100644 index 00000000..98c1ffd3 Binary files /dev/null and b/YuMi/Assets.xcassets/yna/RedPacket/pi_red_packet_icon_logo.imageset/pi_red_packet_icon_logo@3x.png differ diff --git a/YuMi/Assets.xcassets/yna/RedPacket/redPacket_entrance.imageset/redPacket_entrance.png b/YuMi/Assets.xcassets/yna/RedPacket/redPacket_entrance.imageset/redPacket_entrance.png deleted file mode 100644 index 51b7d2e9..00000000 Binary files a/YuMi/Assets.xcassets/yna/RedPacket/redPacket_entrance.imageset/redPacket_entrance.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/yna/RedPacket/redPacket_msg_icon.imageset/Contents.json b/YuMi/Assets.xcassets/yna/RedPacket/redPacket_msg_icon.imageset/Contents.json deleted file mode 100644 index af388111..00000000 --- a/YuMi/Assets.xcassets/yna/RedPacket/redPacket_msg_icon.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "redPacket_msg_icon@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "redPacket_msg_icon@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/YuMi/Assets.xcassets/yna/RedPacket/redPacket_msg_icon.imageset/redPacket_msg_icon@2x.png b/YuMi/Assets.xcassets/yna/RedPacket/redPacket_msg_icon.imageset/redPacket_msg_icon@2x.png deleted file mode 100644 index 9ab64756..00000000 Binary files a/YuMi/Assets.xcassets/yna/RedPacket/redPacket_msg_icon.imageset/redPacket_msg_icon@2x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/yna/RedPacket/redPacket_msg_icon.imageset/redPacket_msg_icon@3x.png b/YuMi/Assets.xcassets/yna/RedPacket/redPacket_msg_icon.imageset/redPacket_msg_icon@3x.png deleted file mode 100644 index 3d0c66bd..00000000 Binary files a/YuMi/Assets.xcassets/yna/RedPacket/redPacket_msg_icon.imageset/redPacket_msg_icon@3x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/yna/RedPacket/redPacket_msg_inValid_bg.imageset/Contents.json b/YuMi/Assets.xcassets/yna/RedPacket/redPacket_msg_inValid_bg.imageset/Contents.json deleted file mode 100644 index 0d88003a..00000000 --- a/YuMi/Assets.xcassets/yna/RedPacket/redPacket_msg_inValid_bg.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "redPacket_msg_inValid_bg@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "redPacket_msg_inValid_bg@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/YuMi/Assets.xcassets/yna/RedPacket/redPacket_msg_inValid_bg.imageset/redPacket_msg_inValid_bg@2x.png b/YuMi/Assets.xcassets/yna/RedPacket/redPacket_msg_inValid_bg.imageset/redPacket_msg_inValid_bg@2x.png deleted file mode 100644 index d3dcd181..00000000 Binary files a/YuMi/Assets.xcassets/yna/RedPacket/redPacket_msg_inValid_bg.imageset/redPacket_msg_inValid_bg@2x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/yna/RedPacket/redPacket_msg_inValid_bg.imageset/redPacket_msg_inValid_bg@3x.png b/YuMi/Assets.xcassets/yna/RedPacket/redPacket_msg_inValid_bg.imageset/redPacket_msg_inValid_bg@3x.png deleted file mode 100644 index 9c722cc8..00000000 Binary files a/YuMi/Assets.xcassets/yna/RedPacket/redPacket_msg_inValid_bg.imageset/redPacket_msg_inValid_bg@3x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/yna/RedPacket/redPacket_msg_valid_bg.imageset/Contents.json b/YuMi/Assets.xcassets/yna/RedPacket/redPacket_msg_valid_bg.imageset/Contents.json deleted file mode 100644 index 1ac19cf1..00000000 --- a/YuMi/Assets.xcassets/yna/RedPacket/redPacket_msg_valid_bg.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "redPacket_msg_valid_bg@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "redPacket_msg_valid_bg@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/YuMi/Assets.xcassets/yna/RedPacket/redPacket_msg_valid_bg.imageset/redPacket_msg_valid_bg@2x.png b/YuMi/Assets.xcassets/yna/RedPacket/redPacket_msg_valid_bg.imageset/redPacket_msg_valid_bg@2x.png deleted file mode 100644 index 87e237e2..00000000 Binary files a/YuMi/Assets.xcassets/yna/RedPacket/redPacket_msg_valid_bg.imageset/redPacket_msg_valid_bg@2x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/yna/RedPacket/redPacket_msg_valid_bg.imageset/redPacket_msg_valid_bg@3x.png b/YuMi/Assets.xcassets/yna/RedPacket/redPacket_msg_valid_bg.imageset/redPacket_msg_valid_bg@3x.png deleted file mode 100644 index a1a16c0d..00000000 Binary files a/YuMi/Assets.xcassets/yna/RedPacket/redPacket_msg_valid_bg.imageset/redPacket_msg_valid_bg@3x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/yna/RedPacket/redPacket_open.imageset/Contents.json b/YuMi/Assets.xcassets/yna/RedPacket/redPacket_open.imageset/Contents.json deleted file mode 100644 index 7bcb8eb9..00000000 --- a/YuMi/Assets.xcassets/yna/RedPacket/redPacket_open.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "redPacket_open@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "redPacket_open@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/YuMi/Assets.xcassets/yna/RedPacket/redPacket_open.imageset/redPacket_open@2x.png b/YuMi/Assets.xcassets/yna/RedPacket/redPacket_open.imageset/redPacket_open@2x.png deleted file mode 100644 index 0a059b23..00000000 Binary files a/YuMi/Assets.xcassets/yna/RedPacket/redPacket_open.imageset/redPacket_open@2x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/yna/RedPacket/redPacket_open.imageset/redPacket_open@3x.png b/YuMi/Assets.xcassets/yna/RedPacket/redPacket_open.imageset/redPacket_open@3x.png deleted file mode 100644 index fb1693bc..00000000 Binary files a/YuMi/Assets.xcassets/yna/RedPacket/redPacket_open.imageset/redPacket_open@3x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/yna/RedPacket/redPacket_openRoom.imageset/Contents.json b/YuMi/Assets.xcassets/yna/RedPacket/redPacket_openRoom.imageset/Contents.json deleted file mode 100644 index 45c7a4f6..00000000 --- a/YuMi/Assets.xcassets/yna/RedPacket/redPacket_openRoom.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "redPacket_openRoom@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "redPacket_openRoom@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/YuMi/Assets.xcassets/yna/RedPacket/redPacket_openRoom.imageset/redPacket_openRoom@2x.png b/YuMi/Assets.xcassets/yna/RedPacket/redPacket_openRoom.imageset/redPacket_openRoom@2x.png deleted file mode 100644 index d5772778..00000000 Binary files a/YuMi/Assets.xcassets/yna/RedPacket/redPacket_openRoom.imageset/redPacket_openRoom@2x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/yna/RedPacket/redPacket_openRoom.imageset/redPacket_openRoom@3x.png b/YuMi/Assets.xcassets/yna/RedPacket/redPacket_openRoom.imageset/redPacket_openRoom@3x.png deleted file mode 100644 index b26212a9..00000000 Binary files a/YuMi/Assets.xcassets/yna/RedPacket/redPacket_openRoom.imageset/redPacket_openRoom@3x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/yna/RedPacket/redPacket_receive_bg.imageset/Contents.json b/YuMi/Assets.xcassets/yna/RedPacket/redPacket_receive_bg.imageset/Contents.json deleted file mode 100644 index 7caa1e76..00000000 --- a/YuMi/Assets.xcassets/yna/RedPacket/redPacket_receive_bg.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "redPacket_receive_bg@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "redPacket_receive_bg@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/YuMi/Assets.xcassets/yna/RedPacket/redPacket_receive_bg.imageset/redPacket_receive_bg@2x.png b/YuMi/Assets.xcassets/yna/RedPacket/redPacket_receive_bg.imageset/redPacket_receive_bg@2x.png deleted file mode 100644 index 066f2d66..00000000 Binary files a/YuMi/Assets.xcassets/yna/RedPacket/redPacket_receive_bg.imageset/redPacket_receive_bg@2x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/yna/RedPacket/redPacket_receive_bg.imageset/redPacket_receive_bg@3x.png b/YuMi/Assets.xcassets/yna/RedPacket/redPacket_receive_bg.imageset/redPacket_receive_bg@3x.png deleted file mode 100644 index 8c1b803e..00000000 Binary files a/YuMi/Assets.xcassets/yna/RedPacket/redPacket_receive_bg.imageset/redPacket_receive_bg@3x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/yna/RedPacket/redPacket_result_bg.imageset/Contents.json b/YuMi/Assets.xcassets/yna/RedPacket/redPacket_result_bg.imageset/Contents.json deleted file mode 100644 index e1db770a..00000000 --- a/YuMi/Assets.xcassets/yna/RedPacket/redPacket_result_bg.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "redPacket_result_bg@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "redPacket_result_bg@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/YuMi/Assets.xcassets/yna/RedPacket/redPacket_result_bg.imageset/redPacket_result_bg@2x.png b/YuMi/Assets.xcassets/yna/RedPacket/redPacket_result_bg.imageset/redPacket_result_bg@2x.png deleted file mode 100644 index 234bba5e..00000000 Binary files a/YuMi/Assets.xcassets/yna/RedPacket/redPacket_result_bg.imageset/redPacket_result_bg@2x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/yna/RedPacket/redPacket_result_bg.imageset/redPacket_result_bg@3x.png b/YuMi/Assets.xcassets/yna/RedPacket/redPacket_result_bg.imageset/redPacket_result_bg@3x.png deleted file mode 100644 index ec792e81..00000000 Binary files a/YuMi/Assets.xcassets/yna/RedPacket/redPacket_result_bg.imageset/redPacket_result_bg@3x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/yna/RedPacket/send_redPacket_button.imageset/Contents.json b/YuMi/Assets.xcassets/yna/RedPacket/send_redPacket_button.imageset/Contents.json deleted file mode 100644 index f2a061ae..00000000 --- a/YuMi/Assets.xcassets/yna/RedPacket/send_redPacket_button.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "send_redPacket_button@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "send_redPacket_button@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/YuMi/Assets.xcassets/yna/RedPacket/send_redPacket_button.imageset/send_redPacket_button@2x.png b/YuMi/Assets.xcassets/yna/RedPacket/send_redPacket_button.imageset/send_redPacket_button@2x.png deleted file mode 100644 index f4ec18e0..00000000 Binary files a/YuMi/Assets.xcassets/yna/RedPacket/send_redPacket_button.imageset/send_redPacket_button@2x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/yna/RedPacket/send_redPacket_button.imageset/send_redPacket_button@3x.png b/YuMi/Assets.xcassets/yna/RedPacket/send_redPacket_button.imageset/send_redPacket_button@3x.png deleted file mode 100644 index 0169291e..00000000 Binary files a/YuMi/Assets.xcassets/yna/RedPacket/send_redPacket_button.imageset/send_redPacket_button@3x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/yna/RedPacket/send_redPacket_cancel.imageset/Contents.json b/YuMi/Assets.xcassets/yna/RedPacket/send_redPacket_cancel.imageset/Contents.json deleted file mode 100644 index 7f22e684..00000000 --- a/YuMi/Assets.xcassets/yna/RedPacket/send_redPacket_cancel.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "send_redPacket_cancel@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "send_redPacket_cancel@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/YuMi/Assets.xcassets/yna/RedPacket/send_redPacket_cancel.imageset/send_redPacket_cancel@2x.png b/YuMi/Assets.xcassets/yna/RedPacket/send_redPacket_cancel.imageset/send_redPacket_cancel@2x.png deleted file mode 100644 index 2152c332..00000000 Binary files a/YuMi/Assets.xcassets/yna/RedPacket/send_redPacket_cancel.imageset/send_redPacket_cancel@2x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/yna/RedPacket/send_redPacket_cancel.imageset/send_redPacket_cancel@3x.png b/YuMi/Assets.xcassets/yna/RedPacket/send_redPacket_cancel.imageset/send_redPacket_cancel@3x.png deleted file mode 100644 index 2606b0ae..00000000 Binary files a/YuMi/Assets.xcassets/yna/RedPacket/send_redPacket_cancel.imageset/send_redPacket_cancel@3x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/yna/RedPacket/send_redPacket_help.imageset/Contents.json b/YuMi/Assets.xcassets/yna/RedPacket/send_redPacket_help.imageset/Contents.json deleted file mode 100644 index df85c749..00000000 --- a/YuMi/Assets.xcassets/yna/RedPacket/send_redPacket_help.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "send_redPacket_help@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "send_redPacket_help@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/YuMi/Assets.xcassets/yna/RedPacket/send_redPacket_help.imageset/send_redPacket_help@2x.png b/YuMi/Assets.xcassets/yna/RedPacket/send_redPacket_help.imageset/send_redPacket_help@2x.png deleted file mode 100644 index 01dbc047..00000000 Binary files a/YuMi/Assets.xcassets/yna/RedPacket/send_redPacket_help.imageset/send_redPacket_help@2x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/yna/RedPacket/send_redPacket_help.imageset/send_redPacket_help@3x.png b/YuMi/Assets.xcassets/yna/RedPacket/send_redPacket_help.imageset/send_redPacket_help@3x.png deleted file mode 100644 index 4a57fb08..00000000 Binary files a/YuMi/Assets.xcassets/yna/RedPacket/send_redPacket_help.imageset/send_redPacket_help@3x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/yna/RedPacket/send_redpacket_bg.imageset/Contents.json b/YuMi/Assets.xcassets/yna/RedPacket/send_redpacket_bg.imageset/Contents.json deleted file mode 100644 index 680917cd..00000000 --- a/YuMi/Assets.xcassets/yna/RedPacket/send_redpacket_bg.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "send_redpacket_bg@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "send_redpacket_bg@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/YuMi/Assets.xcassets/yna/RedPacket/send_redpacket_bg.imageset/send_redpacket_bg@2x.png b/YuMi/Assets.xcassets/yna/RedPacket/send_redpacket_bg.imageset/send_redpacket_bg@2x.png deleted file mode 100644 index ee2f9e70..00000000 Binary files a/YuMi/Assets.xcassets/yna/RedPacket/send_redpacket_bg.imageset/send_redpacket_bg@2x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/yna/RedPacket/send_redpacket_bg.imageset/send_redpacket_bg@3x.png b/YuMi/Assets.xcassets/yna/RedPacket/send_redpacket_bg.imageset/send_redpacket_bg@3x.png deleted file mode 100644 index d8d725ff..00000000 Binary files a/YuMi/Assets.xcassets/yna/RedPacket/send_redpacket_bg.imageset/send_redpacket_bg@3x.png and /dev/null differ diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIInputRedPacketView.m b/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIInputRedPacketView.m index 6c11a0a6..0fe56611 100644 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIInputRedPacketView.m +++ b/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIInputRedPacketView.m @@ -98,6 +98,7 @@ - (UIImageView *)pi_iconView{ if(!_pi_iconView){ _pi_iconView = [UIImageView new]; + _pi_iconView.image = kImage(@"pi_red_packet_icon_logo"); } return _pi_iconView; } diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIRedPacketChooseTypeCell.h b/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIRedPacketChooseTypeCell.h index 91bcfdcc..25804c8b 100644 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIRedPacketChooseTypeCell.h +++ b/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIRedPacketChooseTypeCell.h @@ -10,7 +10,9 @@ 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 index 296fe762..882cf711 100644 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIRedPacketChooseTypeCell.m +++ b/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIRedPacketChooseTypeCell.m @@ -20,7 +20,10 @@ return self; } -(void)installUI{ - [self.contentView setCornerWithLeftTopCorner:kGetScaleWidth(8) rightTopCorner:kGetScaleWidth(8) bottomLeftCorner:kGetScaleWidth(8) bottomRightCorner:kGetScaleWidth(8) size:CGSizeMake(kGetScaleWidth(94), kGetScaleWidth(62))]; + 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]; @@ -37,6 +40,22 @@ 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){ diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIRedPacketChooseTypeView.m b/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIRedPacketChooseTypeView.m index d831d30d..27c4db21 100644 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIRedPacketChooseTypeView.m +++ b/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIRedPacketChooseTypeView.m @@ -6,9 +6,13 @@ // #import "PIRedPacketChooseTypeView.h" -@interface PIRedPacketChooseTypeView() +#import "PIRedPacketChooseTypeCell.h" +@interface PIRedPacketChooseTypeView() @property(nonatomic,strong) UILabel *pi_titleView; @property(nonatomic,strong) UICollectionView *collectionView; +@property(nonatomic,copy) NSArray *titleList; +@property(nonatomic,copy) NSArray *subTitleList; +@property(nonatomic,assign) NSInteger chooseRow; @end @implementation PIRedPacketChooseTypeView @@ -21,11 +25,77 @@ 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 safeObjectAtIndex1:indexPath.row]; + cell.pi_subTitle = [self.subTitleList safeObjectAtIndex1:indexPath.row]; + return cell; +} +- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath{ + self.chooseRow = indexPath.row; + [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) { + UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout 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(0)); + _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:[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/PIRoomSendRedPacketVC.h b/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomSendRedPacketVC.h new file mode 100644 index 00000000..b48e8898 --- /dev/null +++ b/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomSendRedPacketVC.h @@ -0,0 +1,16 @@ +// +// PIRoomSendRedPacketVC.h +// YuMi +// +// Created by duoban on 2023/10/18. +// + +#import "MvpViewController.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface PIRoomSendRedPacketVC : MvpViewController + +@end + +NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomSendRedPacketVC.m b/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomSendRedPacketVC.m new file mode 100644 index 00000000..96925585 --- /dev/null +++ b/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomSendRedPacketVC.m @@ -0,0 +1,43 @@ +// +// PIRoomSendRedPacketVC.m +// YuMi +// +// Created by duoban on 2023/10/18. +// + +#import "PIRoomSendRedPacketVC.h" + +@interface PIRoomSendRedPacketVC () +@property(nonatomic,strong) UIView *bgView; +@property(nonatomic,strong) UIImageView *topImageView; +@property(nonatomic,strong) UIButton *tipsBtn; +@end + +@implementation PIRoomSendRedPacketVC + +- (void)viewDidLoad { + [super viewDidLoad]; + [self installUI]; + [self installConstraints]; +} +-(void)installUI{ + self.view.backgroundColor = [UIColor clearColor]; + self.navigationController.view.backgroundColor = [UIColor clearColor]; + [self.navigationController setNavigationBarHidden:YES]; +} +-(void)installConstraints{ + +} +#pragma mark - 懒加载 + +/* +#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/zh-Hans.lproj/Localizable.strings b/YuMi/zh-Hans.lproj/Localizable.strings index c8b440aa..31bee9ef 100644 --- a/YuMi/zh-Hans.lproj/Localizable.strings +++ b/YuMi/zh-Hans.lproj/Localizable.strings @@ -3122,6 +3122,16 @@ "XPMaskManagerVC3"="解除屏蔽成功"; ///XPMaskManagerCell "XPMaskManagerCell0"="解除屏蔽"; +///PIRedPacketChooseTypeView +"PIRedPacketChooseTypeView0"="无门槛红包"; +"PIRedPacketChooseTypeView1"="关注红包"; +"PIRedPacketChooseTypeView2"="分享红包"; +"PIRedPacketChooseTypeView3"="弹幕红包"; +"PIRedPacketChooseTypeView4"="所有人均可参与"; +"PIRedPacketChooseTypeView5"="关注主播可参与"; +"PIRedPacketChooseTypeView6"="分享房间可参与"; +"PIRedPacketChooseTypeView7"="發指定彈幕內容"; +"PIRedPacketChooseTypeView8"="抢红包条件"; ///不能脚本生成的 "App_Common_And" = "和"; "App_Common_Male" = "男"; diff --git a/YuMi/zh-Hant.lproj/Localizable.strings b/YuMi/zh-Hant.lproj/Localizable.strings index 3673a3e2..da89597c 100644 --- a/YuMi/zh-Hant.lproj/Localizable.strings +++ b/YuMi/zh-Hant.lproj/Localizable.strings @@ -3127,6 +3127,16 @@ "XPMaskManagerVC3"="解除屏蔽成功"; ///XPMaskManagerCell "XPMaskManagerCell0"="解除屏蔽"; +///PIRedPacketChooseTypeView +"PIRedPacketChooseTypeView0"="無門檻紅包"; +"PIRedPacketChooseTypeView1"="關註紅包"; +"PIRedPacketChooseTypeView2"="分享紅包"; +"PIRedPacketChooseTypeView3"="彈幕紅包"; +"PIRedPacketChooseTypeView4"="所有人均可參與"; +"PIRedPacketChooseTypeView5"="關註主播可參與"; +"PIRedPacketChooseTypeView6"="分享房間可參與"; +"PIRedPacketChooseTypeView7"="發指定彈幕內容"; +"PIRedPacketChooseTypeView8"="搶紅包條件"; ///不能腳本生成的 "App_Common_And" = "和"; "App_Common_Male" = "男";