moliparty/peko-ios
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

70% 完成需求

Browse Source
This commit is contained in:
edwinQQQ
2024-12-16 19:41:23 +08:00
parent 68370912b2
commit e82939f767
77 changed files with 3232 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
YuMi.xcodeproj/project.pbxproj
View File

@@ -497,6 +497,7 @@
23FF42792AA6E19C0055733C /* HomeMenuSourceModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FF42782AA6E19C0055733C /* HomeMenuSourceModel.m */; };
23FF428E2AAB2D3A0055733C /* XPCandyTreeBuyView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FF428D2AAB2D3A0055733C /* XPCandyTreeBuyView.m */; };
4C1892992CF84349004D4426 /* RoomCahtCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C1892982CF84349004D4426 /* RoomCahtCell.m */; };
4C5C37232D0C1C7900BA9AB8 /* RegionListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C5C37222D0C1C7900BA9AB8 /* RegionListViewController.m */; };
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 */; };
@@ -505,6 +506,11 @@
4C815A172CFEB758002A46A6 /* SuperBlockViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C815A162CFEB758002A46A6 /* SuperBlockViewController.m */; };
4CC6195A2CEC7770008C1EE8 /* MyDressingDataPresent.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CC619592CEC7770008C1EE8 /* MyDressingDataPresent.m */; };
4CC6195D2CEC996E008C1EE8 /* MyDressingDataModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CC6195C2CEC996E008C1EE8 /* MyDressingDataModel.m */; };
4CEB9EA72D09643E00443480 /* UserRoomCardViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CEB9EA62D09643E00443480 /* UserRoomCardViewController.m */; };
4CEB9EAA2D097E8400443480 /* MoliAvatar.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CEB9EA92D097E8400443480 /* MoliAvatar.m */; };
4CEB9EAD2D09AA0400443480 /* SexAgeLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CEB9EAC2D09AA0400443480 /* SexAgeLabel.m */; };
4CEB9EB02D0AF4FE00443480 /* TwentyMicStageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CEB9EAF2D0AF4FE00443480 /* TwentyMicStageView.m */; };
4CEB9EB32D0AFCE200443480 /* NineteenMicStageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CEB9EB22D0AFCE200443480 /* NineteenMicStageView.m */; };
540EC1D02C89925F00F3BF0D /* GiftComboView.m in Sources */ = {isa = PBXBuildFile; fileRef = 540EC1CF2C89925F00F3BF0D /* GiftComboView.m */; };
540EC1D32C89998500F3BF0D /* GiftComboManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 540EC1D22C89998500F3BF0D /* GiftComboManager.m */; };
5412E0F42C4E460300FDD668 /* XPMineCenterAgencyView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5412E0F32C4E460300FDD668 /* XPMineCenterAgencyView.m */; };
@@ -2584,6 +2590,8 @@
23FF428D2AAB2D3A0055733C /* XPCandyTreeBuyView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPCandyTreeBuyView.m; sourceTree = "<group>"; };
4C1892972CF84349004D4426 /* RoomCahtCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoomCahtCell.h; sourceTree = "<group>"; };
4C1892982CF84349004D4426 /* RoomCahtCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RoomCahtCell.m; sourceTree = "<group>"; };
4C5C37212D0C1C7900BA9AB8 /* RegionListViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RegionListViewController.h; sourceTree = "<group>"; };
4C5C37222D0C1C7900BA9AB8 /* RegionListViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RegionListViewController.m; sourceTree = "<group>"; };
4C6E1F732CEAEC3C0073D0A3 /* ShoppingMallTagView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShoppingMallTagView.h; sourceTree = "<group>"; };
4C6E1F742CEAEC3C0073D0A3 /* ShoppingMallTagView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShoppingMallTagView.m; sourceTree = "<group>"; };
4C6E1F772CEB12780073D0A3 /* UIView+GradientLayer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIView+GradientLayer.h"; sourceTree = "<group>"; };
@@ -2600,6 +2608,16 @@
4CC619592CEC7770008C1EE8 /* MyDressingDataPresent.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MyDressingDataPresent.m; sourceTree = "<group>"; };
4CC6195B2CEC996E008C1EE8 /* MyDressingDataModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MyDressingDataModel.h; sourceTree = "<group>"; };
4CC6195C2CEC996E008C1EE8 /* MyDressingDataModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MyDressingDataModel.m; sourceTree = "<group>"; };
4CEB9EA52D09643E00443480 /* UserRoomCardViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UserRoomCardViewController.h; sourceTree = "<group>"; };
4CEB9EA62D09643E00443480 /* UserRoomCardViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UserRoomCardViewController.m; sourceTree = "<group>"; };
4CEB9EA82D097E8400443480 /* MoliAvatar.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MoliAvatar.h; sourceTree = "<group>"; };
4CEB9EA92D097E8400443480 /* MoliAvatar.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MoliAvatar.m; sourceTree = "<group>"; };
4CEB9EAB2D09AA0400443480 /* SexAgeLabel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SexAgeLabel.h; sourceTree = "<group>"; };
4CEB9EAC2D09AA0400443480 /* SexAgeLabel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SexAgeLabel.m; sourceTree = "<group>"; };
4CEB9EAE2D0AF4FE00443480 /* TwentyMicStageView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TwentyMicStageView.h; sourceTree = "<group>"; };
4CEB9EAF2D0AF4FE00443480 /* TwentyMicStageView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TwentyMicStageView.m; sourceTree = "<group>"; };
4CEB9EB12D0AFCE200443480 /* NineteenMicStageView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NineteenMicStageView.h; sourceTree = "<group>"; };
4CEB9EB22D0AFCE200443480 /* NineteenMicStageView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NineteenMicStageView.m; sourceTree = "<group>"; };
540EC1CE2C89925F00F3BF0D /* GiftComboView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GiftComboView.h; sourceTree = "<group>"; };
540EC1CF2C89925F00F3BF0D /* GiftComboView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GiftComboView.m; sourceTree = "<group>"; };
540EC1D12C89998500F3BF0D /* GiftComboManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GiftComboManager.h; sourceTree = "<group>"; };
@@ -5197,6 +5215,10 @@
189DD68226E1FDBB00AB55B1 /* XNDJTDDLoadingTool.m */,
E8B825CB26EA18C8009E8E9F /* DJDKMIMOMColor.h */,
E8B825CC26EA18C8009E8E9F /* DJDKMIMOMColor.m */,
4CEB9EA82D097E8400443480 /* MoliAvatar.h */,
4CEB9EA92D097E8400443480 /* MoliAvatar.m */,
4CEB9EAB2D09AA0400443480 /* SexAgeLabel.h */,
4CEB9EAC2D09AA0400443480 /* SexAgeLabel.m */,
);
path = CustomUI;
sourceTree = "<group>";
@@ -5221,6 +5243,8 @@
E824543426F57D6E00BE8163 /* XPLoginVerifBindPhoneViewController.m */,
23B2AEC32A6516C200543D17 /* LoginForgetPasswordViewController.h */,
23B2AEC22A6516C200543D17 /* LoginForgetPasswordViewController.m */,
4C5C37212D0C1C7900BA9AB8 /* RegionListViewController.h */,
4C5C37222D0C1C7900BA9AB8 /* RegionListViewController.m */,
);
path = View;
sourceTree = "<group>";
@@ -8167,6 +8191,8 @@
E82325FD274E48D0003A3332 /* Cell */,
E82325F0274E2DE6003A3332 /* XPUserCardViewController.h */,
E82325F1274E2DE6003A3332 /* XPUserCardViewController.m */,
4CEB9EA52D09643E00443480 /* UserRoomCardViewController.h */,
4CEB9EA62D09643E00443480 /* UserRoomCardViewController.m */,
);
path = View;
sourceTree = "<group>";
@@ -10599,6 +10625,10 @@
236B2E512AA08756003967A8 /* LittleGameScrollStageView.m */,
236B2E522AA08757003967A8 /* LittleGameStageView.h */,
236B2E502AA08756003967A8 /* LittleGameStageView.m */,
4CEB9EAE2D0AF4FE00443480 /* TwentyMicStageView.h */,
4CEB9EAF2D0AF4FE00443480 /* TwentyMicStageView.m */,
4CEB9EB12D0AFCE200443480 /* NineteenMicStageView.h */,
4CEB9EB22D0AFCE200443480 /* NineteenMicStageView.m */,
);
path = StageView;
sourceTree = "<group>";
@@ -11883,6 +11913,7 @@
23E9EAAE2A84C9B800B792F2 /* XPMineUserInfoTagView.m in Sources */,
236B2E4E2AA07D06003967A8 /* Api+LittleGame.m in Sources */,
237700E02BC7D78600D661F1 /* MSBaseRTLFlowLayout.m in Sources */,
4CEB9EB32D0AFCE200443480 /* NineteenMicStageView.m in Sources */,
2331C1B32A60F32D00E1D940 /* XPCandyTreeMoreRuleCell.m in Sources */,
14A6034C29A35EE600D2A6A5 /* XPMineItemTableViewCell.m in Sources */,
9BAC92F528E6E63000147DD8 /* XPRoomInsideOperationCell.m in Sources */,
@@ -12158,6 +12189,7 @@
E8B846CF26FDD96100A777FE /* XPMineRechageHeadView.m in Sources */,
E852D74728633E92001465ED /* MonentsCommentReplyModel.m in Sources */,
186A534926FC6ED900D67B2C /* TTAlertMessageAttributedConfig.m in Sources */,
4CEB9EB02D0AF4FE00443480 /* TwentyMicStageView.m in Sources */,
E8B3E80C2848BA40009746AB /* NewUserGreetModel.m in Sources */,
E85E7B4D2A4EB0D300B6D00A /* XPMineGuildRemoveMemberViewController.m in Sources */,
9BCB99A028F571B500466D64 /* XPMineCollectPartyRoomViewController.m in Sources */,
@@ -12247,6 +12279,7 @@
9B0E1C5926E77022005D4442 /* BaseNavigationController.m in Sources */,
E8664ED927E4355C000171BA /* XPRoomPKRecordTableViewCell.m in Sources */,
238B37AB2AC55A2C00BFC9D5 /* TreasureFairyConvertRecordModel.m in Sources */,
4CEB9EAD2D09AA0400443480 /* SexAgeLabel.m in Sources */,
23FF42762AA6E1480055733C /* XPHomeRecommendOtherRoomView.m in Sources */,
142721B229A7647F00C7C423 /* XPBlankViewController.m in Sources */,
E85E7B6B2A4EC39400B6D00A /* XPMineExchangeAuthorityModel.m in Sources */,
@@ -12282,6 +12315,7 @@
E8EEB91726FC7B35007C6EBA /* XPMineUserInfoDesViewController.m in Sources */,
544A36352C94160F00CA7858 /* RoomMenuBar.m in Sources */,
9B1B72AC280031DB003FACE9 /* XPAnchorPKViewController.m in Sources */,
4CEB9EA72D09643E00443480 /* UserRoomCardViewController.m in Sources */,
237852A12C072D8D00E360AC /* MSRoomGameModel.m in Sources */,
180806FB2729A354001FD836 /* ThemeColor+Room.m in Sources */,
9BC8C83028090C9200C24F85 /* XPRoomAnchorRankBannerView.m in Sources */,
@@ -12448,6 +12482,7 @@
9B734F76288A92FB00CBDAA9 /* XPMineFunctionItemModel.m in Sources */,
541DD9552C1EDEFB00B616C4 /* XPHomePagingViewController.m in Sources */,
E82D5C70276AE60000858D6D /* HeadwearModel.m in Sources */,
4C5C37232D0C1C7900BA9AB8 /* RegionListViewController.m in Sources */,
238B37CC2AC55A2C00BFC9D5 /* XPTreasureFairyPrizeSubView.m in Sources */,
E81125C4296E57B7000D9804 /* QinputPhotoView.m in Sources */,
E880B3A1278BD60C00A83B0D /* XPAcrossRoomPKSelectRoomView.m in Sources */,
@@ -12554,6 +12589,7 @@
23FF25792ABD67CD0064E904 /* XPFreeGiftModel.m in Sources */,
9B92A33C2797E38100AD168F /* XPMineHeadItemTableViewCell.m in Sources */,
E854103928646A00005CFD9F /* XPMonentsReplyMoreTableViewCell.m in Sources */,
4CEB9EAA2D097E8400443480 /* MoliAvatar.m in Sources */,
9B8DE0E1289CF02900FB6EC2 /* XPGiftCompoundModel.m in Sources */,
23FF256E2ABC48810064E904 /* XPSessionMainViewController.m in Sources */,
E85E7B092A4EB0D200B6D00A /* XPGuildRemoveMemberPresenter.m in Sources */,

