From a8bef5946e8f129486d147670542eaba68d350e8 Mon Sep 17 00:00:00 2001
From: liyuhua <15626451870@163.com>
Date: Wed, 6 Dec 2023 17:40:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xcshareddata/xcschemes/YuMi.xcscheme      |  2 +-
 YuMi/Modules/YMRoom/Api/Api+Room.m            |  2 +-
 .../View/SubViews/XPAnchorPkPanelView.m       | 36 ++++-----
 .../View/SubViews/XPAnchorRandomPKRuleView.m  | 77 ++++++++++---------
 .../XPRoomBackContainerView.m                 |  2 +-
 .../View/XPRoomMoreMenuViewController.m       | 12 ++-
 .../MicroView/Anchor/AnchorMicroView.m        |  2 +-
 .../MicroView/Anchor/AnchorPKMicroView.m      |  2 +-
 8 files changed, 70 insertions(+), 65 deletions(-)

diff --git a/YuMi.xcodeproj/xcshareddata/xcschemes/YuMi.xcscheme b/YuMi.xcodeproj/xcshareddata/xcschemes/YuMi.xcscheme
index 9e3921f5..d258e3d3 100644
--- a/YuMi.xcodeproj/xcshareddata/xcschemes/YuMi.xcscheme
+++ b/YuMi.xcodeproj/xcshareddata/xcschemes/YuMi.xcscheme
@@ -31,7 +31,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
diff --git a/YuMi/Modules/YMRoom/Api/Api+Room.m b/YuMi/Modules/YMRoom/Api/Api+Room.m
index 1e2a7028..5b52ad38 100644
--- a/YuMi/Modules/YMRoom/Api/Api+Room.m
+++ b/YuMi/Modules/YMRoom/Api/Api+Room.m
@@ -191,7 +191,7 @@
 /// @param completion 完成
 /// @param teamUid 房间uid
 + (void)requestFansTeamTask:(HttpRequestHelperCompletion)completion teamUid:(NSString *)teamUid {
-	NSString * fang = [NSString stringFromBase64String:@"Y3Jvc3Nyb29tcGtyb3VuZC9nZXRTaW5nbGVSb29tUGtSdWxl"];///crossroompkround/getSingleRoomPkRule
+	NSString * fang = @"anchorFansTeam/getFansTaskInfo";
     [self makeRequest:fang method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, teamUid, nil];
 }
 
