From cf2eeb9a00eecb5b3257f348b63ab1cd8277f956 Mon Sep 17 00:00:00 2001 From: liyuhua <15626451870@163.com> Date: Sat, 23 Mar 2024 20:47:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=BA=97=E5=8C=85=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=AD=A4commit=E7=BD=AE=E9=A1=B6=201.0.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yinmeng-ios.xcodeproj/project.pbxproj | 6 ++ .../Base/Security/RecordVoiceManager.h | 1 + .../YYTextAsyncLayer+YinTextAsyncLayer.h | 2 +- .../YYTextAsyncLayer+YinTextAsyncLayer.m | 2 +- yinmeng-ios/Base/Security/YinGetPointGroup.h | 16 +++++ yinmeng-ios/Base/Security/YinGetPointGroup.m | 68 +++++++++++++++++++ .../Security/yinmeng-ios-Bridging-Header.h | 2 +- yinmeng-ios/Base/Utils/Enum.swift | 2 +- .../Extension/UIButton/UIButton+.swift | 2 +- yinmeng-ios/Extension/UILabel/UILabel+.swift | 2 +- .../Modules/Auth/VM/YinClientInfoModel.swift | 2 +- .../Modules/Auth/VM/YinRankH5UrlModel.swift | 2 +- .../Chat/Model/ChatCustomMsgModel.swift | 2 +- .../Chat/Model/ChatMsgRemoteModel.swift | 2 +- .../Chat/Tool/YinCustomAttachmentCoding.swift | 2 +- .../Modules/Home/HomeSearchNavView.swift | 2 +- .../Modules/Home/HomeSearchRoomCell.swift | 2 +- .../Modules/Home/HomeSearchRoomModel.swift | 2 +- .../Modules/Home/HomeSearchRoomVC.swift | 2 +- yinmeng-ios/Modules/Home/HomeSearchVC.swift | 2 +- .../Modules/Home/HomeVoiceSearchView.swift | 2 +- .../Modules/Room/Model/RoomChatData.swift | 2 +- .../Modules/Room/Model/RoomDataModel.swift | 2 +- .../Room/Tool/YinRoomAgoraManager.swift | 2 +- .../Room/Tool/YinRoomAudioManager.swift | 2 +- .../Room/Tool/YinRoomTRTCManager.swift | 2 +- yinmeng-ios/Modules/Room/VC/RoomVC.swift | 40 ++++++++++- .../Modules/Room/VM/RoomVCViewModel.swift | 2 +- .../Model/MicSeatGiftValueModel.swift | 2 +- .../View/MicSeatView/Model/MicSeatModel.swift | 2 +- .../MicSeatView/Model/MicSequenceModel.swift | 2 +- .../Cell/NormalMicSeatCell.swift | 2 +- .../MicSeatSuperView/MicSeatSuperView.swift | 2 +- .../NormalMicSeatSuperView.swift | 25 ++++++- .../SubView/MicSeatGiftValueView.swift | 2 +- .../SubView/NormalMicSeatView.swift | 2 +- .../MicSeatView/RoomNormalMicSeatView.swift | 2 +- .../RoomBackgroundView.swift | 2 +- .../Model/RoomMsgListModel.swift | 2 +- .../View/RoomChatScreenContentCell.swift | 2 +- .../View/RoomChatScreenHeaderView.swift | 2 +- .../View/RoomChatScreenUserChatCell.swift | 2 +- .../View/RoomChatScreenView.swift | 2 +- .../ViewModel/RoomChatScreenManager.swift | 2 +- .../View/RoomDynamicEffectView.swift | 32 +++++++-- .../View/RoomMenuView/View/RoomMenuView.swift | 2 +- .../RoomMenuView/View/RoomSendTextView.swift | 2 +- .../Model/RoomQuitItemModel.swift | 2 +- .../RoomQuitView/Model/RoomQuitModel.swift | 2 +- .../RoomQuitView/VM/RoomQuitViewModel.swift | 2 +- .../RoomQuitView/View/RoomQuitClickCell.swift | 2 +- .../View/RoomQuitUserInfoCell.swift | 2 +- .../View/RoomQuitUserInfoEmptyCell.swift | 2 +- .../View/RoomQuitView/View/RoomQuitView.swift | 2 +- .../RoomTopView/Model/YinRoomRankModel.swift | 2 +- .../View/RoomTopView/View/RoomTopView.swift | 2 +- .../View/YinRoomRankItemView.swift | 2 +- .../RoomTopView/View/YinRoomRankView.swift | 2 +- .../SendGift/Model/RectiveGiftModel.swift | 2 +- .../SendGift/Model/RectiveGiftUserModel.swift | 2 +- .../View/SendGift/Model/SendGiftModel.swift | 2 +- .../SendGift/Model/SendGiftSendNumModel.swift | 2 +- .../SendGift/Model/SendGiftUserModel.swift | 2 +- .../View/SendGift/View/SendGiftCell.swift | 2 +- .../SendGift/View/SendGiftSendNumCell.swift | 2 +- .../SendGift/View/SendGiftSendNumView.swift | 5 +- .../View/SendGift/View/SendGiftSendView.swift | 2 +- .../View/SendGift/View/SendGiftTopView.swift | 2 +- .../View/SendGift/View/SendGiftUserCell.swift | 2 +- .../View/SendGift/View/SendGiftUserView.swift | 2 +- .../Room/View/SendGift/View/SendGiftVC.swift | 2 +- .../View/SendGift/View/SendGiftView.swift | 2 +- 72 files changed, 245 insertions(+), 76 deletions(-) create mode 100644 yinmeng-ios/Base/Security/YinGetPointGroup.h create mode 100644 yinmeng-ios/Base/Security/YinGetPointGroup.m diff --git a/yinmeng-ios.xcodeproj/project.pbxproj b/yinmeng-ios.xcodeproj/project.pbxproj index f2ea85e..9727489 100644 --- a/yinmeng-ios.xcodeproj/project.pbxproj +++ b/yinmeng-ios.xcodeproj/project.pbxproj @@ -88,6 +88,7 @@ 239EA6532BAEA73100570127 /* RoomChatScreenContentCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 239EA6522BAEA73100570127 /* RoomChatScreenContentCell.swift */; }; 239EA65A2BAEB48A00570127 /* RoomDynamicEffectView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 239EA6592BAEB48A00570127 /* RoomDynamicEffectView.swift */; }; 239EA65F2BAED9B900570127 /* YinCustomAttachmentCoding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 239EA65E2BAED9B900570127 /* YinCustomAttachmentCoding.swift */; }; + 239EA6642BAF03B400570127 /* YinGetPointGroup.m in Sources */ = {isa = PBXBuildFile; fileRef = 239EA6632BAF03B400570127 /* YinGetPointGroup.m */; }; 23EE96E02B9EB22100475D69 /* RoomMenuView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23EE96DF2B9EB22100475D69 /* RoomMenuView.swift */; }; 23EE96E22B9EB22F00475D69 /* RoomSendTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23EE96E12B9EB22F00475D69 /* RoomSendTextView.swift */; }; 23EE96E62B9EE79A00475D69 /* RoomVCViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23EE96E52B9EE79A00475D69 /* RoomVCViewModel.swift */; }; @@ -256,6 +257,8 @@ 239EA6522BAEA73100570127 /* RoomChatScreenContentCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomChatScreenContentCell.swift; sourceTree = ""; }; 239EA6592BAEB48A00570127 /* RoomDynamicEffectView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomDynamicEffectView.swift; sourceTree = ""; }; 239EA65E2BAED9B900570127 /* YinCustomAttachmentCoding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YinCustomAttachmentCoding.swift; sourceTree = ""; }; + 239EA6622BAF03B400570127 /* YinGetPointGroup.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = YinGetPointGroup.h; sourceTree = ""; }; + 239EA6632BAF03B400570127 /* YinGetPointGroup.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = YinGetPointGroup.m; sourceTree = ""; }; 23EE96DF2B9EB22100475D69 /* RoomMenuView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomMenuView.swift; sourceTree = ""; }; 23EE96E12B9EB22F00475D69 /* RoomSendTextView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomSendTextView.swift; sourceTree = ""; }; 23EE96E52B9EE79A00475D69 /* RoomVCViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RoomVCViewModel.swift; sourceTree = ""; }; @@ -1206,6 +1209,8 @@ E81A7BA92B885B1F009E736E /* yinmeng-ios-Bridging-Header.h */, 2311D6C92B91BBF2001C70AB /* RecordVoiceManager.h */, 2311D6CA2B91BBF2001C70AB /* RecordVoiceManager.m */, + 239EA6622BAF03B400570127 /* YinGetPointGroup.h */, + 239EA6632BAF03B400570127 /* YinGetPointGroup.m */, 239EA64F2BAE998E00570127 /* YYTextAsyncLayer+YinTextAsyncLayer.h */, 239EA6502BAE998E00570127 /* YYTextAsyncLayer+YinTextAsyncLayer.m */, ); @@ -1413,6 +1418,7 @@ E8D15AE82B8CD47100369467 /* WebViewController.swift in Sources */, E89F194B2B919ECB0098E797 /* ChatImageCell.swift in Sources */, 234E2E2A2B9AC07B00433CF7 /* MicSeatGiftValueView.swift in Sources */, + 239EA6642BAF03B400570127 /* YinGetPointGroup.m in Sources */, 23EE96EA2B9F01F900475D69 /* RoomChatData.swift in Sources */, E8D15AA12B89AF4F00369467 /* UserTokenObject.swift in Sources */, 234E2E0E2B99A24F00433CF7 /* RoomQuitItemModel.swift in Sources */, diff --git a/yinmeng-ios/Base/Security/RecordVoiceManager.h b/yinmeng-ios/Base/Security/RecordVoiceManager.h index 373ef66..9bb97bf 100644 --- a/yinmeng-ios/Base/Security/RecordVoiceManager.h +++ b/yinmeng-ios/Base/Security/RecordVoiceManager.h @@ -23,6 +23,7 @@ NS_ASSUME_NONNULL_BEGIN - (void)initWithRecord; -(void)stopRecord; - (void)playFilePathVoice; + @end NS_ASSUME_NONNULL_END diff --git a/yinmeng-ios/Base/Security/YYTextAsyncLayer+YinTextAsyncLayer.h b/yinmeng-ios/Base/Security/YYTextAsyncLayer+YinTextAsyncLayer.h index 6e49de0..92a6882 100644 --- a/yinmeng-ios/Base/Security/YYTextAsyncLayer+YinTextAsyncLayer.h +++ b/yinmeng-ios/Base/Security/YYTextAsyncLayer+YinTextAsyncLayer.h @@ -2,7 +2,7 @@ // YYTextAsyncLayer+XPTextAsyncLayer.h // xplan-ios // -// Created by duoban on 2023/10/28. +// Created by yinmeng on 2023/10/28. // #import diff --git a/yinmeng-ios/Base/Security/YYTextAsyncLayer+YinTextAsyncLayer.m b/yinmeng-ios/Base/Security/YYTextAsyncLayer+YinTextAsyncLayer.m index 7d7fe56..12d260f 100644 --- a/yinmeng-ios/Base/Security/YYTextAsyncLayer+YinTextAsyncLayer.m +++ b/yinmeng-ios/Base/Security/YYTextAsyncLayer+YinTextAsyncLayer.m @@ -2,7 +2,7 @@ // YYTextAsyncLayer+XPTextAsyncLayer.m // xplan-ios // -// Created by duoban on 2023/10/28. +// Created by yinmeng on 2023/10/28. // #import "YYTextAsyncLayer+YinTextAsyncLayer.h" diff --git a/yinmeng-ios/Base/Security/YinGetPointGroup.h b/yinmeng-ios/Base/Security/YinGetPointGroup.h new file mode 100644 index 0000000..e44eded --- /dev/null +++ b/yinmeng-ios/Base/Security/YinGetPointGroup.h @@ -0,0 +1,16 @@ +// +// YinGetPointGroup.h +// yinmeng-ios +// +// Created by yinmeng on 2024/3/23. +// + +#import +#import +NS_ASSUME_NONNULL_BEGIN + +@interface YinGetPointGroup : NSObject ++ (CAAnimationGroup *)getGroupPoint:(CGPoint)startPoint endPoint:(CGPoint)endPoint centerPoint:(CGPoint)centerPoint; +@end + +NS_ASSUME_NONNULL_END diff --git a/yinmeng-ios/Base/Security/YinGetPointGroup.m b/yinmeng-ios/Base/Security/YinGetPointGroup.m new file mode 100644 index 0000000..e67f2be --- /dev/null +++ b/yinmeng-ios/Base/Security/YinGetPointGroup.m @@ -0,0 +1,68 @@ +// +// YinGetPointGroup.m +// yinmeng-ios +// +// Created by yinmeng on 2024/3/23. +// + +#import "YinGetPointGroup.h" + +@implementation YinGetPointGroup + ++ (CAAnimationGroup *)getGroupPoint:(CGPoint)startPoint endPoint:(CGPoint)endPoint centerPoint:(CGPoint)centerPoint{ + + 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/yinmeng-ios/Base/Security/yinmeng-ios-Bridging-Header.h b/yinmeng-ios/Base/Security/yinmeng-ios-Bridging-Header.h index ec2af48..11d0845 100644 --- a/yinmeng-ios/Base/Security/yinmeng-ios-Bridging-Header.h +++ b/yinmeng-ios/Base/Security/yinmeng-ios-Bridging-Header.h @@ -16,4 +16,4 @@ #import #import #import "UIView+VAP.h" - +#import "YinGetPointGroup.h" diff --git a/yinmeng-ios/Base/Utils/Enum.swift b/yinmeng-ios/Base/Utils/Enum.swift index 2ec7771..616dad1 100644 --- a/yinmeng-ios/Base/Utils/Enum.swift +++ b/yinmeng-ios/Base/Utils/Enum.swift @@ -2,7 +2,7 @@ // Enum.swift // yinmeng-ios // -// Created by duoban on 2024/3/6. +// Created by yinmeng on 2024/3/6. // import Foundation diff --git a/yinmeng-ios/Extension/UIButton/UIButton+.swift b/yinmeng-ios/Extension/UIButton/UIButton+.swift index 5505d21..a7d4e3e 100644 --- a/yinmeng-ios/Extension/UIButton/UIButton+.swift +++ b/yinmeng-ios/Extension/UIButton/UIButton+.swift @@ -2,7 +2,7 @@ // UIButtom+.swift // yinmeng-ios // -// Created by duoban on 2024/3/6. +// Created by yinmeng on 2024/3/6. // import UIKit diff --git a/yinmeng-ios/Extension/UILabel/UILabel+.swift b/yinmeng-ios/Extension/UILabel/UILabel+.swift index 83eeb25..4258d96 100644 --- a/yinmeng-ios/Extension/UILabel/UILabel+.swift +++ b/yinmeng-ios/Extension/UILabel/UILabel+.swift @@ -2,7 +2,7 @@ // UILabel+.swift // yinmeng-ios // -// Created by duoban on 2024/3/6. +// Created by yinmeng on 2024/3/6. // import Foundation diff --git a/yinmeng-ios/Modules/Auth/VM/YinClientInfoModel.swift b/yinmeng-ios/Modules/Auth/VM/YinClientInfoModel.swift index 4e6760e..f32a0b5 100644 --- a/yinmeng-ios/Modules/Auth/VM/YinClientInfoModel.swift +++ b/yinmeng-ios/Modules/Auth/VM/YinClientInfoModel.swift @@ -2,7 +2,7 @@ // YinClientInfoModel.swift // yinmeng-ios // -// Created by duoban on 2024/3/22. +// Created by yinmeng on 2024/3/22. // import UIKit diff --git a/yinmeng-ios/Modules/Auth/VM/YinRankH5UrlModel.swift b/yinmeng-ios/Modules/Auth/VM/YinRankH5UrlModel.swift index e7a8d18..1820685 100644 --- a/yinmeng-ios/Modules/Auth/VM/YinRankH5UrlModel.swift +++ b/yinmeng-ios/Modules/Auth/VM/YinRankH5UrlModel.swift @@ -2,7 +2,7 @@ // YinRankH5UrlModel.swift // yinmeng-ios // -// Created by duoban on 2024/3/22. +// Created by yinmeng on 2024/3/22. // import UIKit diff --git a/yinmeng-ios/Modules/Chat/Model/ChatCustomMsgModel.swift b/yinmeng-ios/Modules/Chat/Model/ChatCustomMsgModel.swift index aeda557..a5a0c98 100644 --- a/yinmeng-ios/Modules/Chat/Model/ChatCustomMsgModel.swift +++ b/yinmeng-ios/Modules/Chat/Model/ChatCustomMsgModel.swift @@ -2,7 +2,7 @@ // ChatCustomMsgModel.swift // yinmeng-ios // -// Created by duoban on 2024/3/23. +// Created by yinmeng on 2024/3/23. // import UIKit diff --git a/yinmeng-ios/Modules/Chat/Model/ChatMsgRemoteModel.swift b/yinmeng-ios/Modules/Chat/Model/ChatMsgRemoteModel.swift index ca3cd1b..fe1d1fb 100644 --- a/yinmeng-ios/Modules/Chat/Model/ChatMsgRemoteModel.swift +++ b/yinmeng-ios/Modules/Chat/Model/ChatMsgRemoteModel.swift @@ -2,7 +2,7 @@ // ChatMsgRemoteModel.swift // yinmeng-ios // -// Created by duoban on 2024/3/23. +// Created by yinmeng on 2024/3/23. // import UIKit diff --git a/yinmeng-ios/Modules/Chat/Tool/YinCustomAttachmentCoding.swift b/yinmeng-ios/Modules/Chat/Tool/YinCustomAttachmentCoding.swift index 78e043d..e807fc1 100644 --- a/yinmeng-ios/Modules/Chat/Tool/YinCustomAttachmentCoding.swift +++ b/yinmeng-ios/Modules/Chat/Tool/YinCustomAttachmentCoding.swift @@ -2,7 +2,7 @@ // YinCustomAttachmentCoding.swift // yinmeng-ios // -// Created by duoban on 2024/3/23. +// Created by yinmeng on 2024/3/23. // import UIKit diff --git a/yinmeng-ios/Modules/Home/HomeSearchNavView.swift b/yinmeng-ios/Modules/Home/HomeSearchNavView.swift index a23d1c0..f28cef5 100644 --- a/yinmeng-ios/Modules/Home/HomeSearchNavView.swift +++ b/yinmeng-ios/Modules/Home/HomeSearchNavView.swift @@ -2,7 +2,7 @@ // HomeSearchNavView.swift // yinmeng-ios // -// Created by duoban on 2024/3/21. +// Created by yinmeng on 2024/3/21. // import UIKit diff --git a/yinmeng-ios/Modules/Home/HomeSearchRoomCell.swift b/yinmeng-ios/Modules/Home/HomeSearchRoomCell.swift index 94721b3..adf0bb7 100644 --- a/yinmeng-ios/Modules/Home/HomeSearchRoomCell.swift +++ b/yinmeng-ios/Modules/Home/HomeSearchRoomCell.swift @@ -2,7 +2,7 @@ // HomeSearchRoomCell.swift // yinmeng-ios // -// Created by duoban on 2024/3/21. +// Created by yinmeng on 2024/3/21. // import UIKit diff --git a/yinmeng-ios/Modules/Home/HomeSearchRoomModel.swift b/yinmeng-ios/Modules/Home/HomeSearchRoomModel.swift index 6027969..c263bbe 100644 --- a/yinmeng-ios/Modules/Home/HomeSearchRoomModel.swift +++ b/yinmeng-ios/Modules/Home/HomeSearchRoomModel.swift @@ -2,7 +2,7 @@ // HomeSearchRoomModel.swift // yinmeng-ios // -// Created by duoban on 2024/3/21. +// Created by yinmeng on 2024/3/21. // import Foundation diff --git a/yinmeng-ios/Modules/Home/HomeSearchRoomVC.swift b/yinmeng-ios/Modules/Home/HomeSearchRoomVC.swift index a12c78f..1678318 100644 --- a/yinmeng-ios/Modules/Home/HomeSearchRoomVC.swift +++ b/yinmeng-ios/Modules/Home/HomeSearchRoomVC.swift @@ -2,7 +2,7 @@ // HomeSearchRoomVC.swift // yinmeng-ios // -// Created by duoban on 2024/3/21. +// Created by yinmeng on 2024/3/21. // import UIKit diff --git a/yinmeng-ios/Modules/Home/HomeSearchVC.swift b/yinmeng-ios/Modules/Home/HomeSearchVC.swift index 5a97aa2..3f3c502 100644 --- a/yinmeng-ios/Modules/Home/HomeSearchVC.swift +++ b/yinmeng-ios/Modules/Home/HomeSearchVC.swift @@ -2,7 +2,7 @@ // HomeSearchVC.swift // yinmeng-ios // -// Created by duoban on 2024/3/21. +// Created by yinmeng on 2024/3/21. // import UIKit diff --git a/yinmeng-ios/Modules/Home/HomeVoiceSearchView.swift b/yinmeng-ios/Modules/Home/HomeVoiceSearchView.swift index 46c984b..d514fe9 100644 --- a/yinmeng-ios/Modules/Home/HomeVoiceSearchView.swift +++ b/yinmeng-ios/Modules/Home/HomeVoiceSearchView.swift @@ -2,7 +2,7 @@ // HomeVoiceSearchView.swift // yinmeng-ios // -// Created by duoban on 2024/3/20. +// Created by yinmeng on 2024/3/20. // import UIKit diff --git a/yinmeng-ios/Modules/Room/Model/RoomChatData.swift b/yinmeng-ios/Modules/Room/Model/RoomChatData.swift index 492f575..a2690a5 100644 --- a/yinmeng-ios/Modules/Room/Model/RoomChatData.swift +++ b/yinmeng-ios/Modules/Room/Model/RoomChatData.swift @@ -2,7 +2,7 @@ // RoomChatData.swift // yinmeng-ios // -// Created by duoban on 2024/3/11. +// Created by yinmeng on 2024/3/11. // import Foundation diff --git a/yinmeng-ios/Modules/Room/Model/RoomDataModel.swift b/yinmeng-ios/Modules/Room/Model/RoomDataModel.swift index 1d5675e..5cce4a6 100644 --- a/yinmeng-ios/Modules/Room/Model/RoomDataModel.swift +++ b/yinmeng-ios/Modules/Room/Model/RoomDataModel.swift @@ -2,7 +2,7 @@ // RoomDataModel.swift // yinmeng-ios // -// Created by duoban on 2024/3/11. +// Created by yinmeng on 2024/3/11. // import Foundation diff --git a/yinmeng-ios/Modules/Room/Tool/YinRoomAgoraManager.swift b/yinmeng-ios/Modules/Room/Tool/YinRoomAgoraManager.swift index 8551262..b51cf50 100644 --- a/yinmeng-ios/Modules/Room/Tool/YinRoomAgoraManager.swift +++ b/yinmeng-ios/Modules/Room/Tool/YinRoomAgoraManager.swift @@ -2,7 +2,7 @@ // YinRoomAgoraManager.swift // yinmeng-ios // -// Created by duoban on 2024/3/22. +// Created by yinmeng on 2024/3/22. // import UIKit diff --git a/yinmeng-ios/Modules/Room/Tool/YinRoomAudioManager.swift b/yinmeng-ios/Modules/Room/Tool/YinRoomAudioManager.swift index 366acb5..8fc18b6 100644 --- a/yinmeng-ios/Modules/Room/Tool/YinRoomAudioManager.swift +++ b/yinmeng-ios/Modules/Room/Tool/YinRoomAudioManager.swift @@ -2,7 +2,7 @@ // YinRoomAudioanager.swift // yinmeng-ios // -// Created by duoban on 2024/3/22. +// Created by yinmeng on 2024/3/22. // import UIKit diff --git a/yinmeng-ios/Modules/Room/Tool/YinRoomTRTCManager.swift b/yinmeng-ios/Modules/Room/Tool/YinRoomTRTCManager.swift index 20ad127..daf0fd1 100644 --- a/yinmeng-ios/Modules/Room/Tool/YinRoomTRTCManager.swift +++ b/yinmeng-ios/Modules/Room/Tool/YinRoomTRTCManager.swift @@ -2,7 +2,7 @@ // YinRoomTRTCManager.swift // yinmeng-ios // -// Created by duoban on 2024/3/22. +// Created by yinmeng on 2024/3/22. // import UIKit diff --git a/yinmeng-ios/Modules/Room/VC/RoomVC.swift b/yinmeng-ios/Modules/Room/VC/RoomVC.swift index 1d6a728..0a20571 100644 --- a/yinmeng-ios/Modules/Room/VC/RoomVC.swift +++ b/yinmeng-ios/Modules/Room/VC/RoomVC.swift @@ -2,7 +2,7 @@ // RoomVC.swift // yinmeng-ios // -// Created by duoban on 2024/3/6. +// Created by yinmeng on 2024/3/6. // import NIMSDK import UIKit @@ -332,6 +332,44 @@ extension RoomVC : NIMChatManagerDelegate, NIMChatroomManagerDelegate, NIMLoginM }else if msg.messageType == .custom{ chatScreenView.dealWithCustomMsg(msg: msg) roomEffectView.dealWithCustomMsg(msg: msg) + if let obj = msg.messageObject as? NIMCustomObject,let customObj = obj.attachment as? ChatCustomMsgModel{ + if customObj.first == 3 || customObj.first == 12{ + if let model = Deserialized.toModel(with: customObj.data),let gift = model.gift == nil ? model.giftInfo : model.gift { + var userList:[String] = [] + if userList.count <= 0 { + for item in model.targetUsers { + userList.append("\(item.uid)") + } + if userList.count <= 0{ + userList.append(model.targetUid) + } + } + var starPoint = CGPoint(x: ScreenWidth/2, y: NavHeight) + if let point = micSeatView.getPointWithCell(uid: model.uid){ + if point.x <= 0 || point.y <= 0{ + + }else{ + starPoint = point + } + } + + var curPoint = CGPoint(x: ScreenWidth/2, y: NavHeight) + for userUid in userList{ + + if let point = micSeatView.getPointWithCell(uid: userUid){ + if point.x <= 0 || point.y <= 0{ + + }else{ + curPoint = point + } + } + + roomEffectView.startPlayAnimation(url: gift.giftUrl, start: starPoint, end: curPoint) + } + + } + } + } } micSeatView.dealWithNotMessage(msg: msg) menuView.dealWithNotMessage(msg: msg) diff --git a/yinmeng-ios/Modules/Room/VM/RoomVCViewModel.swift b/yinmeng-ios/Modules/Room/VM/RoomVCViewModel.swift index f61c9e0..407c316 100644 --- a/yinmeng-ios/Modules/Room/VM/RoomVCViewModel.swift +++ b/yinmeng-ios/Modules/Room/VM/RoomVCViewModel.swift @@ -2,7 +2,7 @@ // RoomVCViewModel.swift // yinmeng-ios // -// Created by duoban on 2024/3/11. +// Created by yinmeng on 2024/3/11. // import UIKit diff --git a/yinmeng-ios/Modules/Room/View/MicSeatView/Model/MicSeatGiftValueModel.swift b/yinmeng-ios/Modules/Room/View/MicSeatView/Model/MicSeatGiftValueModel.swift index 304f2d4..c5f3d73 100644 --- a/yinmeng-ios/Modules/Room/View/MicSeatView/Model/MicSeatGiftValueModel.swift +++ b/yinmeng-ios/Modules/Room/View/MicSeatView/Model/MicSeatGiftValueModel.swift @@ -2,7 +2,7 @@ // File.swift // yinmeng-ios // -// Created by duoban on 2024/3/12. +// Created by yinmeng on 2024/3/12. // import Foundation diff --git a/yinmeng-ios/Modules/Room/View/MicSeatView/Model/MicSeatModel.swift b/yinmeng-ios/Modules/Room/View/MicSeatView/Model/MicSeatModel.swift index 942111b..2c33af7 100644 --- a/yinmeng-ios/Modules/Room/View/MicSeatView/Model/MicSeatModel.swift +++ b/yinmeng-ios/Modules/Room/View/MicSeatView/Model/MicSeatModel.swift @@ -2,7 +2,7 @@ // MicSeatModel.swift // yinmeng-ios // -// Created by duoban on 2024/3/11. +// Created by yinmeng on 2024/3/11. // import UIKit diff --git a/yinmeng-ios/Modules/Room/View/MicSeatView/Model/MicSequenceModel.swift b/yinmeng-ios/Modules/Room/View/MicSeatView/Model/MicSequenceModel.swift index f67b06a..74a2212 100644 --- a/yinmeng-ios/Modules/Room/View/MicSeatView/Model/MicSequenceModel.swift +++ b/yinmeng-ios/Modules/Room/View/MicSeatView/Model/MicSequenceModel.swift @@ -2,7 +2,7 @@ // MicSequenceModel.swift // yinmeng-ios // -// Created by duoban on 2024/3/11. +// Created by yinmeng on 2024/3/11. // import UIKit diff --git a/yinmeng-ios/Modules/Room/View/MicSeatView/View/MicSeatSuperView/Cell/NormalMicSeatCell.swift b/yinmeng-ios/Modules/Room/View/MicSeatView/View/MicSeatSuperView/Cell/NormalMicSeatCell.swift index 1a47840..f5e0c77 100644 --- a/yinmeng-ios/Modules/Room/View/MicSeatView/View/MicSeatSuperView/Cell/NormalMicSeatCell.swift +++ b/yinmeng-ios/Modules/Room/View/MicSeatView/View/MicSeatSuperView/Cell/NormalMicSeatCell.swift @@ -2,7 +2,7 @@ // NormalMicSeatCell.swift // yinmeng-ios // -// Created by duoban on 2024/3/8. +// Created by yinmeng on 2024/3/8. // import UIKit diff --git a/yinmeng-ios/Modules/Room/View/MicSeatView/View/MicSeatSuperView/MicSeatSuperView.swift b/yinmeng-ios/Modules/Room/View/MicSeatView/View/MicSeatSuperView/MicSeatSuperView.swift index ecd5a1c..ee0060d 100644 --- a/yinmeng-ios/Modules/Room/View/MicSeatView/View/MicSeatSuperView/MicSeatSuperView.swift +++ b/yinmeng-ios/Modules/Room/View/MicSeatView/View/MicSeatSuperView/MicSeatSuperView.swift @@ -2,7 +2,7 @@ // MicSeatSuperView.swift // yinmeng-ios // -// Created by duoban on 2024/3/8. +// Created by yinmeng on 2024/3/8. // import UIKit diff --git a/yinmeng-ios/Modules/Room/View/MicSeatView/View/MicSeatSuperView/NormalMicSeatSuperView.swift b/yinmeng-ios/Modules/Room/View/MicSeatView/View/MicSeatSuperView/NormalMicSeatSuperView.swift index 3bd2d77..a9d1648 100644 --- a/yinmeng-ios/Modules/Room/View/MicSeatView/View/MicSeatSuperView/NormalMicSeatSuperView.swift +++ b/yinmeng-ios/Modules/Room/View/MicSeatView/View/MicSeatSuperView/NormalMicSeatSuperView.swift @@ -2,7 +2,7 @@ // NormalMicSeatSuperView.swift // yinmeng-ios // -// Created by duoban on 2024/3/8. +// Created by yinmeng on 2024/3/8. // import UIKit @@ -258,7 +258,9 @@ extension NormalMicSeatSuperView:UICollectionViewDelegate,UICollectionViewDataSo } return cell } + func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) { + guard let roomUid = self.roomData?.roomId else { return } let user = roomUserList[indexPath.row] var index:Int = -2 @@ -312,7 +314,26 @@ extension NormalMicSeatSuperView:UICollectionViewDelegate,UICollectionViewDataSo } } } - + func getPointWithCell(uid:String)->CGPoint?{ + if let user = roomOwnerView.user,let userId = user.uid{ + if uid == "\(userId)"{ + return CGPoint(x: ScreenWidth/2, y: UIDevice.scaleWidth(width: 152)) + } + } + var point = CGPoint(x: 0, y: 0) + for i in 0..<8 { + + if let cell = collectionView.cellForItem(at: IndexPath(row: i, section: 0)) as? NormalMicSeatCell{ + if let user = cell.user,let curUid = user.uid,"\(curUid)" == uid{ + let width = (ScreenWidth - UIDevice.scaleWidth(width: 20))/4 + let x = CGFloat(i) * width + UIDevice.scaleWidth(width: 10) + width / 2 + point = CGPoint(x: x, y: i < 4 ? UIDevice.scaleWidth(width: 273) : UIDevice.scaleWidth(width: 418)) + break + } + } + } + return point + } func dealWithNotMessage(msg:NIMMessage){ if let notMsg = msg.messageObject as? NIMNotificationObject,let content = notMsg.content as? NIMChatroomNotificationContent{ switch content.eventType { diff --git a/yinmeng-ios/Modules/Room/View/MicSeatView/View/MicSeatSuperView/SubView/MicSeatGiftValueView.swift b/yinmeng-ios/Modules/Room/View/MicSeatView/View/MicSeatSuperView/SubView/MicSeatGiftValueView.swift index 3b564b3..7d96757 100644 --- a/yinmeng-ios/Modules/Room/View/MicSeatView/View/MicSeatSuperView/SubView/MicSeatGiftValueView.swift +++ b/yinmeng-ios/Modules/Room/View/MicSeatView/View/MicSeatSuperView/SubView/MicSeatGiftValueView.swift @@ -2,7 +2,7 @@ // MicSeatGiftNumView.swift // yinmeng-ios // -// Created by duoban on 2024/3/8. +// Created by yinmeng on 2024/3/8. // import UIKit diff --git a/yinmeng-ios/Modules/Room/View/MicSeatView/View/MicSeatSuperView/SubView/NormalMicSeatView.swift b/yinmeng-ios/Modules/Room/View/MicSeatView/View/MicSeatSuperView/SubView/NormalMicSeatView.swift index 173c08f..ef0e586 100644 --- a/yinmeng-ios/Modules/Room/View/MicSeatView/View/MicSeatSuperView/SubView/NormalMicSeatView.swift +++ b/yinmeng-ios/Modules/Room/View/MicSeatView/View/MicSeatSuperView/SubView/NormalMicSeatView.swift @@ -2,7 +2,7 @@ // NormalMicSeatView.swift // yinmeng-ios // -// Created by duoban on 2024/3/8. +// Created by yinmeng on 2024/3/8. // import UIKit diff --git a/yinmeng-ios/Modules/Room/View/MicSeatView/View/MicSeatView/RoomNormalMicSeatView.swift b/yinmeng-ios/Modules/Room/View/MicSeatView/View/MicSeatView/RoomNormalMicSeatView.swift index ab4d00d..948c568 100644 --- a/yinmeng-ios/Modules/Room/View/MicSeatView/View/MicSeatView/RoomNormalMicSeatView.swift +++ b/yinmeng-ios/Modules/Room/View/MicSeatView/View/MicSeatView/RoomNormalMicSeatView.swift @@ -2,7 +2,7 @@ // RoomNormalMicSeatView.swift // yinmeng-ios // -// Created by duoban on 2024/3/7. +// Created by yinmeng on 2024/3/7. // import UIKit diff --git a/yinmeng-ios/Modules/Room/View/RoomBackgroundView/RoomBackgroundView.swift b/yinmeng-ios/Modules/Room/View/RoomBackgroundView/RoomBackgroundView.swift index 12faa7c..c3acc93 100644 --- a/yinmeng-ios/Modules/Room/View/RoomBackgroundView/RoomBackgroundView.swift +++ b/yinmeng-ios/Modules/Room/View/RoomBackgroundView/RoomBackgroundView.swift @@ -2,7 +2,7 @@ // RoomBackgroundView.swift // yinmeng-ios // -// Created by duoban on 2024/3/6. +// Created by yinmeng on 2024/3/6. // import UIKit diff --git a/yinmeng-ios/Modules/Room/View/RoomChatScreenView/Model/RoomMsgListModel.swift b/yinmeng-ios/Modules/Room/View/RoomChatScreenView/Model/RoomMsgListModel.swift index ea6e166..435de7e 100644 --- a/yinmeng-ios/Modules/Room/View/RoomChatScreenView/Model/RoomMsgListModel.swift +++ b/yinmeng-ios/Modules/Room/View/RoomChatScreenView/Model/RoomMsgListModel.swift @@ -2,7 +2,7 @@ // RoomMsgListModel.swift // yinmeng-ios // -// Created by duoban on 2024/3/12. +// Created by yinmeng on 2024/3/12. // import UIKit diff --git a/yinmeng-ios/Modules/Room/View/RoomChatScreenView/View/RoomChatScreenContentCell.swift b/yinmeng-ios/Modules/Room/View/RoomChatScreenView/View/RoomChatScreenContentCell.swift index d441d17..cf7d1da 100644 --- a/yinmeng-ios/Modules/Room/View/RoomChatScreenView/View/RoomChatScreenContentCell.swift +++ b/yinmeng-ios/Modules/Room/View/RoomChatScreenView/View/RoomChatScreenContentCell.swift @@ -2,7 +2,7 @@ // RoomChatScreenContentCell.swift // yinmeng-ios // -// Created by duoban on 2024/3/23. +// Created by yinmeng on 2024/3/23. // import UIKit diff --git a/yinmeng-ios/Modules/Room/View/RoomChatScreenView/View/RoomChatScreenHeaderView.swift b/yinmeng-ios/Modules/Room/View/RoomChatScreenView/View/RoomChatScreenHeaderView.swift index 0ba1e64..5b1b98e 100644 --- a/yinmeng-ios/Modules/Room/View/RoomChatScreenView/View/RoomChatScreenHeaderView.swift +++ b/yinmeng-ios/Modules/Room/View/RoomChatScreenView/View/RoomChatScreenHeaderView.swift @@ -2,7 +2,7 @@ // RoomChatScreenHeaderView.swift // yinmeng-ios // -// Created by duoban on 2024/3/8. +// Created by yinmeng on 2024/3/8. // import UIKit diff --git a/yinmeng-ios/Modules/Room/View/RoomChatScreenView/View/RoomChatScreenUserChatCell.swift b/yinmeng-ios/Modules/Room/View/RoomChatScreenView/View/RoomChatScreenUserChatCell.swift index fb8857f..05af806 100644 --- a/yinmeng-ios/Modules/Room/View/RoomChatScreenView/View/RoomChatScreenUserChatCell.swift +++ b/yinmeng-ios/Modules/Room/View/RoomChatScreenView/View/RoomChatScreenUserChatCell.swift @@ -2,7 +2,7 @@ // RoomChatScreenUserChatView.swift // yinmeng-ios // -// Created by duoban on 2024/3/8. +// Created by yinmeng on 2024/3/8. // import UIKit diff --git a/yinmeng-ios/Modules/Room/View/RoomChatScreenView/View/RoomChatScreenView.swift b/yinmeng-ios/Modules/Room/View/RoomChatScreenView/View/RoomChatScreenView.swift index b33225e..2821536 100644 --- a/yinmeng-ios/Modules/Room/View/RoomChatScreenView/View/RoomChatScreenView.swift +++ b/yinmeng-ios/Modules/Room/View/RoomChatScreenView/View/RoomChatScreenView.swift @@ -2,7 +2,7 @@ // RoomChatScreenView.swift // yinmeng-ios // -// Created by duoban on 2024/3/8. +// Created by yinmeng on 2024/3/8. // import UIKit diff --git a/yinmeng-ios/Modules/Room/View/RoomChatScreenView/ViewModel/RoomChatScreenManager.swift b/yinmeng-ios/Modules/Room/View/RoomChatScreenView/ViewModel/RoomChatScreenManager.swift index 69fe1ab..87a80a2 100644 --- a/yinmeng-ios/Modules/Room/View/RoomChatScreenView/ViewModel/RoomChatScreenManager.swift +++ b/yinmeng-ios/Modules/Room/View/RoomChatScreenView/ViewModel/RoomChatScreenManager.swift @@ -2,7 +2,7 @@ // RoomChatScreenManager.swift // yinmeng-ios // -// Created by duoban on 2024/3/23. +// Created by yinmeng on 2024/3/23. // import UIKit diff --git a/yinmeng-ios/Modules/Room/View/RoomDynamicEffectView/View/RoomDynamicEffectView.swift b/yinmeng-ios/Modules/Room/View/RoomDynamicEffectView/View/RoomDynamicEffectView.swift index 1cf69eb..55e954b 100644 --- a/yinmeng-ios/Modules/Room/View/RoomDynamicEffectView/View/RoomDynamicEffectView.swift +++ b/yinmeng-ios/Modules/Room/View/RoomDynamicEffectView/View/RoomDynamicEffectView.swift @@ -2,11 +2,11 @@ // RoomDynamicEffectView.swift // yinmeng-ios // -// Created by duoban on 2024/3/23. +// Created by yinmeng on 2024/3/23. // import UIKit - +import Nuke class RoomDynamicEffectView: UIView{ @@ -20,6 +20,7 @@ class RoomDynamicEffectView: UIView{ fatalError("init(coder:) has not been implemented") } private func setUILayout(){ + backgroundColor = .clear addSubview(vapView) addSubview(svgaView) vapView.snp.makeConstraints { make in @@ -53,7 +54,7 @@ class RoomDynamicEffectView: UIView{ return _svgaParser }() - + var giftViewList:NSMutableSet = [] } extension RoomDynamicEffectView:SVGAPlayerDelegate,HWDMP4PlayDelegate { @@ -69,8 +70,9 @@ extension RoomDynamicEffectView:SVGAPlayerDelegate,HWDMP4PlayDelegate { func playSvgaEffect(model:RectiveGiftModel){ guard let gift = model.gift == nil ? model.giftInfo : model.gift else { return } if let url = URL(string: gift.vggUrl){ - svgaView.isHidden = false + svgaParser.parse(with: url) { item in + self.svgaView.isHidden = false if let _item = item{ let width = _item.videoSize.width let height = _item.videoSize.height @@ -139,10 +141,26 @@ extension RoomDynamicEffectView:SVGAPlayerDelegate,HWDMP4PlayDelegate { vapView.isHidden = true svgaView.isHidden = true } + func startPlayAnimation(url:String,start:CGPoint,end:CGPoint){ + + + let imageView = UIImageView(frame: CGRect(x: 0, y: 0, width: UIDevice.scaleWidth(width: 55), height: UIDevice.scaleWidth(width: 55))) + imageView.center = start + imageView.layer.anchorPoint = CGPoint(x: 0.5, y: 0.5) + + Nuke.loadImage(with: url, into: imageView, completion: nil) + self.addSubview(imageView) + let g = YinGetPointGroup.getPoint(start, end: end, center: CGPoint(x: ScreenWidth/2, y: ScreenHeight/2)) + imageView.layer.add(g, forKey: "kPlayAnimation") + self.perform(#selector(imageViewDidFinish(imageView:)), with: imageView, afterDelay: 4) + } + @objc func imageViewDidFinish(imageView:UIImageView){ + imageView.removeFromSuperview() + imageView.image = nil + + } func dealWithCustomMsg(msg:NIMMessage){ - if let obj = msg.messageObject{ - print(obj) - } + if let obj = msg.messageObject as? NIMCustomObject,let customObj = obj.attachment as? ChatCustomMsgModel{ if customObj.first == 3 || customObj.first == 12{ if let model = Deserialized.toModel(with: customObj.data),let gift = model.gift == nil ? model.giftInfo : model.gift { diff --git a/yinmeng-ios/Modules/Room/View/RoomMenuView/View/RoomMenuView.swift b/yinmeng-ios/Modules/Room/View/RoomMenuView/View/RoomMenuView.swift index 79245e5..7726937 100644 --- a/yinmeng-ios/Modules/Room/View/RoomMenuView/View/RoomMenuView.swift +++ b/yinmeng-ios/Modules/Room/View/RoomMenuView/View/RoomMenuView.swift @@ -2,7 +2,7 @@ // RoomMenuView.swift // yinmeng-ios // -// Created by duoban on 2024/3/11. +// Created by yinmeng on 2024/3/11. // import UIKit diff --git a/yinmeng-ios/Modules/Room/View/RoomMenuView/View/RoomSendTextView.swift b/yinmeng-ios/Modules/Room/View/RoomMenuView/View/RoomSendTextView.swift index 1a1337a..95d4370 100644 --- a/yinmeng-ios/Modules/Room/View/RoomMenuView/View/RoomSendTextView.swift +++ b/yinmeng-ios/Modules/Room/View/RoomMenuView/View/RoomSendTextView.swift @@ -2,7 +2,7 @@ // RoomSendTextView.swift // yinmeng-ios // -// Created by duoban on 2024/3/11. +// Created by yinmeng on 2024/3/11. // import UIKit diff --git a/yinmeng-ios/Modules/Room/View/RoomQuitView/Model/RoomQuitItemModel.swift b/yinmeng-ios/Modules/Room/View/RoomQuitView/Model/RoomQuitItemModel.swift index 2a18e68..d2533d5 100644 --- a/yinmeng-ios/Modules/Room/View/RoomQuitView/Model/RoomQuitItemModel.swift +++ b/yinmeng-ios/Modules/Room/View/RoomQuitView/Model/RoomQuitItemModel.swift @@ -2,7 +2,7 @@ // RoomQuitItemModel.swift // yinmeng-ios // -// Created by duoban on 2024/3/7. +// Created by yinmeng on 2024/3/7. // import UIKit diff --git a/yinmeng-ios/Modules/Room/View/RoomQuitView/Model/RoomQuitModel.swift b/yinmeng-ios/Modules/Room/View/RoomQuitView/Model/RoomQuitModel.swift index 46f8bc3..b101c8e 100644 --- a/yinmeng-ios/Modules/Room/View/RoomQuitView/Model/RoomQuitModel.swift +++ b/yinmeng-ios/Modules/Room/View/RoomQuitView/Model/RoomQuitModel.swift @@ -2,7 +2,7 @@ // RoomQuitView.swift // yinmeng-ios // -// Created by duoban on 2024/3/6. +// Created by yinmeng on 2024/3/6. // import Foundation diff --git a/yinmeng-ios/Modules/Room/View/RoomQuitView/VM/RoomQuitViewModel.swift b/yinmeng-ios/Modules/Room/View/RoomQuitView/VM/RoomQuitViewModel.swift index b960f60..993a043 100644 --- a/yinmeng-ios/Modules/Room/View/RoomQuitView/VM/RoomQuitViewModel.swift +++ b/yinmeng-ios/Modules/Room/View/RoomQuitView/VM/RoomQuitViewModel.swift @@ -2,7 +2,7 @@ // RoomQuitViewModel.swift // yinmeng-ios // -// Created by duoban on 2024/3/7. +// Created by yinmeng on 2024/3/7. // import UIKit diff --git a/yinmeng-ios/Modules/Room/View/RoomQuitView/View/RoomQuitClickCell.swift b/yinmeng-ios/Modules/Room/View/RoomQuitView/View/RoomQuitClickCell.swift index 4c8f85e..3005195 100644 --- a/yinmeng-ios/Modules/Room/View/RoomQuitView/View/RoomQuitClickCell.swift +++ b/yinmeng-ios/Modules/Room/View/RoomQuitView/View/RoomQuitClickCell.swift @@ -2,7 +2,7 @@ // RoomQuitClickCell.swift // yinmeng-ios // -// Created by duoban on 2024/3/6. +// Created by yinmeng on 2024/3/6. // import UIKit diff --git a/yinmeng-ios/Modules/Room/View/RoomQuitView/View/RoomQuitUserInfoCell.swift b/yinmeng-ios/Modules/Room/View/RoomQuitView/View/RoomQuitUserInfoCell.swift index 636b130..ab9b484 100644 --- a/yinmeng-ios/Modules/Room/View/RoomQuitView/View/RoomQuitUserInfoCell.swift +++ b/yinmeng-ios/Modules/Room/View/RoomQuitView/View/RoomQuitUserInfoCell.swift @@ -2,7 +2,7 @@ // RoomQuitUserInfoCell.swift // yinmeng-ios // -// Created by duoban on 2024/3/6. +// Created by yinmeng on 2024/3/6. // import UIKit diff --git a/yinmeng-ios/Modules/Room/View/RoomQuitView/View/RoomQuitUserInfoEmptyCell.swift b/yinmeng-ios/Modules/Room/View/RoomQuitView/View/RoomQuitUserInfoEmptyCell.swift index fa1f7c5..0dedcdd 100644 --- a/yinmeng-ios/Modules/Room/View/RoomQuitView/View/RoomQuitUserInfoEmptyCell.swift +++ b/yinmeng-ios/Modules/Room/View/RoomQuitView/View/RoomQuitUserInfoEmptyCell.swift @@ -2,7 +2,7 @@ // RoomQuitUserInfoEmptyCell.swift // yinmeng-ios // -// Created by duoban on 2024/3/6. +// Created by yinmeng on 2024/3/6. // import UIKit diff --git a/yinmeng-ios/Modules/Room/View/RoomQuitView/View/RoomQuitView.swift b/yinmeng-ios/Modules/Room/View/RoomQuitView/View/RoomQuitView.swift index 2de8256..28abadc 100644 --- a/yinmeng-ios/Modules/Room/View/RoomQuitView/View/RoomQuitView.swift +++ b/yinmeng-ios/Modules/Room/View/RoomQuitView/View/RoomQuitView.swift @@ -2,7 +2,7 @@ // RoomQuitView.swift // yinmeng-ios // -// Created by duoban on 2024/3/6. +// Created by yinmeng on 2024/3/6. // import UIKit diff --git a/yinmeng-ios/Modules/Room/View/RoomTopView/Model/YinRoomRankModel.swift b/yinmeng-ios/Modules/Room/View/RoomTopView/Model/YinRoomRankModel.swift index c094145..851f04c 100644 --- a/yinmeng-ios/Modules/Room/View/RoomTopView/Model/YinRoomRankModel.swift +++ b/yinmeng-ios/Modules/Room/View/RoomTopView/Model/YinRoomRankModel.swift @@ -2,7 +2,7 @@ // YinRoomRankModel.swift // yinmeng-ios // -// Created by duoban on 2024/3/22. +// Created by yinmeng on 2024/3/22. // import UIKit diff --git a/yinmeng-ios/Modules/Room/View/RoomTopView/View/RoomTopView.swift b/yinmeng-ios/Modules/Room/View/RoomTopView/View/RoomTopView.swift index c343a75..bba5d5a 100644 --- a/yinmeng-ios/Modules/Room/View/RoomTopView/View/RoomTopView.swift +++ b/yinmeng-ios/Modules/Room/View/RoomTopView/View/RoomTopView.swift @@ -2,7 +2,7 @@ // RoomTopView.swift // yinmeng-ios // -// Created by duoban on 2024/3/6. +// Created by yinmeng on 2024/3/6. // import UIKit diff --git a/yinmeng-ios/Modules/Room/View/RoomTopView/View/YinRoomRankItemView.swift b/yinmeng-ios/Modules/Room/View/RoomTopView/View/YinRoomRankItemView.swift index 11f0ff7..7f1ed34 100644 --- a/yinmeng-ios/Modules/Room/View/RoomTopView/View/YinRoomRankItemView.swift +++ b/yinmeng-ios/Modules/Room/View/RoomTopView/View/YinRoomRankItemView.swift @@ -2,7 +2,7 @@ // YinRoomRankItemView.swift // yinmeng-ios // -// Created by duoban on 2024/3/22. +// Created by yinmeng on 2024/3/22. // import UIKit diff --git a/yinmeng-ios/Modules/Room/View/RoomTopView/View/YinRoomRankView.swift b/yinmeng-ios/Modules/Room/View/RoomTopView/View/YinRoomRankView.swift index 7f3ee8e..4e48b1b 100644 --- a/yinmeng-ios/Modules/Room/View/RoomTopView/View/YinRoomRankView.swift +++ b/yinmeng-ios/Modules/Room/View/RoomTopView/View/YinRoomRankView.swift @@ -2,7 +2,7 @@ // YinRoomRankView.swift // yinmeng-ios // -// Created by duoban on 2024/3/22. +// Created by yinmeng on 2024/3/22. // import UIKit diff --git a/yinmeng-ios/Modules/Room/View/SendGift/Model/RectiveGiftModel.swift b/yinmeng-ios/Modules/Room/View/SendGift/Model/RectiveGiftModel.swift index 93f98f9..6748101 100644 --- a/yinmeng-ios/Modules/Room/View/SendGift/Model/RectiveGiftModel.swift +++ b/yinmeng-ios/Modules/Room/View/SendGift/Model/RectiveGiftModel.swift @@ -2,7 +2,7 @@ // RectiveGiftModel.swift // yinmeng-ios // -// Created by duoban on 2024/3/23. +// Created by yinmeng on 2024/3/23. // import UIKit diff --git a/yinmeng-ios/Modules/Room/View/SendGift/Model/RectiveGiftUserModel.swift b/yinmeng-ios/Modules/Room/View/SendGift/Model/RectiveGiftUserModel.swift index 52c519d..2b743e8 100644 --- a/yinmeng-ios/Modules/Room/View/SendGift/Model/RectiveGiftUserModel.swift +++ b/yinmeng-ios/Modules/Room/View/SendGift/Model/RectiveGiftUserModel.swift @@ -2,7 +2,7 @@ // RectiveGiftUserModel.swift // yinmeng-ios // -// Created by duoban on 2024/3/23. +// Created by yinmeng on 2024/3/23. // import UIKit diff --git a/yinmeng-ios/Modules/Room/View/SendGift/Model/SendGiftModel.swift b/yinmeng-ios/Modules/Room/View/SendGift/Model/SendGiftModel.swift index 4af1853..f5ff95c 100644 --- a/yinmeng-ios/Modules/Room/View/SendGift/Model/SendGiftModel.swift +++ b/yinmeng-ios/Modules/Room/View/SendGift/Model/SendGiftModel.swift @@ -2,7 +2,7 @@ // SendGiftModel.swift // yinmeng-ios // -// Created by duoban on 2024/3/22. +// Created by yinmeng on 2024/3/22. // import UIKit diff --git a/yinmeng-ios/Modules/Room/View/SendGift/Model/SendGiftSendNumModel.swift b/yinmeng-ios/Modules/Room/View/SendGift/Model/SendGiftSendNumModel.swift index f7305db..0d49563 100644 --- a/yinmeng-ios/Modules/Room/View/SendGift/Model/SendGiftSendNumModel.swift +++ b/yinmeng-ios/Modules/Room/View/SendGift/Model/SendGiftSendNumModel.swift @@ -2,7 +2,7 @@ // SendGiftSendNumModel.swift // yinmeng-ios // -// Created by duoban on 2024/3/22. +// Created by yinmeng on 2024/3/22. // import UIKit diff --git a/yinmeng-ios/Modules/Room/View/SendGift/Model/SendGiftUserModel.swift b/yinmeng-ios/Modules/Room/View/SendGift/Model/SendGiftUserModel.swift index 606fdcf..684ebdf 100644 --- a/yinmeng-ios/Modules/Room/View/SendGift/Model/SendGiftUserModel.swift +++ b/yinmeng-ios/Modules/Room/View/SendGift/Model/SendGiftUserModel.swift @@ -2,7 +2,7 @@ // SendGiftUserModel.swift // yinmeng-ios // -// Created by duoban on 2024/3/14. +// Created by yinmeng on 2024/3/14. // import UIKit diff --git a/yinmeng-ios/Modules/Room/View/SendGift/View/SendGiftCell.swift b/yinmeng-ios/Modules/Room/View/SendGift/View/SendGiftCell.swift index 97ed01b..4f5909c 100644 --- a/yinmeng-ios/Modules/Room/View/SendGift/View/SendGiftCell.swift +++ b/yinmeng-ios/Modules/Room/View/SendGift/View/SendGiftCell.swift @@ -2,7 +2,7 @@ // SendGiftCell.swift // yinmeng-ios // -// Created by duoban on 2024/3/22. +// Created by yinmeng on 2024/3/22. // import UIKit diff --git a/yinmeng-ios/Modules/Room/View/SendGift/View/SendGiftSendNumCell.swift b/yinmeng-ios/Modules/Room/View/SendGift/View/SendGiftSendNumCell.swift index f92b7a1..065fcb3 100644 --- a/yinmeng-ios/Modules/Room/View/SendGift/View/SendGiftSendNumCell.swift +++ b/yinmeng-ios/Modules/Room/View/SendGift/View/SendGiftSendNumCell.swift @@ -2,7 +2,7 @@ // SendGiftSendNumCell.swift // yinmeng-ios // -// Created by duoban on 2024/3/22. +// Created by yinmeng on 2024/3/22. // import UIKit diff --git a/yinmeng-ios/Modules/Room/View/SendGift/View/SendGiftSendNumView.swift b/yinmeng-ios/Modules/Room/View/SendGift/View/SendGiftSendNumView.swift index 478941f..5426ff2 100644 --- a/yinmeng-ios/Modules/Room/View/SendGift/View/SendGiftSendNumView.swift +++ b/yinmeng-ios/Modules/Room/View/SendGift/View/SendGiftSendNumView.swift @@ -2,7 +2,7 @@ // SendGiftSendNumView.swift // yinmeng-ios // -// Created by duoban on 2024/3/22. +// Created by yinmeng on 2024/3/22. // import UIKit @@ -58,6 +58,7 @@ class SendGiftSendNumView: UIView { } + //MARK: - 懒加载 var listData:[SendGiftSendNumModel] = [] private lazy var visualEffectView:UIVisualEffectView = { @@ -87,7 +88,7 @@ extension SendGiftSendNumView:UITableViewDelegate,UITableViewDataSource{ return cell } func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { - + if let _clickSendNumBlcok = clickSendNumBlcok{ let model = listData[safe: indexPath.row]! _clickSendNumBlcok(model) diff --git a/yinmeng-ios/Modules/Room/View/SendGift/View/SendGiftSendView.swift b/yinmeng-ios/Modules/Room/View/SendGift/View/SendGiftSendView.swift index 8d6e667..d5657cc 100644 --- a/yinmeng-ios/Modules/Room/View/SendGift/View/SendGiftSendView.swift +++ b/yinmeng-ios/Modules/Room/View/SendGift/View/SendGiftSendView.swift @@ -2,7 +2,7 @@ // SendGiftSendView.swift // yinmeng-ios // -// Created by duoban on 2024/3/22. +// Created by yinmeng on 2024/3/22. // import UIKit diff --git a/yinmeng-ios/Modules/Room/View/SendGift/View/SendGiftTopView.swift b/yinmeng-ios/Modules/Room/View/SendGift/View/SendGiftTopView.swift index 7705e94..4f0b664 100644 --- a/yinmeng-ios/Modules/Room/View/SendGift/View/SendGiftTopView.swift +++ b/yinmeng-ios/Modules/Room/View/SendGift/View/SendGiftTopView.swift @@ -2,7 +2,7 @@ // SendGiftTopView.swift // yinmeng-ios // -// Created by duoban on 2024/3/14. +// Created by yinmeng on 2024/3/14. // import UIKit diff --git a/yinmeng-ios/Modules/Room/View/SendGift/View/SendGiftUserCell.swift b/yinmeng-ios/Modules/Room/View/SendGift/View/SendGiftUserCell.swift index 7bb8a81..f44bb3c 100644 --- a/yinmeng-ios/Modules/Room/View/SendGift/View/SendGiftUserCell.swift +++ b/yinmeng-ios/Modules/Room/View/SendGift/View/SendGiftUserCell.swift @@ -2,7 +2,7 @@ // SendGiftUserCell.swift // yinmeng-ios // -// Created by duoban on 2024/3/14. +// Created by yinmeng on 2024/3/14. // import UIKit diff --git a/yinmeng-ios/Modules/Room/View/SendGift/View/SendGiftUserView.swift b/yinmeng-ios/Modules/Room/View/SendGift/View/SendGiftUserView.swift index 73f1f35..1191a09 100644 --- a/yinmeng-ios/Modules/Room/View/SendGift/View/SendGiftUserView.swift +++ b/yinmeng-ios/Modules/Room/View/SendGift/View/SendGiftUserView.swift @@ -2,7 +2,7 @@ // SendGiftUserView.swift // yinmeng-ios // -// Created by duoban on 2024/3/14. +// Created by yinmeng on 2024/3/14. // import UIKit diff --git a/yinmeng-ios/Modules/Room/View/SendGift/View/SendGiftVC.swift b/yinmeng-ios/Modules/Room/View/SendGift/View/SendGiftVC.swift index d792d96..0371863 100644 --- a/yinmeng-ios/Modules/Room/View/SendGift/View/SendGiftVC.swift +++ b/yinmeng-ios/Modules/Room/View/SendGift/View/SendGiftVC.swift @@ -2,7 +2,7 @@ // SendGiftVC.swift // yinmeng-ios // -// Created by duoban on 2024/3/22. +// Created by yinmeng on 2024/3/22. // import UIKit diff --git a/yinmeng-ios/Modules/Room/View/SendGift/View/SendGiftView.swift b/yinmeng-ios/Modules/Room/View/SendGift/View/SendGiftView.swift index 4e9c70e..a4f6e63 100644 --- a/yinmeng-ios/Modules/Room/View/SendGift/View/SendGiftView.swift +++ b/yinmeng-ios/Modules/Room/View/SendGift/View/SendGiftView.swift @@ -2,7 +2,7 @@ // SendGiftView.swift // yinmeng-ios // -// Created by duoban on 2024/3/22. +// Created by yinmeng on 2024/3/22. // import UIKit