个播发起PK弹窗优化

xplan-ios/Assets.xcassets/Room/Anchor/AnchorPk/Contents.json

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

xplan-ios/Assets.xcassets/Room/Anchor/AnchorPk/anchorPk_micro_attention.imageset/Contents.json

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

xplan-ios/Assets.xcassets/Room/Anchor/AnchorPk/anchorPk_micro_follow.imageset/Contents.json

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

xplan-ios/Assets.xcassets/Room/Anchor/AnchorPk/anchorPk_micro_had_follow.imageset/Contents.json

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

xplan-ios/Assets.xcassets/Room/Anchor/AnchorPk/anchorPk_panel_ruleBg.imageset/Contents.json

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

xplan-ios/Assets.xcassets/Room/Anchor/AnchorPk/anchorPk_panel_vs.imageset/Contents.json

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

xplan-ios/Main/Room/View/AnchorPK/Api/Api+AnchorPk.h

@@ -17,6 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param roomUid 房主的uid
 /// @param pageNum 当前的页数
 /// @param pageSize 一页多少个
+/// @param pkType pk类型 个播：2
 + (void)searchAnchorPKRoomList:(HttpRequestHelperCompletion)completion
                            erbanNo:(NSString *)erbanNo
                            roomUid:(NSString *)roomUid
@@ -29,6 +30,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param roomUid 房主的uid
 /// @param pageNum 当前的页数
 /// @param pageSize 一页多少个
+/// @param pkType pk类型  个播：2
 + (void)getAnchorPKRoomList:(HttpRequestHelperCompletion)completion
                         roomUid:(NSString *)roomUid
                         pageNum:(NSString *)pageNum

xplan-ios/Main/Room/View/AnchorPK/Api/Api+AnchorPk.m

@@ -15,6 +15,7 @@
 /// @param roomUid 房主的uid
 /// @param pageNum 当前的页数
 /// @param pageSize 一页多少个
+/// @param pkType pk类型
 + (void)searchAnchorPKRoomList:(HttpRequestHelperCompletion)completion erbanNo:(NSString *)erbanNo roomUid:(NSString *)roomUid pageNum:(NSString *)pageNum pageSize:(NSString *)pageSize pkType:(NSString *)pkType {
     [self makeRequest:@"search/permitRoom" method:HttpRequestHelperMethodGET completion:completion,__FUNCTION__, erbanNo, roomUid, pageNum, pageSize, pkType, nil];
 }
@@ -24,6 +25,7 @@
 /// @param roomUid 房主的uid
 /// @param pageNum 当前的页数
 /// @param pageSize 一页多少个
+/// @param pkType pk类型
 + (void)getAnchorPKRoomList:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid pageNum:(NSString *)pageNum pageSize:(NSString *)pageSize pkType:(NSString *)pkType {
     [self makeRequest:@"search/permitRoom" method:HttpRequestHelperMethodGET completion:completion,__FUNCTION__, roomUid, pageNum, pageSize, pkType, nil];
 }

xplan-ios/Main/Room/View/AnchorPK/Protocol/XPAnchorPKProtocol.h

@@ -11,9 +11,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 @protocol XPAnchorPKProtocol <NSObject>
 
-///开启咵房pk成功
+///开启主播pk成功
 - (void)beginAnchorPKSuccess;
-///开启跨房Pk失败
+///开启主播Pk失败
 - (void)beginAnchorPKFail:(NSString *)message;
 
 @end

xplan-ios/Main/Room/View/AnchorPK/View/XPAnchorPKViewController.m

@@ -246,13 +246,15 @@
         self.doneButton.enabled = NO;
     }
 }
-#pragma mark - XPAcrossRoomProtocol
-- (void)beginAcrossRoomPKSuccess {
+#pragma mark - XPAnchorPKProtocol
+///开启pk成功
+- (void)beginAnchorPKSuccess {
     [self showSuccessToast:@"pk已发起，请等待对方接受"];
     [self dismissViewControllerAnimated:YES completion:nil];
 }
 
-- (void)beginAcrossRoomPKFail:(NSString *)message {
+///开启Pk失败
+- (void)beginAnchorPKFail:(NSString *)message {
     if (message.length >0) {
         TTAlertConfig * config = [[TTAlertConfig alloc] init];
         config.actionStyle = TTAlertActionConfirmStyle;
@@ -524,7 +526,7 @@
         _customTimeTextField.layer.cornerRadius = 15;
         _customTimeTextField.layer.masksToBounds = YES;
         _customTimeTextField.backgroundColor = UIColorFromRGB(0x4C4C6A);
-        _customTimeTextField.textColor = [UIColor whiteColor];
+        _customTimeTextField.textColor = UIColorFromRGB(0x43BDFF);
         _customTimeTextField.leftView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 19, 0)];
         _customTimeTextField.leftViewMode = UITextFieldViewModeAlways;
         _customTimeTextField.delegate = self;
@@ -568,7 +570,7 @@
         _pkPlayModeTextField.leftView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 19, 0)];
         _pkPlayModeTextField.leftViewMode = UITextFieldViewModeAlways;
         _pkPlayModeTextField.delegate = self;
-        _pkPlayModeTextField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"选填，10个字以内" attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:15], NSForegroundColorAttributeName: UIColorFromRGB(0x43BDFF)}];
+        _pkPlayModeTextField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"选填，10个字以内" attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:15], NSForegroundColorAttributeName: UIColorFromRGB(0xC6C6E9)}];
         [_pkPlayModeTextField addTarget:self action:@selector(textFieldDidChanged:) forControlEvents:UIControlEventEditingChanged];
     }
     return _pkPlayModeTextField;

xplan-ios/Main/Room/View/StageView/AnchorPKStageView.h

@@ -0,0 +1,16 @@
+//
+//  AnchorPKStageView.h
+//  xplan-ios
+//
+//  Created by GreenLand on 2022/4/11.
+//
+
+#import "StageView.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface AnchorPKStageView : StageView
+
+@end
+
+NS_ASSUME_NONNULL_END

xplan-ios/Main/Room/View/StageView/AnchorPKStageView.m

@@ -0,0 +1,12 @@
+//
+//  AnchorPKStageView.m
+//  xplan-ios
+//
+//  Created by GreenLand on 2022/4/11.
+//
+
+#import "AnchorPKStageView.h"
+
+@implementation AnchorPKStageView
+
+@end

xplan-ios/Main/Room/View/StageView/MicroView/Anchor/AnchorPKMicroView.h

@@ -0,0 +1,16 @@
+//
+//  AnchorPKMicroView.h
+//  xplan-ios
+//
+//  Created by GreenLand on 2022/4/11.
+//
+
+#import "MicroView.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface AnchorPKMicroView : MicroView
+
+@end
+
+NS_ASSUME_NONNULL_END

xplan-ios/Main/Room/View/StageView/MicroView/Anchor/AnchorPKMicroView.m

@@ -0,0 +1,12 @@
+//
+//  AnchorPKMicroView.m
+//  xplan-ios
+//
+//  Created by GreenLand on 2022/4/11.
+//
+
+#import "AnchorPKMicroView.h"
+
+@implementation AnchorPKMicroView
+
+@end