diff --git a/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPkPanelView.m b/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPkPanelView.m
index 0cb70976..300802d5 100644
--- a/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPkPanelView.m
+++ b/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPkPanelView.m
@@ -122,19 +122,19 @@
 
 ///更新对方麦状态
 - (void)updateOtherMicStatus:(AttachmentModel *)attachment {
-    NSNumber *micStatus = attachment.data[@"aMicStatus"];
-    NSNumber *aUid = attachment.data[@"aUid"];
-    self.otherMicButton.selected = !micStatus.boolValue;
-    [[RtcManager instance] muteOne:!micStatus.boolValue userId:[NSString stringWithFormat:@"%@", aUid]];
-    if (!micStatus.boolValue) {
-        [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPAnchorPkPanelView0")];
-        self.otherMicButton.hidden = NO;
-    } else {
-        self.otherMicButton.hidden = YES;
-    }
-    if ([self.pkPanelInfo.cUid isEqualToString:[AccountInfoStorage instance].getUid]) {
-        self.otherMicButton.hidden = NO;
-    }
+//    NSNumber *micStatus = attachment.data[@"aMicStatus"];
+//    NSNumber *aUid = attachment.data[@"aUid"];
+//    self.otherMicButton.selected = !micStatus.boolValue;
+//    [[RtcManager instance] muteOne:!micStatus.boolValue userId:[NSString stringWithFormat:@"%@", aUid]];
+//    if (!micStatus.boolValue) {
+//        [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPAnchorPkPanelView0")];
+//        self.otherMicButton.hidden = NO;
+//    } else {
+//        self.otherMicButton.hidden = YES;
+//    }
+//    if ([self.pkPanelInfo.cUid isEqualToString:[AccountInfoStorage instance].getUid]) {
+//        self.otherMicButton.hidden = NO;
+//    }
 }
 
 - (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event {
@@ -522,11 +522,11 @@
         self.otherNickLabel.text = pkPanelInfo.aNick;
         self.redNickLabel.text = pkPanelInfo.cNick;
         self.followButton.hidden = [pkPanelInfo.cUid isEqualToString:[AccountInfoStorage instance].getUid];
-        if (pkPanelInfo.aMicStatus == AnchorPKOtherMicStatus_Close) {
-            self.otherMicButton.hidden = NO;
-        } else {
-            self.otherMicButton.hidden = ![pkPanelInfo.cUid isEqualToString:[AccountInfoStorage instance].getUid];
-        }
+//        if (pkPanelInfo.aMicStatus == AnchorPKOtherMicStatus_Close) {
+//            self.otherMicButton.hidden = NO;
+//        } else {
+//            self.otherMicButton.hidden = ![pkPanelInfo.cUid isEqualToString:[AccountInfoStorage instance].getUid];
+//        }
         self.otherMicButton.selected = pkPanelInfo.aMicStatus == AnchorPKOtherMicStatus_Close;
         [[RtcManager instance] muteOne:pkPanelInfo.aMicStatus == AnchorPKOtherMicStatus_Close userId:pkPanelInfo.aUid];
     } else {
diff --git a/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorRandomPKRuleView.m b/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorRandomPKRuleView.m
index af8b1b9a..6a470a08 100644
--- a/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorRandomPKRuleView.m
+++ b/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorRandomPKRuleView.m
@@ -61,13 +61,13 @@
 
 	[self.scrollView addSubview:self.ruleLabel];
 
-	[self.scrollView addSubview:self.randomImageView];
-	[self.scrollView addSubview:self.randomLabel];
-	[self.scrollView addSubview:self.randomContentLb];
-
-	[self.scrollView addSubview:self.inviteImageView];
-	[self.scrollView addSubview:self.inviteLabel];
-	[self.scrollView addSubview:self.inviteContentLb];
+//	[self.scrollView addSubview:self.randomImageView];
+//	[self.scrollView addSubview:self.randomLabel];
+//	[self.scrollView addSubview:self.randomContentLb];
+//
+//	[self.scrollView addSubview:self.inviteImageView];
+//	[self.scrollView addSubview:self.inviteLabel];
+//	[self.scrollView addSubview:self.inviteContentLb];
 
 
 }
@@ -99,37 +99,37 @@
 		make.left.right.mas_equalTo(self.backgroundImageView).inset(18);
 	}];
 