6
YuMi/Assets.xcassets/1.0.31/Contents.json Normal file
View File

@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}

BIN
YuMi/Assets.xcassets/1.0.31/room_user_card_at.imageset/3@3x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

2
YuMi/Assets.xcassets/yna/UserCard/user_card_open_mic.imageset/Contents.json → YuMi/Assets.xcassets/1.0.31/room_user_card_at.imageset/Contents.json vendored
View File

@@ -1,7 +1,6 @@
{
"images" : [
{
"filename" : "user_card_open_mic.png",
"idiom" : "universal",
"scale" : "1x"
},
@@ -10,6 +9,7 @@
"scale" : "2x"
},
{
"filename" : "3@3x.png",
"idiom" : "universal",
"scale" : "3x"
}

BIN
YuMi/Assets.xcassets/1.0.31/room_user_card_be_manager.imageset/2@3x (1).png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.5 KiB

2
YuMi/Assets.xcassets/yna/UserCard/user_card_lock_mic.imageset/Contents.json → YuMi/Assets.xcassets/1.0.31/room_user_card_be_manager.imageset/Contents.json vendored
View File

@@ -1,7 +1,6 @@
{
"images" : [
{
"filename" : "user_card_lock_mic.png",
"idiom" : "universal",
"scale" : "1x"
},
@@ -10,6 +9,7 @@
"scale" : "2x"
},
{
"filename" : "2@3x (1).png",
"idiom" : "universal",
"scale" : "3x"
}

BIN
YuMi/Assets.xcassets/1.0.31/room_user_card_blacklist.imageset/3@3x (1).png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.0 KiB

2
YuMi/Assets.xcassets/yna/UserCard/user_card_close_mic.imageset/Contents.json → YuMi/Assets.xcassets/1.0.31/room_user_card_blacklist.imageset/Contents.json vendored
View File

@@ -1,7 +1,6 @@
{
"images" : [
{
"filename" : "user_card_close_mic.png",
"idiom" : "universal",
"scale" : "1x"
},
@@ -10,6 +9,7 @@
"scale" : "2x"
},
{
"filename" : "3@3x (1).png",
"idiom" : "universal",
"scale" : "3x"
}

BIN
YuMi/Assets.xcassets/1.0.31/room_user_card_chat.imageset/2@3x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

2
YuMi/Assets.xcassets/yna/UserCard/user_card_no_lock_mic.imageset/Contents.json → YuMi/Assets.xcassets/1.0.31/room_user_card_chat.imageset/Contents.json vendored
View File

@@ -1,7 +1,6 @@
{
"images" : [
{
"filename" : "user_card_no_lock_mic.png",
"idiom" : "universal",
"scale" : "1x"
},
@@ -10,6 +9,7 @@
"scale" : "2x"
},
{
"filename" : "2@3x.png",
"idiom" : "universal",
"scale" : "3x"
}

BIN
YuMi/Assets.xcassets/1.0.31/room_user_card_clean_gift_value.imageset/2@3x (3).png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.0 KiB

21
YuMi/Assets.xcassets/1.0.31/room_user_card_clean_gift_value.imageset/Contents.json vendored Normal file
View File

@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "2@3x (3).png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

BIN
YuMi/Assets.xcassets/1.0.31/room_user_card_close_mic.imageset/5@3x (3).png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.6 KiB

21
YuMi/Assets.xcassets/1.0.31/room_user_card_close_mic.imageset/Contents.json vendored Normal file
View File

@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "5@3x (3).png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

BIN
YuMi/Assets.xcassets/1.0.31/room_user_card_follow.imageset/4@3x (1).png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

21
YuMi/Assets.xcassets/1.0.31/room_user_card_follow.imageset/Contents.json vendored Normal file
View File

@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "4@3x (1).png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

BIN
YuMi/Assets.xcassets/1.0.31/room_user_card_gift.imageset/2@3x (2).png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.9 KiB

21
YuMi/Assets.xcassets/1.0.31/room_user_card_gift.imageset/Contents.json vendored Normal file
View File

@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "2@3x (2).png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

BIN
YuMi/Assets.xcassets/1.0.31/room_user_card_kick.imageset/1@3x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.9 KiB

21
YuMi/Assets.xcassets/1.0.31/room_user_card_kick.imageset/Contents.json vendored Normal file
View File

@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "1@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

BIN
YuMi/Assets.xcassets/1.0.31/room_user_card_lock.imageset/1@3x (1).png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.9 KiB

21
YuMi/Assets.xcassets/1.0.31/room_user_card_lock.imageset/Contents.json vendored Normal file
View File

@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "1@3x (1).png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

BIN
YuMi/Assets.xcassets/1.0.31/room_user_card_not_manager.imageset/5@3x (2).png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.8 KiB

21
YuMi/Assets.xcassets/1.0.31/room_user_card_not_manager.imageset/Contents.json vendored Normal file
View File

@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "5@3x (2).png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

BIN
YuMi/Assets.xcassets/1.0.31/room_user_card_open_mic.imageset/4@3x (2).png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.9 KiB

21
YuMi/Assets.xcassets/1.0.31/room_user_card_open_mic.imageset/Contents.json vendored Normal file
View File

@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "4@3x (2).png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

BIN
YuMi/Assets.xcassets/1.0.31/room_user_card_out_mic.imageset/5@3x (1).png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.2 KiB

21
YuMi/Assets.xcassets/1.0.31/room_user_card_out_mic.imageset/Contents.json vendored Normal file
View File

@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "5@3x (1).png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

21
YuMi/Assets.xcassets/1.0.31/room_user_card_report.imageset/Contents.json vendored Normal file
View File

@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "举报@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

BIN
YuMi/Assets.xcassets/1.0.31/room_user_card_report.imageset/举报@3x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
YuMi/Assets.xcassets/1.0.31/room_user_card_send_gift.imageset/1@3x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 29 KiB

21
YuMi/Assets.xcassets/1.0.31/room_user_card_send_gift.imageset/Contents.json vendored Normal file
View File

@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "1@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

BIN
YuMi/Assets.xcassets/1.0.31/room_user_card_unfollow.imageset/4@3x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.9 KiB

21
YuMi/Assets.xcassets/1.0.31/room_user_card_unfollow.imageset/Contents.json vendored Normal file
View File

@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "4@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

BIN
YuMi/Assets.xcassets/1.0.31/room_user_card_unlock.imageset/1@3x (2).png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.0 KiB

21
YuMi/Assets.xcassets/1.0.31/room_user_card_unlock.imageset/Contents.json vendored Normal file
View File

@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "1@3x (2).png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

BIN
YuMi/Assets.xcassets/1.0.31/room_user_card_up_mic.imageset/5@3x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.3 KiB

21
YuMi/Assets.xcassets/1.0.31/room_user_card_up_mic.imageset/Contents.json vendored Normal file
View File

@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "5@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

21
YuMi/Assets.xcassets/yna/UserCard/user_card_clean_gift_value.imageset/Contents.json vendored
View File

@@ -1,21 +0,0 @@
{
"images" : [
{
"filename" : "user_card_clean_gift_value.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

BIN
YuMi/Assets.xcassets/yna/UserCard/user_card_clean_gift_value.imageset/user_card_clean_gift_value.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 825 B

BIN
YuMi/Assets.xcassets/yna/UserCard/user_card_close_mic.imageset/user_card_close_mic.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.0 KiB

21
YuMi/Assets.xcassets/yna/UserCard/user_card_down_mic_listen.imageset/Contents.json vendored
View File

@@ -1,21 +0,0 @@
{
"images" : [
{
"filename" : "user_card_down_mic_listen.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

BIN
YuMi/Assets.xcassets/yna/UserCard/user_card_down_mic_listen.imageset/user_card_down_mic_listen.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 933 B

BIN
YuMi/Assets.xcassets/yna/UserCard/user_card_lock_mic.imageset/user_card_lock_mic.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 922 B

BIN
YuMi/Assets.xcassets/yna/UserCard/user_card_no_lock_mic.imageset/user_card_no_lock_mic.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 854 B

BIN
YuMi/Assets.xcassets/yna/UserCard/user_card_open_mic.imageset/user_card_open_mic.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 988 B

22
YuMi/CustomUI/MoliAvatar.h Normal file
View File

@@ -0,0 +1,22 @@
//
// MoliAvatar.h
// YuMi
//
// Created by P on 2024/12/11.
//
#import <UIKit/UIKit.h>
@class UserInfoModel;
NS_ASSUME_NONNULL_BEGIN
@interface MoliAvatar : UIView
@property(nonatomic, strong) UserInfoModel *userInfo;
@property(nonatomic, copy) void(^handleTapAvatar)(void);
@end
NS_ASSUME_NONNULL_END

153
YuMi/CustomUI/MoliAvatar.m Normal file
View File

@@ -0,0 +1,153 @@
//
// MoliAvatar.m
// YuMi
//
// Created by P on 2024/12/11.
//
#import "MoliAvatar.h"
#import "UserInfoModel.h"
#import <SVGA.h>
#import <YYImage/YYAnimatedImageView.h>
#import "UIView+VAP.h"
#import "SpriteSheetImageManager.h"
@interface MoliAvatar ()
@property (nonatomic,strong) NetImageView *avatarView;
///序列帧
@property (nonatomic, strong) SpriteSheetImageManager *sequenceFrameManager;
@property (nonatomic,strong) YYAnimatedImageView *sequenceFrameHeadWear;
///SVGA
@property (nonatomic, strong) SVGAImageView *headWearSvgaImageView;
@end
@implementation MoliAvatar
- (void)dealloc
{
if (_headWearSvgaImageView) {
[_headWearSvgaImageView stopAnimation];
}
}
- (instancetype)init {
if (self = [super init]) {
[self addSubview:self.avatarView];
[self.avatarView mas_makeConstraints:^(MASConstraintMaker *make) {
make.edges.mas_equalTo(self);
}];
}
return self;
}
- (void)layoutSubviews {
[super layoutSubviews];
[self.avatarView setCornerRadius:self.frame.size.height / 2];
}
- (void)setUserInfo:(UserInfoModel *)userInfo {
_userInfo = userInfo;
self.avatarView.imageUrl = userInfo.avatar;
NSString *headerUrl = self.userInfo.headwearEffect.length > 0 ? self.userInfo.headwearEffect : self.userInfo.headwearPic;
if ([NSString isEmpty:headerUrl]) {
return;
}
if ([userInfo isHeadWearSVGA]) {
[self setupAndPlaySVGA: headerUrl];
} else {
[self setupAndPlayAnimate: headerUrl];
}
}
- (void)setupAndPlaySVGA:(NSString *)url {
[self addSubview:self.headWearSvgaImageView];
[self.headWearSvgaImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.center.mas_equalTo(self.avatarView);
make.size.mas_equalTo(self.avatarView).multipliedBy(1.3);
}];
[self.headWearSvgaImageView setImageName:url];
}
- (void)setupAndPlayAnimate:(NSString *)url {
[self addSubview:self.sequenceFrameHeadWear];
[self.sequenceFrameHeadWear mas_makeConstraints:^(MASConstraintMaker *make) {
make.center.mas_equalTo(self.avatarView);
make.size.mas_equalTo(self.avatarView).multipliedBy(1.3);
}];
@kWeakify(self);
[self.sequenceFrameManager loadSpriteSheetImageWithURL:[NSURL URLWithString:url]
completionBlock:^(YYSpriteSheetImage * _Nullable sprit) {
@kStrongify(self);
self.sequenceFrameHeadWear.image = sprit;
} failureBlock:^(NSError * _Nullable error) {}];
}
#pragma mark -
- (void)clickAvatarAction {
if (self.handleTapAvatar) {
self.handleTapAvatar();
}
}
#pragma mark -
#pragma mark -
-(NetImageView *)avatarView{
if (!_avatarView){
NetImageConfig * config = [[NetImageConfig alloc] init];
config.placeHolder = [UIImageConstant defaultAvatarPlaceholder];
config.imageType = ImageTypeUserIcon;
_avatarView = [[NetImageView alloc]initWithConfig:config];
_avatarView.layer.cornerRadius = kGetScaleWidth(41);
_avatarView.layer.masksToBounds = YES;
_avatarView.layer.borderWidth = 1;
_avatarView.userInteractionEnabled = YES;
_avatarView.layer.borderColor = [UIColor whiteColor].CGColor;
UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(clickAvatarAction)];
[_avatarView addGestureRecognizer:tap];
}
return _avatarView;
}
- (SVGAImageView *)headWearSvgaImageView {
if (!_headWearSvgaImageView) {
_headWearSvgaImageView = [[SVGAImageView alloc]init];
_headWearSvgaImageView.backgroundColor = [UIColor clearColor];
_headWearSvgaImageView.frame = self.bounds;
_headWearSvgaImageView.userInteractionEnabled = YES;
_headWearSvgaImageView.autoPlay = YES;
}
return _headWearSvgaImageView;
}
- (YYAnimatedImageView *)sequenceFrameHeadWear {
if (!_sequenceFrameHeadWear) {
_sequenceFrameHeadWear = [[YYAnimatedImageView alloc] init];
_sequenceFrameHeadWear.backgroundColor = [UIColor clearColor];
_sequenceFrameHeadWear.contentMode = UIViewContentModeScaleAspectFit;
}
return _sequenceFrameHeadWear;
}
- (SpriteSheetImageManager *)sequenceFrameManager {
if (!_sequenceFrameManager) {
_sequenceFrameManager = [[SpriteSheetImageManager alloc] init];
}
return _sequenceFrameManager;
}
@end

18
YuMi/CustomUI/SexAgeLabel.h Normal file
View File

@@ -0,0 +1,18 @@
//
// SexAgeLabel.h
// YuMi
//
// Created by P on 2024/12/11.
//
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
@interface SexAgeLabel : UIView
- (void)updateSex:(BOOL)isMale age:(NSInteger)age;
@end
NS_ASSUME_NONNULL_END

65
YuMi/CustomUI/SexAgeLabel.m Normal file
View File

@@ -0,0 +1,65 @@
//
// SexAgeLabel.m
// YuMi
//
// Created by P on 2024/12/11.
//
#import "SexAgeLabel.h"
@interface SexAgeLabel ()
@property(nonatomic, strong) UIView *pillBackground;
@property(nonatomic, strong) UIImageView *sexImageView;
@property(nonatomic, strong) UILabel *ageLabel;
@end
@implementation SexAgeLabel
- (instancetype)init {
if (self = [super init]) {
// self.frame = CGRectMake(0, 0, 35, 16);
[self setCornerRadius:8];
[self addGradientBackgroundWithColors:@[[UIColor redColor], [UIColor blueColor]] startPoint:CGPointMake(0.5, 0) endPoint:CGPointMake(0.5, 1) cornerRadius:8];
[self addSubview:self.sexImageView];
[self addSubview:self.ageLabel];
[self.sexImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerY.mas_equalTo(self);
make.leading.mas_equalTo(2);
make.width.height.mas_equalTo(8);
}];
[self.ageLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerY.mas_equalTo(self);
make.leading.mas_equalTo(self.sexImageView.mas_trailing).offset(2);
make.trailing.mas_equalTo(-2);
}];
}
return self;
}
- (void)updateSex:(BOOL)isMale age:(NSInteger)age {
self.sexImageView.image = isMale ? kImage(@"session_user_sex_male") : kImage(@"session_user_sex_female");
self.ageLabel.text = @(age).stringValue;
}
- (UIImageView *)sexImageView {
if (!_sexImageView) {
_sexImageView = [[UIImageView alloc] init];
_sexImageView.contentMode = UIViewContentModeScaleAspectFit;
}
return _sexImageView;
}
- (UILabel *)ageLabel {
if (!_ageLabel) {
_ageLabel = [UILabel labelInitWithText:@"" font:kFontSemibold(12) textColor:[UIColor whiteColor]];
}
return _ageLabel;
}
@end

104
YuMi/Modules/YMLogin/View/LoginFullInfoViewController.m
View File

@@ -26,7 +26,9 @@
#import "PILoginManager.h"
#import "ClientConfig.h"
@interface LoginFullInfoViewController ()<LoginFullInfoProtocol>
#import "RegionListViewController.h"
@interface LoginFullInfoViewController ()<LoginFullInfoProtocol, UIViewControllerTransitioningDelegate>
///背景
@property(nonatomic,strong) UIImageView *bgImageView;
@@ -61,11 +63,16 @@
///邀请码输入框
@property (nonatomic,strong) MSBaseTextField *codeTextField;
@property (nonatomic,strong) UIView *regionContainView;
@property(nonatomic, strong) UILabel *regionLabel;
@property(nonatomic, strong) NetImageView *regionFlagImageView;
///第三方的用户信息
@property (nonatomic,strong) ThirdUserInfo *thirdInfo;
///目前选择的性别
@property (nonatomic,copy) NSString *sexString;
@end
@implementation LoginFullInfoViewController
@@ -107,6 +114,7 @@
[self.bgView addSubview:self.backView];
[self.view addSubview:self.codeContainView];
[self.view addSubview:self.regionContainView];
[self.view addSubview:self.nextButton];
[self.view addSubview:self.block18Tips];
@@ -118,6 +126,16 @@
[self.sexStackView addArrangedSubview:self.femaleView];
[self.codeContainView addSubview:self.codeTextField];
UIStackView *regionStack = [[UIStackView alloc] initWithArrangedSubviews:@[
self.regionFlagImageView,
self.regionLabel
]];
[self.regionContainView addSubview:regionStack];
[regionStack mas_makeConstraints:^(MASConstraintMaker *make) {
make.leading.mas_equalTo(kGetScaleWidth(24));
make.centerY.mas_equalTo(self.regionContainView);
}];
if ([self.presenter getThirdUserInfo] && [self.presenter getThirdUserInfo].userName.length > 0) {
self.textField.text = [self.presenter getThirdUserInfo].userName;
@@ -146,7 +164,6 @@
[self.remindLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.leading.trailing.equalTo(self.bgView).inset(kGetScaleWidth(10));
make.top.mas_equalTo(kGetScaleWidth(48));
}];
[self.sexStackView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -196,12 +213,17 @@
make.top.bottom.mas_equalTo(self.codeContainView);
make.trailing.mas_equalTo(self.codeContainView).offset(-kGetScaleWidth(18));
}];
[self.regionContainView mas_makeConstraints:^(MASConstraintMaker *make) {
make.leading.trailing.height.mas_equalTo(self.backView);
make.top.mas_equalTo(self.codeContainView.mas_bottom).offset(kGetScaleWidth(20));
}];
[self.nextButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.mas_equalTo(kGetScaleWidth(303));
make.centerX.equalTo(self.bgView);
make.height.mas_equalTo(kGetScaleWidth(48));
make.top.mas_equalTo(self.codeContainView.mas_bottom).offset(kGetScaleWidth(48));
make.top.mas_equalTo(self.regionContainView.mas_bottom).offset(kGetScaleWidth(38));
}];
[self.block18Tips mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -228,6 +250,20 @@
_inviteCode = inviteCode;
self.codeTextField.text = _inviteCode;
}
- (void)didTapRegionButton {
// TODO: display list
RegionListViewController *vc = [[RegionListViewController alloc] initForHomeTags];
// vc.modalPresentationStyle = UIModalPresentationPageSheet; // 可结合 UIModalPresentationCustom
// vc.preferredContentSize = CGSizeMake(self.view.bounds.size.width, 100); // 设置高度为 300
// vc.modalPresentationStyle = UIModalPresentationCustom;
// vc.transitioningDelegate = self; // 设置自定义的过渡代理
// [self.navigationController pushViewController:vc animated:YES];
[self presentViewController:vc animated:YES completion:nil];
}
///更新用户信息
- (void)updateUserInfo {
[XNDJTDDLoadingTool showOnlyView:self.view];
@@ -253,6 +289,27 @@
}
}
#pragma mark - UIViewControllerTransitioningDelegate
//
//- (UIPresentationController *)presentationControllerForPresentedViewController:(UIViewController *)presented
// presentingViewController:(UIViewController *)presenting
// sourceViewController:(UIViewController *)source {
// CustomPresentationController *customPresentationController =
// [[CustomPresentationController alloc] initWithPresentedViewController:presented
// presentingViewController:presenting];
// customPresentationController.preferredHeight = 400; // 設置想要的高度
// return customPresentationController;
//}
//
//- (CGSize)sizeForChildContentContainer:(id<UIContentContainer>)container withParentContainerSize:(CGSize)parentSize {
// return CGSizeMake(parentSize.width, 300); // 设置高度为 300
//}
//
//- (CGRect)frameOfPresentedViewInContainerView {
// CGRect containerBounds = self.presentingViewController.view.bounds;
// return CGRectMake(0, containerBounds.size.height - 300, containerBounds.size.width, 300); // 从底部呈现，高度为 300
//}
#pragma mark - LoginFullInfoProtocol
- (void)requestRandomNickSuccess:(NSString *)nick {
self.textField.text = nick;
@@ -494,4 +551,45 @@
}
return _bgView;
}
- (UIView *)regionContainView {
if (!_regionContainView) {
_regionContainView = [[UIView alloc] init];
_regionContainView.backgroundColor = UIColorFromRGB(0xF5F6FA);
[_regionContainView setCornerRadius:kGetScaleWidth(52)/2];
UIImageView *arrow = [[UIImageView alloc] initWithImage:kImage(@"room_setting_arrow")];
arrow.contentMode = UIViewContentModeScaleAspectFit;
[_regionContainView addSubview:arrow];
[arrow mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerY.mas_equalTo(_regionContainView);
make.trailing.mas_equalTo(-20);
make.width.height.mas_equalTo(20);
}];
UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(didTapRegionButton)];
[_regionContainView addGestureRecognizer:tap];
}
return _regionContainView;
}
- (UILabel *)regionLabel {
if (!_regionLabel) {
_regionLabel = [UILabel labelInitWithText:YMLocalizedString(@"1.0.31_text_0")
font:kFontMedium(12)
textColor:UIColorFromRGB(0xb3b3c1)];
_regionLabel.userInteractionEnabled = YES;
}
return _regionLabel;
}
- (NetImageView *)regionFlagImageView {
if (!_regionFlagImageView) {
_regionFlagImageView = [[NetImageView alloc] init];
_regionFlagImageView.contentMode = UIViewContentModeScaleAspectFit;
_regionFlagImageView.userInteractionEnabled = YES;
}
return _regionFlagImageView;
}
@end

