diff --git a/YuMi.xcodeproj/project.pbxproj b/YuMi.xcodeproj/project.pbxproj index 7e0e5537..dcd06437 100644 --- a/YuMi.xcodeproj/project.pbxproj +++ b/YuMi.xcodeproj/project.pbxproj @@ -505,6 +505,7 @@ 4C6E1F752CEAEC3C0073D0A3 /* ShoppingMallTagView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C6E1F742CEAEC3C0073D0A3 /* ShoppingMallTagView.m */; }; 4C6E1F792CEB12780073D0A3 /* UIView+GradientLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C6E1F782CEB12780073D0A3 /* UIView+GradientLayer.m */; }; 4C6E1F7C2CEB25B10073D0A3 /* ShoppingMallItemPreview.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C6E1F7B2CEB25B10073D0A3 /* ShoppingMallItemPreview.m */; }; + 4C6E31EC2D35010F00D8EEDD /* RoomAnimationView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C6E31EB2D35010F00D8EEDD /* RoomAnimationView.m */; }; 4C71C69F2D069D2B00ECCA24 /* GiftAnimationHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C71C69E2D069D2B00ECCA24 /* GiftAnimationHelper.m */; }; 4C71C6A22D06DB3D00ECCA24 /* GiftAnimationManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C71C6A12D06DB3D00ECCA24 /* GiftAnimationManager.m */; }; 4C7989EC2D19392E006AE07B /* EmptyDataView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C7989EB2D19392E006AE07B /* EmptyDataView.m */; }; @@ -2615,6 +2616,8 @@ 4C6E1F782CEB12780073D0A3 /* UIView+GradientLayer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIView+GradientLayer.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 = ""; }; 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 = ""; }; @@ -8336,6 +8339,8 @@ E838D99D275E1B6C0079E0B5 /* AnimationView */ = { isa = PBXGroup; children = ( + 4C6E31EA2D35010F00D8EEDD /* RoomAnimationView.h */, + 4C6E31EB2D35010F00D8EEDD /* RoomAnimationView.m */, E83DB47E274649B200D8CBD1 /* Model */, E8C214FF274B76F60079E6BF /* XPRoomAnimationHitView.h */, E8C21500274B76F60079E6BF /* XPRoomAnimationHitView.m */, @@ -12663,6 +12668,7 @@ 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 */, diff --git a/YuMi/Assets.xcassets/1.0.34/room_manager_limit.imageset/Contents.json b/YuMi/Assets.xcassets/1.0.34/room_manager_limit.imageset/Contents.json index 2b659d3f..f40b62af 100644 --- a/YuMi/Assets.xcassets/1.0.34/room_manager_limit.imageset/Contents.json +++ b/YuMi/Assets.xcassets/1.0.34/room_manager_limit.imageset/Contents.json @@ -9,7 +9,7 @@ "scale" : "2x" }, { - "filename" : "from@3x.png", + "filename" : "room_manager_limit@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/YuMi/Assets.xcassets/1.0.34/room_manager_limit.imageset/room_manager_limit@3x.png b/YuMi/Assets.xcassets/1.0.34/room_manager_limit.imageset/room_manager_limit@3x.png new file mode 100644 index 00000000..382ea501 Binary files /dev/null and b/YuMi/Assets.xcassets/1.0.34/room_manager_limit.imageset/room_manager_limit@3x.png differ diff --git a/YuMi/Assets.xcassets/Language/ar/room_manager_limit_ar.imageset/Contents.json b/YuMi/Assets.xcassets/Language/ar/room_manager_limit_ar.imageset/Contents.json new file mode 100644 index 00000000..64609ff2 --- /dev/null +++ b/YuMi/Assets.xcassets/Language/ar/room_manager_limit_ar.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "room_manager_limit_ar@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Language/ar/room_manager_limit_ar.imageset/room_manager_limit_ar@3x.png b/YuMi/Assets.xcassets/Language/ar/room_manager_limit_ar.imageset/room_manager_limit_ar@3x.png new file mode 100644 index 00000000..27690406 Binary files /dev/null and b/YuMi/Assets.xcassets/Language/ar/room_manager_limit_ar.imageset/room_manager_limit_ar@3x.png differ diff --git a/YuMi/Assets.xcassets/Language/en/room_manager_limit_en.imageset/Contents.json b/YuMi/Assets.xcassets/Language/en/room_manager_limit_en.imageset/Contents.json new file mode 100644 index 00000000..ecfdc2ae --- /dev/null +++ b/YuMi/Assets.xcassets/Language/en/room_manager_limit_en.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "room_manager_limit_en@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/1.0.34/room_manager_limit.imageset/from@3x.png b/YuMi/Assets.xcassets/Language/en/room_manager_limit_en.imageset/room_manager_limit_en@3x.png similarity index 100% rename from YuMi/Assets.xcassets/1.0.34/room_manager_limit.imageset/from@3x.png rename to YuMi/Assets.xcassets/Language/en/room_manager_limit_en.imageset/room_manager_limit_en@3x.png diff --git a/YuMi/Assets.xcassets/Language/tr/Contents.json b/YuMi/Assets.xcassets/Language/tr/Contents.json new file mode 100644 index 00000000..73c00596 --- /dev/null +++ b/YuMi/Assets.xcassets/Language/tr/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Language/tr/room_manager_limit_tr.imageset/Contents.json b/YuMi/Assets.xcassets/Language/tr/room_manager_limit_tr.imageset/Contents.json new file mode 100644 index 00000000..be3dbcf6 --- /dev/null +++ b/YuMi/Assets.xcassets/Language/tr/room_manager_limit_tr.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "room_manager_limit_tr@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Language/tr/room_manager_limit_tr.imageset/room_manager_limit_tr@3x.png b/YuMi/Assets.xcassets/Language/tr/room_manager_limit_tr.imageset/room_manager_limit_tr@3x.png new file mode 100644 index 00000000..5f46f229 Binary files /dev/null and b/YuMi/Assets.xcassets/Language/tr/room_manager_limit_tr.imageset/room_manager_limit_tr@3x.png differ diff --git a/YuMi/Modules/YMRoom/View/AnimationView/RoomAnimationView.h b/YuMi/Modules/YMRoom/View/AnimationView/RoomAnimationView.h new file mode 100644 index 00000000..77e6c20b --- /dev/null +++ b/YuMi/Modules/YMRoom/View/AnimationView/RoomAnimationView.h @@ -0,0 +1,16 @@ +// +// RoomAnimationView.h +// YuMi +// +// Created by P on 2025/1/13. +// + +#import "XPRoomAnimationHitView.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface RoomAnimationView : XPRoomAnimationHitView + +@end + +NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnimationView/RoomAnimationView.m b/YuMi/Modules/YMRoom/View/AnimationView/RoomAnimationView.m new file mode 100644 index 00000000..669a01fb --- /dev/null +++ b/YuMi/Modules/YMRoom/View/AnimationView/RoomAnimationView.m @@ -0,0 +1,20 @@ +// +// RoomAnimationView.m +// YuMi +// +// Created by P on 2025/1/13. +// + +#import "RoomAnimationView.h" + +@implementation RoomAnimationView + +/* +// 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/UserCard/View/UserRoomCardViewController.m b/YuMi/Modules/YMRoom/View/UserCard/View/UserRoomCardViewController.m index e4ff508a..5354f9be 100644 --- a/YuMi/Modules/YMRoom/View/UserCard/View/UserRoomCardViewController.m +++ b/YuMi/Modules/YMRoom/View/UserCard/View/UserRoomCardViewController.m @@ -1165,7 +1165,13 @@ [self dismissViewControllerAnimated:YES completion:nil]; } -- (void)handleTapItem:(XPUserCardItemModel *)item { +- (void)handleTapItem:(XPUserCardItemModel *)item { + +#if DEBUG + [TTPopup popupView:[self managerLimitToast] style:TTPopupStyleAlert]; + return; +#endif + NSString * roomId = [NSString stringWithFormat:@"%ld", self.cardInfo.roomInfo.roomId]; NSString * roomUid = [NSString stringWithFormat:@"%ld", self.cardInfo.roomInfo.uid]; @@ -1253,7 +1259,7 @@ } - (UIView *)managerLimitToast { - UIView *view = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth-80, kGetScaleWidth(410))]; + UIView *view = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth-80, kGetScaleWidth(420))]; view.userInteractionEnabled = YES; [view setBackgroundColor:[UIColor whiteColor]]; [view setCornerRadius:16]; @@ -1262,7 +1268,7 @@ 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:kImage(@"room_manager_limit")]; + 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]; @@ -1294,7 +1300,7 @@ [ruleImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.leading.trailing.mas_equalTo(tipContentLabel); - make.top.mas_equalTo(tipTitleLabel.mas_bottom).offset(70); + make.top.mas_equalTo(tipTitleLabel.mas_bottom).offset(80); make.bottom.mas_equalTo(confirmButton.mas_top).offset(-10); }];