-	[self.randomLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.top.mas_equalTo(self.ruleLabel.mas_bottom).offset(16);
-		make.centerX.mas_equalTo(self.scrollView);
-	}];
-
-	[self.randomImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.size.mas_equalTo(CGSizeMake(88, 8));
-		make.top.mas_equalTo(self.randomLabel.mas_bottom).offset(-6);
-		make.centerX.mas_equalTo(self.randomLabel);
-	}];
-
-	[self.randomContentLb mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.left.right.mas_equalTo(self.backgroundImageView).inset(18);
-		make.top.mas_equalTo(self.randomImageView.mas_bottom).offset(8);
-	}];
-
-	[self.inviteLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.top.mas_equalTo(self.randomContentLb.mas_bottom).offset(16);
-		make.centerX.mas_equalTo(self.scrollView);
-	}];
-
-	[self.inviteImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.size.mas_equalTo(CGSizeMake(88, 8));
-		make.top.mas_equalTo(self.inviteLabel.mas_bottom).offset(-6);
-		make.centerX.mas_equalTo(self.inviteLabel);
-	}];
-
-	[self.inviteContentLb mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.left.right.mas_equalTo(self.backgroundImageView).inset(18);
-		make.top.mas_equalTo(self.inviteImageView.mas_bottom).offset(8);
-	}];
+//	[self.randomLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+//		make.top.mas_equalTo(self.ruleLabel.mas_bottom).offset(16);
+//		make.centerX.mas_equalTo(self.scrollView);
+//	}];
+//
+//	[self.randomImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+//		make.size.mas_equalTo(CGSizeMake(88, 8));
+//		make.top.mas_equalTo(self.randomLabel.mas_bottom).offset(-6);
+//		make.centerX.mas_equalTo(self.randomLabel);
+//	}];
+//
+//	[self.randomContentLb mas_makeConstraints:^(MASConstraintMaker *make) {
+//		make.left.right.mas_equalTo(self.backgroundImageView).inset(18);
+//		make.top.mas_equalTo(self.randomImageView.mas_bottom).offset(8);
+//	}];
+//
+//	[self.inviteLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+//		make.top.mas_equalTo(self.randomContentLb.mas_bottom).offset(16);
+//		make.centerX.mas_equalTo(self.scrollView);
+//	}];
+//
+//	[self.inviteImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+//		make.size.mas_equalTo(CGSizeMake(88, 8));
+//		make.top.mas_equalTo(self.inviteLabel.mas_bottom).offset(-6);
+//		make.centerX.mas_equalTo(self.inviteLabel);
+//	}];
+//
+//	[self.inviteContentLb mas_makeConstraints:^(MASConstraintMaker *make) {
+//		make.left.right.mas_equalTo(self.backgroundImageView).inset(18);
+//		make.top.mas_equalTo(self.inviteImageView.mas_bottom).offset(8);
+//	}];
 
 	[self.closeBtn mas_makeConstraints:^(MASConstraintMaker *make) {
 		make.right.top.mas_equalTo(self.backgroundImageView);
@@ -264,6 +264,7 @@ CGSize size = [self.ruleLabel sizeThatFits:CGSizeMake(300 -36, CGFLOAT_MAX)];
 		[attribute addAttribute:NSParagraphStyleAttributeName value:paragraphStyle range:NSMakeRange(0, title.length)];
 		_inviteContentLb.attributedText = attribute;
 		_inviteContentLb.numberOfLines = 0;
+        
 	}
 	return _inviteContentLb;
 }
diff --git a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomBackContainerView.m b/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomBackContainerView.m
index 677d3c62..6a9bf2a4 100644
--- a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomBackContainerView.m
+++ b/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomBackContainerView.m
@@ -108,7 +108,7 @@
             self.svgDisplayView.hidden = NO;
             @weakify(self);
 			NSString * bgString = [NSString stringWithFormat:@"%@/anchor_room_bg.svga", API_Image_URL];