22
YuMi/Modules/YMLogin/View/RegionListViewController.h Normal file
View File

@@ -0,0 +1,22 @@
//
// RegionListViewController.h
// YuMi
//
// Created by P on 2024/12/13.
//
#import "MvpViewController.h"
NS_ASSUME_NONNULL_BEGIN
@interface RegionListViewController : MvpViewController
@property(nonatomic, copy) void(^handleDismiss)(void);
@property(nonatomic, copy) void(^handleTapComfirm)(id obj);
- (instancetype)initForRegionList;
- (instancetype)initForHomeTags;
@end
NS_ASSUME_NONNULL_END

324
YuMi/Modules/YMLogin/View/RegionListViewController.m Normal file
View File

@@ -0,0 +1,324 @@
//
// RegionListViewController.m
// YuMi
//
// Created by P on 2024/12/13.
//
#import "RegionListViewController.h"
@interface RegionListCell : UICollectionViewCell
@property(nonatomic, strong) UIStackView *contentStack;
@property(nonatomic, strong) NetImageView *flagImageView;
@property(nonatomic, strong) UILabel *titleLabel;
+ (void)registerTo:(UICollectionView *)collectionView;
+ (RegionListCell *)cellFor:(UICollectionView *)collectionView indexPath:(NSIndexPath *)indexPath;
@end
@implementation RegionListCell
+ (void)registerTo:(UICollectionView *)collectionView {
[collectionView registerClass:[self class] forCellWithReuseIdentifier:NSStringFromClass([self class])];
}
+ (RegionListCell *)cellFor:(UICollectionView *)collectionView
indexPath:(NSIndexPath *)indexPath {
RegionListCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([self class])
forIndexPath:indexPath];
cell.backgroundColor = [UIColor colorWithRed:arc4random()%255/255.0 green:arc4random()%255/255.0 blue:arc4random()%255/255.0 alpha:1];
return cell;
}
- (instancetype)initWithFrame:(CGRect)frame {
if (self = [super initWithFrame:frame]) {
[self.contentView addSubview:self.contentStack];
[self.contentStack mas_makeConstraints:^(MASConstraintMaker *make) {
make.center.mas_equalTo(self.contentView);
make.height.mas_equalTo(18);
}];
[self.flagImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(24, 18));
}];
#if DEBUG
self.flagImageView.imageUrl = @"https://cdn3.iconfinder.com/data/icons/142-mini-country-flags-16x16px/32/flag-usa2x.png";
self.titleLabel.text = @"Make UAS great again!";
#endif
}
return self;
}
- (void)prepareForReuse {
[super prepareForReuse];
self.flagImageView.image = nil;
}
#pragma mark -
- (UIStackView *)contentStack {
if (!_contentStack) {
_contentStack = [[UIStackView alloc] initWithArrangedSubviews:@[
self.flagImageView,
self.titleLabel
]];
_contentStack.axis = UILayoutConstraintAxisHorizontal;
_contentStack.distribution = UIStackViewDistributionEqualCentering;
_contentStack.alignment = UIStackViewAlignmentCenter;
}
return _contentStack;
}
- (NetImageView *)flagImageView {
if (!_flagImageView) {
_flagImageView = [[NetImageView alloc] init];
_flagImageView.contentMode = UIViewContentModeScaleAspectFit;
}
return _flagImageView;
}
- (UILabel *)titleLabel {
if (!_titleLabel) {
_titleLabel = [UILabel labelInitWithText:@"" font:kFontMedium(13) textColor:UIColorFromRGB(0x313131)];
}
return _titleLabel;
}
@end
@interface RegionListViewController () <UISearchBarDelegate, UICollectionViewDelegateFlowLayout, UICollectionViewDataSource>
@property(nonatomic, assign) NSInteger type;
@property(nonatomic, assign) CGFloat displayHeight;
@property(nonatomic, strong) UILabel *titleLabel;
@property(nonatomic, strong) UISearchBar *searchBar;
@property(nonatomic, strong) UICollectionView *collectionView;
@property(nonatomic, strong) UIButton *comfirmButton;
@property(nonatomic, strong) UIView *bgView;
@end
@implementation RegionListViewController
- (instancetype)initForRegionList {
if (self = [super init]) {
self.type = 1;
self.displayHeight = KScreenHeight;
}
return self;
}
- (instancetype)initForHomeTags{
if (self = [super init]) {
self.type = 2;
// self.modalPresentationStyle = UIModalPresentationFullScreen;
self.displayHeight = KScreenHeight/2;
}
return self;
}
- (void)viewDidLoad {
[super viewDidLoad];
self.title = YMLocalizedString(@"1.0.31_text_1");
switch (self.type) {
case 1:
[self setupUIForFullDisplay];
break;
case 2:
[self setupUIForHalfScreen];
break;
default:
break;
}
}
- (void)setupUIForFullDisplay {
self.view.backgroundColor = [UIColor clearColor];
self.comfirmButton.frame = CGRectMake(0, 0, 48, 44);
UIBarButtonItem *rightBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:self.comfirmButton];
self.navigationItem.rightBarButtonItem = rightBarButtonItem;
[self.view addSubview:self.searchBar];
[self.searchBar mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(KScreenHeight - self.displayHeight);
make.leading.trailing.mas_equalTo(self.view).inset(16);
make.height.mas_equalTo(34);
}];
[self.view addSubview:self.collectionView];
[self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(self.searchBar.mas_bottom).offset(8);
make.bottom.leading.trailing.mas_equalTo(0);
}];
}
- (void)setupUIForHalfScreen {
self.view.backgroundColor = [UIColor colorWithWhite:0 alpha:0.5];
UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(didTapSpace)];
[self.view addGestureRecognizer:tap];
[self.view addSubview:self.titleLabel];
[self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(KScreenHeight - self.displayHeight);
make.centerX.mas_equalTo(self.view);
make.height.mas_equalTo(34);
}];
[self.view addSubview:self.comfirmButton];
[self.comfirmButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerY.mas_equalTo(self.titleLabel);
make.trailing.mas_equalTo(-8);
}];
[self.view addSubview:self.collectionView];
[self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(8);
make.bottom.leading.trailing.mas_equalTo(0);
}];
[self.view insertSubview:self.bgView belowSubview:self.titleLabel];
[self.bgView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(KScreenHeight - self.displayHeight -40);
make.leading.bottom.trailing.mas_equalTo(self.view);
}];
}
- (void)didTapComfirm {
// TODO: call api or call handleTapComfirm
switch (self.type) {
case 1:
[self dismissViewControllerAnimated:YES completion:nil];
break;
case 2:{
[self dismissViewControllerAnimated:YES completion:^{
if (self.handleTapComfirm) {
self.handleTapComfirm(@"");
}
}];
}
break;
default:
break;
}
}
- (void)didTapSpace {
@kWeakify(self);
[self dismissViewControllerAnimated:YES completion:^{
@kStrongify(self);
if (self.handleDismiss) {
self.handleDismiss();
}
}];
}
#pragma mark - UISearchBarDelegate
// 当点击 "Search" 按钮时触发
- (void)searchBarSearchButtonClicked:(UISearchBar *)searchBar {
[searchBar resignFirstResponder]; // 收起键盘
NSLog(@"User searched for: %@", searchBar.text);
// 触发 API 查询
// [self fetchSearchResultsForQuery:searchBar.text];
}
#pragma mark -
- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section {
// TODO: 使用 api 返回的數據
return 100;
}
- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
RegionListCell *cell = [RegionListCell cellFor:collectionView indexPath:indexPath];
return cell;
}
- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath {
}
#pragma mark -
- (UISearchBar *)searchBar {
if (!_searchBar) {
UIColor *bgColor = UIColorFromRGB(0xf4f4f4);
_searchBar = [[UISearchBar alloc] init];
_searchBar.delegate = self;
_searchBar.placeholder = YMLocalizedString(@"XPHomeSearchNavView1");
_searchBar.barTintColor = bgColor;
[_searchBar setCornerRadius:34/2];
if (@available(iOS 13.0, *)) {
_searchBar.searchTextField.backgroundColor = bgColor;
} else {
UITextField *searchField = [self findTextFieldInSearchBar:_searchBar];
if (searchField) {
searchField.backgroundColor = bgColor;
}
}
}
return _searchBar;
}
- (UICollectionView *)collectionView {
if (!_collectionView) {
UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init];
layout.itemSize = CGSizeMake(KScreenWidth - 32, 48);
layout.sectionInset = UIEdgeInsetsMake(0, 16, kSafeAreaBottomHeight, 16);
layout.minimumLineSpacing = 0;
layout.minimumInteritemSpacing = 0;
_collectionView = [[UICollectionView alloc] initWithFrame:CGRectMake(0, 44, KScreenWidth, KScreenHeight-44)
collectionViewLayout:layout];
_collectionView.delegate = self;
_collectionView.dataSource = self;
_collectionView.backgroundColor = [UIColor whiteColor];
[RegionListCell registerTo:_collectionView];
}
return _collectionView;
}
- (UILabel *)titleLabel {
if (!_titleLabel) {
_titleLabel = [UILabel labelInitWithText:YMLocalizedString(@"1.0.31_text_2")
font:kFontSemibold(16)
textColor:UIColorFromRGB(0x313131)];
}
return _titleLabel;
}
- (UIButton *)comfirmButton {
if (!_comfirmButton) {
_comfirmButton = [UIButton buttonWithType:UIButtonTypeCustom];
[_comfirmButton setTitleColor:UIColorFromRGB(0xFF8C03) forState:UIControlStateNormal];
[_comfirmButton setTitle:YMLocalizedString(@"TTAlertConfig0") forState:UIControlStateNormal];
[_comfirmButton addTarget:self
action:@selector(didTapComfirm)
forControlEvents:UIControlEventTouchUpInside];
}
return _comfirmButton;
}
- (UITextField *)findTextFieldInSearchBar:(UISearchBar *)searchBar {
for (UIView *subview in searchBar.subviews) {
for (UIView *nestedSubview in subview.subviews) {
if ([nestedSubview isKindOfClass:[UITextField class]]) {
return (UITextField *)nestedSubview;
}
}
}
return nil;
}
- (UIView *)bgView {
if (!_bgView) {
UIView *bg = [[UIView alloc] init];
bg.backgroundColor = [UIColor whiteColor];
[bg setCornerRadius:16 cornerMask:kCALayerMinXMinYCorner | kCALayerMaxXMinYCorner];
bg.userInteractionEnabled = NO;
_bgView = bg;
}
return _bgView;
}
@end

