Steven 2 år sedan
förälder
incheckning
82c4545eb8

BIN
KulexiuForStudent/KulexiuForStudent.xcworkspace/xcuserdata/wangzhi.xcuserdatad/UserInterfaceState.xcuserstate


+ 9 - 8
KulexiuForStudent/KulexiuForStudent/Module/Live/Controller/LiveVideoRoomViewController.m

@@ -14,7 +14,7 @@
 #import "KSChatroomMessageCenter.h"
 #import <RongIMKit/RongIMKit.h>
 #import "KSChatroomTextCell.h"
-#import "KSNormalAlertView.h"
+
 #import "KSLiveStreamVideo.h"
 #import "SeatContentView.h"
 #import "LiveroomTimeManager.h"
@@ -31,7 +31,7 @@
 #import "KSLiveEndView.h"
 #import "LiveAnimationView.h"
 
-
+#import "LiveRoomAlertView.h"
 #import "LiveApplyView.h"
 #import "LiveApplyingView.h"
 
@@ -71,7 +71,7 @@ typedef NS_ENUM(NSInteger, MICSTATUS) {
 // 连麦状态
 @property (nonatomic, assign) MICSTATUS micStatus;
 /// 提示窗
-@property (nonatomic, strong) KSNormalAlertView *alertView;
+@property (nonatomic, strong) LiveRoomAlertView *alertView;
 /// 连麦的视图
 @property (nonatomic, strong) SeatContentView *seatContainer;
 // 聊天UI
@@ -1157,7 +1157,7 @@ static int clickPraiseBtnTimes  = 0;
         self.alertView = nil;
     }
     MJWeakSelf;
-    self.alertView = [KSNormalAlertView ks_showAlertWithTitle:tipsMessage leftTitle:@"取消" rightTitle:@"确定" inView:self.view cancel:^{
+    self.alertView = [LiveRoomAlertView liveroomAlertWithTitle:tipsMessage leftButtonTitle:@"取消" rightTitle:@"确定" inView:self.view cancel:^{
         weakSelf.micStatus = MICSTATUS_NOMAL;
         [weakSelf sendSeatResponseMessage:NO];
     } confirm:^{
@@ -1891,7 +1891,7 @@ static int clickPraiseBtnTimes  = 0;
     }
     else {
         MJWeakSelf;
-        [KSNormalAlertView ks_showAlertWithTitle:@"是否退出直播间" leftTitle:@"取消" rightTitle:@"退出" cancel:^{
+        self.alertView = [LiveRoomAlertView liveroomAlertWithTitle:@"是否退出直播间" leftButtonTitle:@"取消" rightTitle:@"退出" inView:self.view cancel:^{
             
         } confirm:^{
             [weakSelf quitAction];
@@ -1938,11 +1938,12 @@ static int clickPraiseBtnTimes  = 0;
             if (self.micStatus == MICSTATUS_CONNECTING) { // 连麦中
                 // 是否取消连麦
                 MJWeakSelf;
-                self.alertView = [KSNormalAlertView ks_showAlertWithTitle:@"连麦中,确认取消连麦吗?" leftTitle:@"取消" rightTitle:@"确定" inView:self.view cancel:^{
+                self.alertView = [LiveRoomAlertView liveroomAlertWithTitle:@"连麦中,确认取消连麦吗?" leftButtonTitle:@"取消" rightTitle:@"确定" inView:self.view cancel:^{
                     
                 } confirm:^{
                     [weakSelf connectHostWithStatus:NO];
                 }];
+                
             }
             else if (self.micStatus == MICSTATUS_WAITING) { // 连麦申请中
                 // 弹窗取消申请
@@ -2003,7 +2004,7 @@ static int clickPraiseBtnTimes  = 0;
 - (void)quitAction {
     if (self.micStatus == MICSTATUS_CONNECTING) {
         MJWeakSelf;
-        self.alertView = [KSNormalAlertView ks_showAlertWithTitle:@"连麦中,是否退出房间?" leftTitle:@"取消" rightTitle:@"确定" inView:self.view cancel:^{
+        self.alertView = [LiveRoomAlertView liveroomAlertWithTitle:@"连麦中,是否退出房间?" leftButtonTitle:@"取消" rightTitle:@"确定" inView:self.view cancel:^{
             
         } confirm:^{
             [weakSelf quitRoom];
@@ -2346,7 +2347,7 @@ static int clickPraiseBtnTimes  = 0;
 
 - (void)cancleApplyAction {
     MJWeakSelf;
-    self.alertView = [KSNormalAlertView ks_showAlertWithTitle:@"连麦申请中,确认取消连麦申请吗?" leftTitle:@"取消" rightTitle:@"确定" inView:self.view cancel:^{
+    self.alertView = [LiveRoomAlertView liveroomAlertWithTitle:@"连麦申请中,确认取消连麦申请吗?" leftButtonTitle:@"取消" rightTitle:@"确定" inView:self.view cancel:^{
         
     } confirm:^{
         [weakSelf.applyingView hideView];