-            NSURL *bgUrl = [NSURL fileURLWithPath:bgString];
+            NSURL *bgUrl = [NSURL URLWithString:bgString];
             [self.parserManager loadSvgaWithURL:bgUrl completionBlock:^(SVGAVideoEntity * _Nullable videoItem) {
                 @strongify(self);
                 if (videoItem != nil) {
diff --git a/YuMi/Modules/YMRoom/View/MoreView/View/XPRoomMoreMenuViewController.m b/YuMi/Modules/YMRoom/View/MoreView/View/XPRoomMoreMenuViewController.m
index b0b24c35..ceeea359 100644
--- a/YuMi/Modules/YMRoom/View/MoreView/View/XPRoomMoreMenuViewController.m
+++ b/YuMi/Modules/YMRoom/View/MoreView/View/XPRoomMoreMenuViewController.m
@@ -223,8 +223,12 @@ UIKIT_EXTERN NSString * const kRoomGiftEffectUpdateNotificationKey;
     [[NSNotificationCenter defaultCenter] postNotificationName:@"cancelMatchRandomPK" object:nil];
     [self dismissViewControllerAnimated:YES completion:nil];
     NSString * roomUid = [NSString stringWithFormat:@"%ld", self.roomInfo.uid];
-    XPAnchorPKSelectTypeController *selectVc = [[XPAnchorPKSelectTypeController alloc] initWithRoomUid:roomUid];
-    [self.hostDelegate.getCurrentNav presentViewController:selectVc animated:YES completion:nil];
+    
+    XPAnchorPKViewController * acrossRoomPKVC = [[XPAnchorPKViewController alloc] initWithRoomUid:roomUid];
+    [self.hostDelegate.getCurrentNav presentViewController:acrossRoomPKVC animated:YES completion:nil];
+    
+//    XPAnchorPKSelectTypeController *selectVc = [[XPAnchorPKSelectTypeController alloc] initWithRoomUid:roomUid];
+//    [self.hostDelegate.getCurrentNav presentViewController:selectVc animated:YES completion:nil];
 }
 
 #pragma mark - UICollectionViewDelegate And UICollectionViewDatasource
@@ -392,8 +396,8 @@ UIKIT_EXTERN NSString * const kRoomGiftEffectUpdateNotificationKey;
                 }];
             } else {
                 [self dismissViewControllerAnimated:NO completion:nil];
-                XPAnchorPKSelectTypeController *selectVc = [[XPAnchorPKSelectTypeController alloc] initWithRoomUid:roomUid];
-                [self.hostDelegate.getCurrentNav presentViewController:selectVc animated:YES completion:nil];
+                XPAnchorPKViewController * acrossRoomPKVC = [[XPAnchorPKViewController alloc] initWithRoomUid:roomUid];
+                [self.hostDelegate.getCurrentNav presentViewController:acrossRoomPKVC animated:YES completion:nil];
             }
         }
             break;
diff --git a/YuMi/Modules/YMRoom/View/StageView/MicroView/Anchor/AnchorMicroView.m b/YuMi/Modules/YMRoom/View/StageView/MicroView/Anchor/AnchorMicroView.m
index d67cbc2c..25c773d3 100644
--- a/YuMi/Modules/YMRoom/View/StageView/MicroView/Anchor/AnchorMicroView.m
+++ b/YuMi/Modules/YMRoom/View/StageView/MicroView/Anchor/AnchorMicroView.m
@@ -93,7 +93,7 @@
         self.svgDisplayView.hidden = NO;
 		@weakify(self);
 		NSString * anatomiser1Name = [NSString stringWithFormat:@"%@/anchor_room_speak.svga", API_Image_URL];
-		NSURL *bgUrl = [NSURL fileURLWithPath:anatomiser1Name];
+		NSURL *bgUrl = [NSURL URLWithString:anatomiser1Name];
 		[self.parserManager loadSvgaWithURL:bgUrl completionBlock:^(SVGAVideoEntity * _Nullable videoItem) {
 			@strongify(self);
 			self.svgDisplayView.loops = INT_MAX;
diff --git a/YuMi/Modules/YMRoom/View/StageView/MicroView/Anchor/AnchorPKMicroView.m b/YuMi/Modules/YMRoom/View/StageView/MicroView/Anchor/AnchorPKMicroView.m
index 391fe3a0..b4c0ef78 100644
--- a/YuMi/Modules/YMRoom/View/StageView/MicroView/Anchor/AnchorPKMicroView.m
+++ b/YuMi/Modules/YMRoom/View/StageView/MicroView/Anchor/AnchorPKMicroView.m
@@ -104,7 +104,7 @@
     self.svgDisplayView.hidden = NO;
     @weakify(self);
 	NSString * anatomiser1Name = [NSString stringWithFormat:@"%@/anchor_room_speak.svga", API_Image_URL];
-	NSURL *bgUrl = [NSURL fileURLWithPath:anatomiser1Name];
+	NSURL *bgUrl = [NSURL URLWithString:anatomiser1Name];
     [self.parserManager loadSvgaWithURL:bgUrl completionBlock:^(SVGAVideoEntity * _Nullable videoItem) {
         @strongify(self);
         self.svgDisplayView.loops = INT_MAX;