6
YuMi/Modules/YMNewHome/View/XPHomePagingViewController.m
View File

@@ -39,6 +39,12 @@
[super viewDidLoad];
[self setup];
[self preLoadGifts];
//#if DEBUG
// dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
// [self performSelector:@selector(completeUserInfo)];
// });
//#endif
}
/// 禮物面板緩存-1: 登錄後，用空的 roomUid 預加載默認禮物，並緩存

247
YuMi/Modules/YMNewHome/View/XPNewHomeViewController.m
View File

@@ -12,6 +12,7 @@
#import <JXPagingView/JXPagerListRefreshView.h>
#import <JXCategoryView/JXCategoryView.h>
#import <MJRefresh/MJRefresh.h>
#import "SDWebImageManager.h"
///Tool
#import "Api+Home.h"
#import "YUMIMacroUitls.h"
@@ -52,10 +53,192 @@
#import "BaseNavigationController.h"
#import "XPAdImageTool.h"
#import "PIHomeCategoryTitleModel.h"
#import "RegionListViewController.h"
UIKIT_EXTERN NSString * kHomeMoreScrollPageKey;
UIKIT_EXTERN NSString * const kOpenRoomNotification;
@interface XPNewHomeViewController ()<JXPagerViewDelegate,JXPagerMainTableViewGestureDelegate,JXCategoryViewDelegate, XPHomeContainerProtocol, XPNewHomeNavViewDelegate,XPNewHomeHeadViewDelegate,XPHomeRecommendOtherRoomViewDelegate,XPHomeRecommendViewControllerDelegate>
@interface HomeCategoryTabListCell : UICollectionViewCell
@property(nonatomic, assign) BOOL isSelected;
@property(nonatomic, strong) UIView *selectedBackground;
@property(nonatomic, strong) NetImageView *iconImageView;
@property(nonatomic, strong) PIHomeCategoryTitleModel *cellModel;
@property(nonatomic, copy) void(^didTapCategoryModel)(PIHomeCategoryTitleModel *model);
@end
@implementation HomeCategoryTabListCell
- (instancetype)initWithFrame:(CGRect)frame
{
if (self = [super initWithFrame:frame]) {
self.backgroundColor = [UIColor clearColor];
[self.contentView setCornerRadius:15];
self.contentView.backgroundColor = [UIColor whiteColor];
[self.contentView addSubview:self.selectedBackground];
[self.selectedBackground mas_makeConstraints:^(MASConstraintMaker *make) {
make.edges.mas_equalTo(self.contentView);
}];
[self.contentView addSubview:self.iconImageView];
[self.iconImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.center.mas_equalTo(self.contentView);
make.size.mas_equalTo(CGSizeMake(36, 23));
}];
}
return self;
}
- (void)setSelected:(BOOL)selected {
[super setSelected:selected];
self.selectedBackground.hidden = !selected;
if (selected && self.didTapCategoryModel) {
self.didTapCategoryModel(self.cellModel);
}
}
#pragma mark -
- (UIView *)selectedBackground {
if (!_selectedBackground) {
_selectedBackground = [[UIView alloc] init];
_selectedBackground.backgroundColor = [UIColor whiteColor];
[_selectedBackground setCornerRadius:15
corners:kCALayerMaxXMaxYCorner | kCALayerMaxXMinYCorner | kCALayerMinXMaxYCorner | kCALayerMinXMinYCorner
borderWidth:1
borderColor:UIColorFromRGB(0xFF8C03)];
_selectedBackground.hidden = YES;
}
return _selectedBackground;
}
- (NetImageView *)iconImageView {
if (!_iconImageView) {
_iconImageView = [[NetImageView alloc] init];
}
return _iconImageView;
}
@end
@interface HomeCategoryTabList : UIView <UICollectionViewDataSource, UICollectionViewDelegateFlowLayout>
@property(nonatomic, strong) UIButton *arrowButton;
@property(nonatomic, strong) UICollectionView *tabCollectionView;
@property(nonatomic, copy) NSArray <PIHomeCategoryTitleModel*> *tabArray;
@property(nonatomic, copy) void(^didTapCategoryModel)(PIHomeCategoryTitleModel *model);
@property(nonatomic, copy) void(^didTapArrow)(void);
- (void)closeArrow;
@end
@implementation HomeCategoryTabList
- (instancetype)init {
if (self = [super init]) {
self.backgroundColor = [[ClientConfig shareConfig] bgColor];;
[self addSubview:self.arrowButton];
[self.arrowButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerY.mas_equalTo(self);
make.size.mas_equalTo(CGSizeMake(24, 24));
make.trailing.mas_equalTo(-15);
}];
[self addSubview:self.tabCollectionView];
[self.tabCollectionView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.bottom.mas_equalTo(self);
make.leading.mas_equalTo(0);
make.trailing.mas_equalTo(self.arrowButton.mas_leading);
}];
}
return self;
}
- (void)handleTapArrow {
if (_didTapArrow) {
self.didTapArrow();
}
}
- (void)setTabArray:(NSArray<PIHomeCategoryTitleModel *> *)tabArray {
_tabArray = tabArray;
[self.tabCollectionView reloadData];
if (tabArray.count > 0) {
[self.tabCollectionView selectItemAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0]
animated:NO
scrollPosition:UICollectionViewScrollPositionNone];
}
}
- (void)closeArrow {
}
#pragma mark -
- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section {
return self.tabArray.count;
}
- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
HomeCategoryTabListCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"HomeCategoryTabListCell" forIndexPath:indexPath];
cell.cellModel = [self.tabArray xpSafeObjectAtIndex:indexPath.row];
@kWeakify(self);
[cell setDidTapCategoryModel:^(PIHomeCategoryTitleModel *model) {
@kStrongify(self);
if (self.didTapCategoryModel) {
self.didTapCategoryModel(model);
}
}];
return cell;
}
#pragma mark -
- (UIButton *)arrowButton {
if (!_arrowButton) {
_arrowButton = [UIButton buttonWithType:UIButtonTypeCustom];
_arrowButton.backgroundColor = [UIColor yellowColor];
[_arrowButton setImage:kImage(@"common_down_arrow")
forState:UIControlStateNormal];
[_arrowButton addTarget:self
action:@selector(handleTapArrow)
forControlEvents:UIControlEventTouchUpInside];
}
return _arrowButton;
}
- (UIScrollView *)tabCollectionView {
if (!_tabCollectionView) {
UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init];
layout.itemSize = CGSizeMake(46, 30);
layout.minimumLineSpacing = 12;
layout.minimumInteritemSpacing = 12;
layout.sectionInset = UIEdgeInsetsMake(0, 14, 0, 0);
layout.scrollDirection = UICollectionViewScrollDirectionHorizontal;
_tabCollectionView = [[UICollectionView alloc] initWithFrame:CGRectZero
collectionViewLayout:layout];
_tabCollectionView.backgroundColor = [UIColor clearColor];
_tabCollectionView.showsHorizontalScrollIndicator = NO;
_tabCollectionView.delegate = self;
_tabCollectionView.dataSource = self;
[_tabCollectionView registerClass:[HomeCategoryTabListCell class]
forCellWithReuseIdentifier:@"HomeCategoryTabListCell"];
}
return _tabCollectionView;
}
@end
@interface XPNewHomeViewController ()<
JXPagerViewDelegate,
JXPagerMainTableViewGestureDelegate,
JXCategoryViewDelegate,
XPHomeContainerProtocol,
XPNewHomeNavViewDelegate,
XPNewHomeHeadViewDelegate,
XPHomeRecommendOtherRoomViewDelegate,
XPHomeRecommendViewControllerDelegate>
///头视图
@property(nonatomic,strong) XPNewHomeHeadView *headView;
@@ -63,6 +246,8 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
@property (nonatomic, strong) NSMutableArray<PIHomeCategoryTitleModel *> *tagModelList;
///分页控件
@property (nonatomic, strong) JXCategoryTitleView *titleView;
@property(nonatomic, strong) HomeCategoryTabList *categoryTagList;
///分页lineView
@property (nonatomic, strong) JXPagerView *pagingView;
@@ -137,6 +322,18 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
kWindow.rootViewController = nav;
XPAdImageTool.shareImageTool.isImLogin = NO;
}
- (void)createTagScrollView {
if (_categoryTagList) {
return;
}
[self.titleView addSubview:self.categoryTagList];
[self.categoryTagList mas_makeConstraints:^(MASConstraintMaker *make) {
make.edges.mas_equalTo(self.titleView);
}];
}
#pragma mark - Private Method
- (void)initSubViews {
@@ -244,6 +441,19 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
}];
}
- (void)showAllTags {
RegionListViewController *vc = [[RegionListViewController alloc] initForHomeTags];
@kWeakify(self);
vc.handleDismiss = ^{
@kStrongify(self);
[self.categoryTagList closeArrow];
};
vc.handleTapComfirm = ^(id _Nonnull obj) {
};
[self presentViewController:vc animated:YES completion:^{ }];
}
#pragma mark - XPNewHomeNavViewDelegate
- (void)xPNewHomeNavView:(XPNewHomeNavView *)view didClickRank:(UIButton *)sender {
XPWebViewController * webVC =[[XPWebViewController alloc] initWithRoomUID:nil];
@@ -310,7 +520,7 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
return self.headView;
}
- (NSUInteger)heightForPinSectionHeaderInPagerView:(JXPagerView *)pagerView {
return kGetScaleWidth(30);
return kGetScaleWidth(40);
}
- (UIView *)viewForPinSectionHeaderInPagerView:(JXPagerView *)pagerView {
return self.titleView;
@@ -342,7 +552,6 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
return self.view;
}
#pragma mark - JXPagerMainTableViewGestureDelegate
- (BOOL)mainTableViewGestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer {
//禁止categoryView左右滑动的时候，上下和左右都可以滚动
@@ -403,11 +612,14 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
}
}
self.tagModelList = list;
self.titleView.titles = titleArray;
[self.titleView reloadData];
[self createTagScrollView];
[self.categoryTagList setTabArray:list];
}
- (void)homeChatPickSuccess:(NSString *)uid {
/// 跳聊天
NSString *sessionId = uid;
@@ -521,17 +733,11 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
_titleView.cellSpacing = kGetScaleWidth(20);
_titleView.listContainer = (id<JXCategoryViewListContainer>)self.pagingView.listContainerView;
// JXCategoryIndicatorImageView * indicator = [[JXCategoryIndicatorImageView alloc] init];
// indicator.indicatorImageView.image = kImage(@"ms_login_choose_phone_icon");
// indicator.indicatorImageViewSize = CGSizeMake(kGetScaleWidth(24), kGetScaleWidth(24));
// indicator.verticalMargin = -kGetScaleWidth(4);
// indicator.contentMode = UIViewContentModeScaleAspectFit;
// _titleView.indicators = @[indicator];
}
return _titleView;
}
- (NSMutableArray<PIHomeCategoryTitleModel *> *)tagModelList{
if(!_tagModelList){
_tagModelList = [NSMutableArray array];
@@ -578,4 +784,21 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
}
return _validListDict;
}
- (HomeCategoryTabList *)categoryTagList {
if (!_categoryTagList) {
_categoryTagList = [[HomeCategoryTabList alloc] init];
@kWeakify(self);
[_categoryTagList setDidTapArrow:^{
@kStrongify(self);
[self showAllTags];
}];
[_categoryTagList setDidTapCategoryModel:^(PIHomeCategoryTitleModel *model) {
@kStrongify(self);
NSInteger index = [self.tagModelList indexOfObject:model];
[self.titleView selectItemAtIndex:index];
}];
}
return _categoryTagList;
}
@end

17
YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m
View File

@@ -1098,7 +1098,7 @@ GiftAnimationDelegate>
#pragma mark - 进房动画 XXX来了
- (void)userEnterRoom:(NIMChatroomNotificationContent *)content ext:(XPMessageRemoteExtModel *)extModel {
NSString *userName = content.source.nick;
NSString *userName = [NSString isEmpty:extModel.nick] ? content.source.nick : extModel.nick;
if ([NSString isEmpty:userName] && content.source.userId.intValue == self.delegate.getUserInfo.uid) {
userName = self.delegate.getUserInfo.nick;
} else if ([NSString isEmpty:userName]) {
@@ -1695,21 +1695,6 @@ GiftAnimationDelegate>
}
#pragma mark - 全服礼物 飘屏
- (void)receiveBroadcastGift:(AttachmentModel *)attachment {
if ([self isInSudGame]) {return;}
GiftReceiveInfoModel *giftNotifyInfo = [GiftReceiveInfoModel modelWithJSON:attachment.data];
///年度飘屏是广播 在tabbar中监听
if (giftNotifyInfo.ceremonyGift)return;
// if(giftNotifyInfo.isHomeShow == YES)return; ///房间外飘屏 在tabbar中监听
// if(giftNotifyInfo.roomUid == self.delegate.getRoomInfo.uid)return; ///自己的房间跨房间飘屏不用走
if (self.animationListA.count == 0 &&
self.isPlayOfB == NO &&
self.isPlayOfA == NO) {
[self createGiftBroadcastViewAnimation:giftNotifyInfo];
}
[self.animationListA addObject:giftNotifyInfo];
}
- (void)createGiftBroadcastViewAnimation:(GiftReceiveInfoModel *)giftModel {
self.isPlayOfA = YES;
XPRoomGiftBroadcastView * view = [[XPRoomGiftBroadcastView alloc] init];

3
YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomMenuContainerView.m
View File

@@ -444,6 +444,9 @@ UIKIT_EXTERN NSString * kRoomBackMusicCaptureVolumeKey;
[self.moreButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.height.mas_equalTo(36);
}];
[self.arrangeMicButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.height.mas_equalTo(36);
}];
[self.giftButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(46, 46));

2
YuMi/Modules/YMRoom/View/MessageContainerView/XPRoomMessageContainerView.m
View File

@@ -1014,7 +1014,7 @@ NSString * const kRoomShowTopicKey = @"kRoomShowTopicKey";
self.isMiniEnter = NO;
NIMNotificationObject *notiMsg = (NIMNotificationObject *)message.messageObject;
NIMChatroomNotificationContent *content = (NIMChatroomNotificationContent *)notiMsg.content;
RoomInfoModel * roomInfo = self.hostDelegate.getRoomInfo;
RoomInfoModel *roomInfo = self.hostDelegate.getRoomInfo;
if (content.eventType == NIMChatroomEventTypeEnter) {
if (roomInfo.isCloseScreen) {

1
YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftItemCollectionViewCell.m
View File

@@ -106,7 +106,6 @@
make.edges.mas_equalTo(self);
}];
[self.giftImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(self.contentView).offset(18);
make.centerX.mas_equalTo(self.contentView);

4
YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftSuperGiftBroadcastView.m
View File

@@ -35,8 +35,12 @@
-(void)setGiftModel:(GiftInfoModel *)giftModel{
_giftModel = giftModel;
_bgImageView.imageUrl = _giftModel.bannerUrl;
}
-(void)clickBtnAction{
if ([NSString isEmpty:_giftModel.bannerUrl]) {
return;
}
if (self.delegate && [self.delegate respondsToSelector:@selector(pIGiftSuperGiftBroadcastViewClickWithModel:)]){
[self.delegate pIGiftSuperGiftBroadcastViewClickWithModel:self.giftModel];
}

3
YuMi/Modules/YMRoom/View/SendGiftView/View/XPSendGiftView.m
View File

@@ -633,6 +633,9 @@ UIKIT_EXTERN NSString * kShowFirstRechargeView;
}
#pragma mark - PIGiftSuperGiftBroadcastViewDelegate
- (void)pIGiftSuperGiftBroadcastViewClickWithModel:(GiftInfoModel *)giftModel{
if ([NSString isEmpty:giftModel.skipUrl]) {
return;
}
XPRoomHalfWebView * webView = [[XPRoomHalfWebView alloc] init];
webView.url = giftModel.skipUrl;
[TTPopup popupView:webView style:TTPopupStyleActionSheet];

11
YuMi/Modules/YMRoom/View/StageView/MicroView/MicroWaveView.m
View File

@@ -41,10 +41,13 @@
if (self.isAnimationing) {
return;
}
self.isAnimationing = YES;
if (self.isAnimationing) {
[self.firstView.layer removeAllAnimations];
}
self.isAnimationing = YES;
self.firstView.hidden = NO;
[self animationWithLayer:self.firstView];
[self animationWithLayer:self.firstView];
}
///结束声波动画
- (void)stopWaveAnimation {
@@ -70,7 +73,7 @@
- (void)animationWithLayer:(UIView *)view {
int animtionDura = 1;
POPBasicAnimation *animation2 = [POPBasicAnimation animationWithPropertyNamed:kPOPLayerScaleXY];
animation2.beginTime = CACurrentMediaTime();
animation2.beginTime = CACurrentMediaTime();
animation2.duration = animtionDura;
animation2.fromValue = [NSValue valueWithCGSize:CGSizeMake(1.f, 1.f)];
animation2.toValue = [NSValue valueWithCGSize:CGSizeMake(1.4f, 1.4f)];

16
YuMi/Modules/YMRoom/View/StageView/NineteenMicStageView.h Normal file
View File

@@ -0,0 +1,16 @@
//
// NineteenMicStageView.h
// YuMi
//
// Created by P on 2024/12/12.
//
#import "StageView.h"
NS_ASSUME_NONNULL_BEGIN
@interface NineteenMicStageView : StageView
@end
NS_ASSUME_NONNULL_END

131
YuMi/Modules/YMRoom/View/StageView/NineteenMicStageView.m Normal file
View File

@@ -0,0 +1,131 @@
//
// NineteenMicStageView.m
// YuMi
//
// Created by P on 2024/12/12.
//
#import "NineteenMicStageView.h"
#import "ArabMicroView.h"
//第一行距离顶部
#define firstRowTopMargin 60
// 房主头像宽 58 + 光圈 5
#define ownerWidth (45 + 5) * kScreenScale
// 昵称高12，距离头像间距 10
#define ownerHeight (ownerWidth + 10 + 12)
// 下面 8 个坑位宽55 + 光圈 5
#define mcWidth (45 + 5) * kScreenScale
#define mcHeight (mcWidth + 10 + 12 + 5+16)
// 左右 padding 20
#define paddingH 22 * kScreenScale
// 每行间距
#define lineMargin 8
// 下面 8 个坑位两两之间的间距
#define marginH (KScreenWidth - paddingH * 2 - mcWidth * 5) / 4
// 第二行坑位的顶部
#define sRowTop firstRowTopMargin + mcHeight + lineMargin
// 第一行坑位与第二行坑位的间距
//#define marginV2 15
// 第三行坑位的顶部
#define tRowTop (sRowTop + mcHeight + lineMargin)
static const NSInteger kMicCountPerRow = 5;
@implementation NineteenMicStageView
- (NSInteger)countOfMicroView {
return 19; // 麦位总数
}
- (UIView<MicroViewProtocol> *)microViewForIndex:(NSInteger)index {
UIView<MicroViewProtocol> *microView = [super microViewForIndex:index];
return microView ?: [[ArabMicroView alloc] init];
}
- (CGRect)rectForViewAtIndex:(NSInteger)index {
if (index < 0 || index >= [self countOfMicroView]) {
return CGRectZero;
}
// 第一行（5列）
if (index >= 0 && index < 5) {
return [self calculateRectForRow:0 column:index columnsInRow:5];
}
// 第二行（4列，居中）
if (index >= 5 && index < 9) {
return [self calculateRectForRow:1 column:index - 5 columnsInRow:4];
}
// 第三行（4列，居中）
if (index >= 9 && index < 13) {
return [self calculateRectForRow:2 column:index - 9 columnsInRow:4];
}
// 第四行（5列）
if (index >= 13 && index < 18) {
return [self calculateRectForRow:3 column:index - 13 columnsInRow:5];
}
// 第五行（最后一个麦位，居中，尺寸为2倍）
if (index == 18) {
CGFloat x = (KScreenWidth - mcWidth * 1.5) / 2; // 水平方向居中
// CGFloat y = firstRowTopMargin + (mcHeight + lineMargin) * 2 - mcHeight; // 垂直方向在第 2 和第 3 行交界
CGFloat y = firstRowTopMargin + 1 * (mcHeight + lineMargin) + mcHeight/2;
return CGRectMake(x, y, mcWidth * 1.5, mcHeight * 1.5);
}
return CGRectZero;
}
- (CGRect)calculateRectForRow:(NSInteger)row column:(NSInteger)column columnsInRow:(NSInteger)columnsInRow {
// CGFloat totalWidth = columnsInRow * mcWidth + (columnsInRow - 1) * marginH; // 当前行的总宽度
// CGFloat startX = (KScreenWidth - totalWidth) / 2; // 居中计算起点
// CGFloat x = startX + column * (mcWidth + marginH);
// CGFloat y = firstRowTopMargin + row * (mcHeight + lineMargin);
// return CGRectMake(x, y, mcWidth, mcHeight);
CGFloat totalWidth = columnsInRow * mcWidth + (columnsInRow - 1) * marginH; // 当前行的总宽度
CGFloat startX = (KScreenWidth - totalWidth) / 2; // 居中计算起点
CGFloat x = 0;
if (row == 1 || row == 2) { // 特殊处理第 2、3 行
if (column < 2) {
// 第一、二列，从左侧开始布局
x = paddingH + column * (mcWidth + marginH);
} else {
// 第三、四列，从右侧开始布局
NSInteger reversedColumn = columnsInRow - 1 - column;
x = KScreenWidth - paddingH - mcWidth - reversedColumn * (mcWidth + marginH);
}
} else {
// 默认居中布局
x = startX + column * (mcWidth + marginH);
}
CGFloat y = firstRowTopMargin + row * (mcHeight + lineMargin);
return CGRectMake(x, y, mcWidth, mcHeight);
}
- (CGFloat)hightForStageView {
CGFloat lastRowBottom = firstRowTopMargin + 3 * (mcHeight + lineMargin) + mcHeight;
return lastRowBottom + lineMargin; // 加上最后的间距
}
- (CGPoint)animationPointAtStageViewByUid:(NSString *)uid {
NSInteger index = [self getIndexByUid:uid];
return [self animationPointAtStageViewByIndex:index];
}
- (CGPoint)animationPointAtStageViewByIndex:(NSInteger)index {
if (index < 0 || index >= [self countOfMicroView]) {
return CGPointZero;
}
CGRect rect = [self rectForViewAtIndex:index];
CGPoint center = CGPointMake(CGRectGetMidX(rect), CGRectGetMidY(rect));
return [self convertPoint:center toView:nil];
}
@end

133
YuMi/Modules/YMRoom/View/StageView/StageView.m
View File

@@ -40,6 +40,8 @@
#import "XPUserCardViewController.h"
#import "XPRoomInviteUserViewController.h"
#import "UserRoomCardViewController.h"
@interface StageView()<RtcDelegate>
/** 云信麦序的 position 和本类 index 的关系。
@@ -353,73 +355,85 @@
更新坑位的等级头饰
*/
- (void)updatePositionItemWithRoomOnMicGiftValue:(GiftValueInfoModel *)roomOnMicGiftValue{
if (self.hostDelegate.getRoomInfo.type == RoomType_Anchor || self.hostDelegate.getRoomInfo.roomModeType == RoomModeType_Open_Blind) return;
// 过滤礼物值为0的
NSMutableArray <GiftValueDetailModel *> *validGifts = [NSMutableArray array];
if (self.hostDelegate.getRoomInfo.type == RoomType_Anchor ||
self.hostDelegate.getRoomInfo.roomModeType == RoomModeType_Open_Blind) {
return;
}
// Step 1: 过滤有效礼物
NSArray<GiftValueDetailModel *> *validGifts = [self filterValidGifts];
if (validGifts.count == 0) return;
// Step 3: 排序
NSArray<GiftValueDetailModel *> *sortedGifts = [self sortGiftsByValue:validGifts];
NSString *highest = nil;
NSString *lowest = nil;
// 处理最高礼物值
if (sortedGifts.count >= 1 && ![self hasDuplicateHighestValue:sortedGifts]) {
highest = sortedGifts.firstObject.uid;
}
// 处理最低礼物值
if (sortedGifts.count > 1 && ![self hasDuplicateLowestValue:sortedGifts]) {
lowest = sortedGifts.lastObject.uid;
}
// Step 4: 更新 UI
[self updateMicroViewsWithHighest:highest lowest:lowest];
}
// 筛选有效礼物值
- (NSArray<GiftValueDetailModel *> *)filterValidGifts {
NSMutableArray<GiftValueDetailModel *> *validGifts = [NSMutableArray array];
for (int i = 0; i < self.microViews.count; i++) {
UIView<MicroViewProtocol> * view = [self findMicroViewByIndex:i];
UIView<MicroViewProtocol> *view = [self findMicroViewByIndex:i];
[view hiddenPositionisHighLevel];
long long value = [view getGiftValue];
UserInfoModel *user = [view getUser];
if(value > 0 && user.uid > 0){
if (value > 0 && user.uid > 0) {
GiftValueDetailModel *model = [GiftValueDetailModel new];
model.giftValue = value;
model.uid = @(user.uid).stringValue;
[validGifts addObject:model];
}
}
if (validGifts.count == 0) return;
NSMutableArray <GiftValueDetailModel *> *newOnMicGifts = [NSMutableArray array];
// 过滤厅主
for (GiftValueDetailModel *value in validGifts) {
for (MicroQueueModel *item in self.micQueue.allValues) {
BOOL isOwnerPosition = item.microState.position == -1;
if (!isOwnerPosition && item.userInfo.uid == value.uid.integerValue) {
[newOnMicGifts addObject:value];
}
}
}
if (newOnMicGifts.count == 0) return;
// 排序
NSSortDescriptor *giftValueSortD = [NSSortDescriptor sortDescriptorWithKey:@"giftValue" ascending:NO];
NSArray <GiftValueDetailModel *> *giftValuesSortArray = [[newOnMicGifts sortedArrayUsingDescriptors:@[giftValueSortD]] mutableCopy];
NSString *highest = nil;
NSString *lowest = nil;
NSInteger sortArrayCount = giftValuesSortArray.count;
if (sortArrayCount == 1) {
highest = giftValuesSortArray.firstObject.uid;
}else if (sortArrayCount == 2) {
if (giftValuesSortArray.firstObject.giftValue != giftValuesSortArray.lastObject.giftValue) {
highest = giftValuesSortArray.firstObject.uid;
lowest = giftValuesSortArray.lastObject.uid;
}
}else{
// 如果第一个和最后一个不相等
if (giftValuesSortArray.firstObject.giftValue != giftValuesSortArray.lastObject.giftValue) {
// 如果第一个和第二个不相等，则必有最高
if (giftValuesSortArray.firstObject.giftValue != giftValuesSortArray[1].giftValue) {
highest = giftValuesSortArray.firstObject.uid;
}
// 如果最后一个和倒数第二个不相等，则必有最低
if (giftValuesSortArray.lastObject.giftValue != giftValuesSortArray[sortArrayCount-2].giftValue) {
lowest = giftValuesSortArray.lastObject.uid;
}
}
}
return validGifts;
}
for (MicroQueueModel *item in self.micQueue.allValues) {
if (highest && item.userInfo.uid == highest.integerValue) {
UIView<MicroViewProtocol> * view = [self findMicroViewByUid:highest];
[view updatePositionIsHighLevel:YES isShow:YES];
continue;
}
if (lowest && item.userInfo.uid == lowest.integerValue) {
UIView<MicroViewProtocol> * view = [self findMicroViewByUid:lowest];
[view updatePositionIsHighLevel:NO isShow:YES];
}
}
// 根据礼物值排序
- (NSArray<GiftValueDetailModel *> *)sortGiftsByValue:(NSArray<GiftValueDetailModel *> *)gifts {
NSSortDescriptor *sortDescriptor = [NSSortDescriptor sortDescriptorWithKey:@"giftValue" ascending:NO];
return [gifts sortedArrayUsingDescriptors:@[sortDescriptor]];
}
// 检查是否存在相同最高值
- (BOOL)hasDuplicateHighestValue:(NSArray<GiftValueDetailModel *> *)sortedGifts {
if (sortedGifts.count < 2) return NO;
return sortedGifts[0].giftValue == sortedGifts[1].giftValue;
}
// 检查是否存在相同最低值
- (BOOL)hasDuplicateLowestValue:(NSArray<GiftValueDetailModel *> *)sortedGifts {
if (sortedGifts.count < 2) return NO;
return sortedGifts[sortedGifts.count - 1].giftValue == sortedGifts[sortedGifts.count - 2].giftValue;
}
// 更新视图
- (void)updateMicroViewsWithHighest:(NSString *)highest lowest:(NSString *)lowest {
for (MicroQueueModel *item in self.micQueue.allValues) {
UIView<MicroViewProtocol> *view = nil;
if (highest && item.userInfo.uid == highest.integerValue) {
view = [self findMicroViewByUid:highest];
[view updatePositionIsHighLevel:YES isShow:YES];
} else if (lowest && item.userInfo.uid == lowest.integerValue) {
view = [self findMicroViewByUid:lowest];
[view updatePositionIsHighLevel:NO isShow:YES];
}
}
}
#pragma mark - RoomGuestDelegate
@@ -819,6 +833,7 @@
}
if (targetUid && targetUid.length > 0) {
XPUserCardInfoModel * model = [[XPUserCardInfoModel alloc] init];
model.uid = targetUid;
model.position = position;
@@ -829,6 +844,14 @@
model.micQueue = self.micQueue;
model.delegate = self.hostDelegate;
model.superMangerList = self.hostDelegate.getRoomSuperAdminList;
#if DEBUG
UserRoomCardViewController *vc = [[UserRoomCardViewController alloc] initWithUser:model];
vc.modalPresentationStyle = UIModalPresentationOverFullScreen;
[self.hostDelegate.getCurrentNav presentViewController:vc animated:NO completion:nil];
return;
#endif
XPUserCardViewController * userCardVC = [[XPUserCardViewController alloc] initWithUser:model];
[self.hostDelegate.getCurrentNav presentViewController:userCardVC animated:NO completion:nil];
[StatisticsServiceHelper trackEventWithKey:StatisticsServiceEventroom_mike_click eventAttributes:@{@"actionType" : @"userCard"}];

18
YuMi/Modules/YMRoom/View/StageView/TwentyMicStageView.h Normal file
View File

@@ -0,0 +1,18 @@
//
// TwentyMicStageView.h
// YuMi
//
// Created by P on 2024/12/12.
//
#import "StageView.h"
NS_ASSUME_NONNULL_BEGIN
@interface TwentyMicStageView : StageView
//- (instancetype)initWithRows:(NSInteger)rows columns:(NSInteger)columns;
@end
NS_ASSUME_NONNULL_END

87
YuMi/Modules/YMRoom/View/StageView/TwentyMicStageView.m Normal file
View File

@@ -0,0 +1,87 @@
//
// TwentyMicStageView.m
// YuMi
//
// Created by P on 2024/12/12.
//
#import "TwentyMicStageView.h"
#import "ArabMicroView.h"
//第一行距离顶部
#define firstRowTopMargin 60
// 房主头像宽 58 + 光圈 5
#define ownerWidth (45 + 5) * kScreenScale
// 昵称高12，距离头像间距 10
#define ownerHeight (ownerWidth + 10 + 12)
// 下面 8 个坑位宽55 + 光圈 5
#define mcWidth (45 + 5) * kScreenScale
#define mcHeight (mcWidth + 10 + 12 + 5+16)
// 左右 padding 20
#define paddingH 22 * kScreenScale
// 每行间距
#define lineMargin 8
// 下面 8 个坑位两两之间的间距
#define marginH (KScreenWidth - paddingH * 2 - mcWidth * 5) / 4
// 第二行坑位的顶部
#define sRowTop firstRowTopMargin + mcHeight + lineMargin
// 第一行坑位与第二行坑位的间距
//#define marginV2 15
// 第三行坑位的顶部
#define tRowTop (sRowTop + mcHeight + lineMargin)
@interface TwentyMicStageView ()
@end
@implementation TwentyMicStageView
static const NSInteger kMicCountPerRow = 5;
- (NSInteger)countOfMicroView {
return 20;
}
- (UIView<MicroViewProtocol> *)microViewForIndex:(NSInteger)index {
UIView<MicroViewProtocol> *microView = [super microViewForIndex:index];
return microView ?: [[ArabMicroView alloc] init];
}
- (CGRect)rectForViewAtIndex:(NSInteger)index {
if (index < 0 || index >= [self countOfMicroView]) {
return CGRectZero;
}
CGPoint position = [self positionForIndex:index rowHeight:mcHeight];
return CGRectMake(position.x - mcWidth / 2, position.y - mcHeight / 2, mcWidth, mcHeight);
}
- (CGFloat)hightForStageView {
NSInteger rows = ceil((CGFloat)[self countOfMicroView] / kMicCountPerRow);
return firstRowTopMargin + rows * (mcHeight + lineMargin) - lineMargin;
}
- (CGPoint)animationPointAtStageViewByUid:(NSString *)uid {
NSInteger index = [self getIndexByUid:uid];
return [self animationPointAtStageViewByIndex:index];
}
- (CGPoint)animationPointAtStageViewByIndex:(NSInteger)index {
if (index < 0 || index >= [self countOfMicroView]) {
return CGPointZero;
}
CGPoint position = [self positionForIndex:index rowHeight:mcHeight];
return [self convertPoint:position toView:nil];
}
#pragma mark - Helper Methods
- (CGPoint)positionForIndex:(NSInteger)index rowHeight:(CGFloat)rowHeight {
NSInteger row = index / kMicCountPerRow;
NSInteger col = index % kMicCountPerRow;
CGFloat x = paddingH + col * (mcWidth + marginH) + mcWidth / 2;
CGFloat y = firstRowTopMargin + row * (rowHeight + lineMargin) + rowHeight / 2;
return CGPointMake(x, y);
}
@end

35
YuMi/Modules/YMRoom/View/UserCard/Presenter/XPUserCardPresenter.m
View File

@@ -198,7 +198,6 @@
item.isEnable = NO;
item.imageName = @"usercard_invite_micro_disable";
} else {
item.isEnable = YES;
item.imageName = @"usercard_invite_micro_normal";
}
@@ -219,7 +218,7 @@
NSMutableArray * array = [NSMutableArray array];
XPUserCardMicroItemModel * muteItem = [[XPUserCardMicroItemModel alloc] init];
muteItem.title = userInfo.micState == MicroMicStateType_Open ? YMLocalizedString(@"XPUserCardPresenter5") : YMLocalizedString(@"XPUserCardPresenter6");
muteItem.iconImage = userInfo.micState == MicroMicStateType_Open ? @"user_card_close_mic" : @"user_card_open_mic";
muteItem.iconImage = userInfo.micState == MicroMicStateType_Open ? @"room_user_card_close_mic" : @"room_user_card_open_mic";
muteItem.status = userInfo.micState == MicroMicStateType_Open;
muteItem.type = UserCardMicroType_Mute;
@@ -228,11 +227,11 @@
upDownItem.status = userInfo.position.length > 0 ? YES : NO;
upDownItem.type = UserCardMicroType_UpDown;
upDownItem.uid = userInfo.uid;
upDownItem.iconImage = @"user_card_down_mic_listen";
upDownItem.iconImage = @"room_user_card_out_mic";
XPUserCardMicroItemModel * lockItem = [[XPUserCardMicroItemModel alloc] init];
lockItem.title = userInfo.posState == MicroPosStateType_Free ? YMLocalizedString(@"XPUserCardPresenter10") : YMLocalizedString(@"XPUserCardPresenter11");
lockItem.iconImage = userInfo.posState == MicroPosStateType_Free ? @"user_card_lock_mic" : @"user_card_no_lock_mic";
lockItem.iconImage = userInfo.posState == MicroPosStateType_Free ? @"room_user_card_lock" : @"room_user_card_unlock";
lockItem.status = userInfo.posState == MicroPosStateType_Free;
lockItem.type = UserCardMicroType_Lock;
@@ -240,7 +239,7 @@
XPUserCardMicroItemModel * giftValueItem = [[XPUserCardMicroItemModel alloc] init];
giftValueItem.title = YMLocalizedString(@"XPUserCardPresenter12");
giftValueItem.iconImage = @"user_card_clean_gift_value";
giftValueItem.iconImage = @"room_user_card_clean_gift_value";
giftValueItem.type = UserCardMicroType_Clean_Gift_Value;
///自己是公会超管
BOOL meIsSuperAdmin = NO;
@@ -628,8 +627,8 @@
if (!_giftItem) {
_giftItem = [[XPUserCardItemModel alloc] init];
_giftItem.title = YMLocalizedString(@"XPUserCardPresenter13");
_giftItem.imageName = @"usercard_sendgift_normal";
_giftItem.selectImageName = @"usercard_sendgift_normal";
_giftItem.imageName = @"room_user_card_send_gift";
_giftItem.selectImageName = @"room_user_card_send_gift";
_giftItem.type = UserCardItemType_Gift;
}
return _giftItem;
@@ -639,8 +638,8 @@
if (!_chatItem) {
_chatItem = [[XPUserCardItemModel alloc] init];
_chatItem.title = YMLocalizedString(@"XPUserCardPresenter14");
_chatItem.imageName = @"usercard_chat_normal";
_chatItem.selectImageName = @"usercard_chat_normal";
_chatItem.imageName = @"room_user_card_chat";
_chatItem.selectImageName = @"room_user_card_chat";
_chatItem.type = UserCardItemType_Chat;
}
return _chatItem;
@@ -650,8 +649,8 @@
if (!_atItem) {
_atItem = [[XPUserCardItemModel alloc] init];
_atItem.title = YMLocalizedString(@"XPUserCardPresenter22");
_atItem.imageName = @"usercard_chat_normal";
_atItem.selectImageName = @"usercard_chat_normal";
_atItem.imageName = @"room_user_card_at";
_atItem.selectImageName = @"room_user_card_at";
_atItem.type = UserCardItemType_AtUser;
}
return _atItem;
@@ -661,9 +660,9 @@
if (!_attentionItem) {
_attentionItem = [[XPUserCardItemModel alloc] init];
_attentionItem.title = YMLocalizedString(@"XPUserCardPresenter15");
_attentionItem.imageName = @"usercard_attention_normal";
_attentionItem.imageName = @"room_user_card_follow";
_attentionItem.selectTitle = YMLocalizedString(@"XPUserCardPresenter16");
_attentionItem.selectImageName = @"usercard_attention_disable";
_attentionItem.selectImageName = @"room_user_card_unfollow";
_attentionItem.type = UserCardItemType_Attention;
}
return _attentionItem;
@@ -673,8 +672,8 @@
if (!_kikoutItem) {
_kikoutItem = [[XPUserCardItemModel alloc] init];
_kikoutItem.title = YMLocalizedString(@"XPUserCardPresenter17");
_kikoutItem.imageName = @"usercard_kickout_normal";
_kikoutItem.selectImageName = @"usercard_kickout_normal";
_kikoutItem.imageName = @"room_user_card_kick";
_kikoutItem.selectImageName = @"room_user_card_kick";
_kikoutItem.type = UserCardItemType_KickOut;
}
return _kikoutItem;
@@ -684,9 +683,9 @@
if (!_managerItem) {
_managerItem = [[XPUserCardItemModel alloc] init];
_managerItem.title = YMLocalizedString(@"XPUserCardPresenter18");
_managerItem.imageName = @"usercard_manager_normal";
_managerItem.imageName = @"room_user_card_be_manager";
_managerItem.selectTitle = YMLocalizedString(@"XPUserCardPresenter19");
_managerItem.selectImageName = @"usercard_manager_disable";
_managerItem.selectImageName = @"room_user_card_not_manager";
_managerItem.type = UserCardItemType_Manager;
}
return _managerItem;
@@ -696,7 +695,7 @@
if (!_blackItem) {
_blackItem = [[XPUserCardItemModel alloc] init];
_blackItem.title = YMLocalizedString(@"XPUserCardPresenter20");
_blackItem.imageName = @"usercard_blacklist_normal";
_blackItem.imageName = @"room_user_card_blacklist";
_blackItem.type = UserCardItemType_Black;
}
return _blackItem;

20
YuMi/Modules/YMRoom/View/UserCard/View/UserRoomCardViewController.h Normal file
View File

@@ -0,0 +1,20 @@
//
// UserRoomCardViewController.h
// YuMi
//
// Created by P on 2024/12/11.
//
#import "MvpViewController.h"
@class XPUserCardInfoModel;
NS_ASSUME_NONNULL_BEGIN
@interface UserRoomCardViewController : MvpViewController
- (instancetype)initWithUser:(XPUserCardInfoModel *)cardInfo;
@end
NS_ASSUME_NONNULL_END

1500
YuMi/Modules/YMRoom/View/UserCard/View/UserRoomCardViewController.m Normal file
View File

File diff suppressed because it is too large Load Diff

37
YuMi/Modules/YMRoom/View/XPRoomViewController.m
View File

@@ -50,6 +50,8 @@
#import "SocialStageView.h"
#import "TenMicStageView.h"
#import "FifteenMicStageView.h"
#import "NineteenMicStageView.h"
#import "TwentyMicStageView.h"
#import "DatingStageView.h"
#import "AnchorStageView.h"
#import "AnchorPkStageView.h"
@@ -130,6 +132,8 @@ XPCandyTreeInsufficientBalanceViewDelegate>
@property (nonatomic,strong) StageView *stageView;
@property (nonatomic,strong) TenMicStageView *tenMicStageView;
@property (nonatomic,strong) FifteenMicStageView *fifteenMicStageView;
@property (nonatomic,strong) TwentyMicStageView *twentyMicStageView;
@property(nonatomic, strong) NineteenMicStageView *nineteenMicStageView;
///公屏
@property (nonatomic,strong) MsRoomMessageMainView *messageContainerView;
///快捷发言
@@ -539,6 +543,14 @@ XPCandyTreeInsufficientBalanceViewDelegate>
[self.view addSubview:self.animationView];
}
- (void)__layoutTwentyMicStage {
[self.stageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.leading.trailing.mas_equalTo(self.view);
make.top.mas_equalTo(self.roomHeaderView.mas_bottom);
make.height.mas_equalTo(self.stageView.hightForStageView);
}];
}
- (void)__layoutFifteenMicStage {
[self.stageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.leading.trailing.mas_equalTo(self.view);
@@ -829,7 +841,12 @@ XPCandyTreeInsufficientBalanceViewDelegate>
} else if (roomInfo.type == RoomType_MiniGame) {
return [LittleGameScrollStageView class];
} else if (roomInfo.type == RoomType_15Mic) {
#if DEBUG
return [NineteenMicStageView class];
// return [TwentyMicStageView class];
#endif
return [FifteenMicStageView class];
} else if (roomInfo.type == RoomType_10Mic) {
return [TenMicStageView class];
} else if (roomInfo.hadChangeRoomType && ![self.stageView isKindOfClass:[SocialStageView class]]) {
@@ -877,7 +894,6 @@ XPCandyTreeInsufficientBalanceViewDelegate>
}];
[self.activityContainerView mas_remakeConstraints:^(MASConstraintMaker *make) {
// make.height.mas_equalTo(115);
make.trailing.mas_equalTo(self.view);
make.bottom.mas_equalTo(self.quickMessageContainerView.mas_top).offset(-5);
make.width.mas_equalTo(87);
@@ -1863,7 +1879,12 @@ XPCandyTreeInsufficientBalanceViewDelegate>
} else if (self.roomInfo.type == RoomType_15Mic) {
[self __layoutFifteenMicStage];
[self changeStageViewOnRoomUpdate];
#if DEBUG
// [self.twentyMicStageView onRoomUpdate];
[self.nineteenMicStageView onRoomUpdate];
#else
[self.fifteenMicStageView onRoomUpdate];
#endif
} else if (self.roomInfo.type == RoomType_10Mic) {
[self __layoutTenMicStage];
[self changeStageViewOnRoomUpdate];
@@ -2730,6 +2751,20 @@ XPCandyTreeInsufficientBalanceViewDelegate>
return _tenMicStageView;
}
- (NineteenMicStageView *)nineteenMicStageView {
if (!_nineteenMicStageView) {
_nineteenMicStageView = [[NineteenMicStageView alloc] initWithDelegate:self];
}
return _nineteenMicStageView;
}
- (TwentyMicStageView *)twentyMicStageView {
if (!_twentyMicStageView) {
_twentyMicStageView = [[TwentyMicStageView alloc] initWithDelegate:self];
}
return _twentyMicStageView;
}
- (FifteenMicStageView *)fifteenMicStageView {
if (!_fifteenMicStageView) {
_fifteenMicStageView = [[FifteenMicStageView alloc] initWithDelegate:self];

2
YuMi/Structure/MVP/Model/UserInfoModel.h
View File

@@ -195,6 +195,8 @@ NS_ASSUME_NONNULL_BEGIN
/// 是否超管身份
@property(nonatomic, assign) BOOL hasSuperRole;
@property(nonatomic, copy) NSString *guildNameplateIcon;
- (BOOL)isUserValid;
- (NSString *)userIDString;

2
YuMi/Tools/IAPHelper/RechargeStorage.m
View File

@@ -7,7 +7,7 @@
#import "RechargeStorage.h"
#import <SSKeychain/SSKeychain.h>
#define kAppStoreKey @"kAppStoreKey"
static

5
YuMi/ar.lproj/Localizable.strings
View File

@@ -4030,3 +4030,8 @@ ineHeadView12" = "الحمل";
"1.0.30_text_29" = "سبب الحظر";
"1.0.30_text_30" = "يرجى إدخال سبب الحظر، والذي سيكون مرئيًا في الخلفية";
"1.0.30_text_31" = "حظر";
"1.0.31_text_0" = "Country/Region";
"1.0.31_text_1" = "Select Country/Region";
"1.0.31_text_2" = "Country/Region List";
"1.0.31_text_3" = "Selective cardiography";

5
YuMi/en.lproj/Localizable.strings
View File

@@ -3824,3 +3824,8 @@
"1.0.30_text_30" = "Please enter the block reason, which will be visible in the background";
"1.0.30_text_31" = "Block";
"1.0.31_text_0" = "Country/Region";
"1.0.31_text_1" = "Select Country/Region";
"1.0.31_text_2" = "Country/Region List";
"1.0.31_text_3" = "Selective cardiography";

7
YuMi/tr.lproj/Localizable.strings
View File

@@ -307,7 +307,7 @@
"XPMineNewUserRechargeView2" = "%zd saat %zd dakika";
"XPMineNewUserRechargeView3" = "%zd dakika";
"XPMineAccountView0" = "Altın Bakiyesi";
"XPMineAccountView0" = "Jeton bakiyesi";
"XPMineVerifIdentityView0" = "Doğrulama Kodu Gönder";
@@ -3609,3 +3609,8 @@
"1.0.30_text_29" = "Engellenme nedeni";
"1.0.30_text_30" = "Lütfen arka planda görünecek olan engelleme nedenini girin";
"1.0.30_text_31" = "Engelleme";
"1.0.31_text_0" = "Country/Region";
"1.0.31_text_1" = "Select Country/Region";
"1.0.31_text_2" = "Country/Region List";
"1.0.31_text_3" = "Selective cardiography";

5
YuMi/zh-Hant.lproj/Localizable.strings
View File

@@ -3481,3 +3481,8 @@
"1.0.30_text_29" = "封禁原因";
"1.0.30_text_30" = "请输入封禁原因，该原因将在后台可见";
"1.0.30_text_31" = "封禁";
"1.0.31_text_0" = "Country/Region";
"1.0.31_text_1" = "Select Country/Region";
"1.0.31_text_2" = "Country/Region List";
"1.0.31_text_3" = "Selective cardiography";