fix

GIGA/Modules/Mask/Controller/GiGaFlingCommitVC.m

@@ -15,18 +15,64 @@
 #import "IQKeyboardManager.h"
 #import <SocketIO/SocketIO-Swift.h>
 #import "NSString+Unicode.h"
+#import "GIGAMBHUDHelper.h"
+#import "LXCustomSwith.h"
 
 //弹幕控制器
 @interface GiGaFlingCommitVC ()
 @property (nonatomic,strong) GiGaFlyingCommitInputView *commitInputView;
 @property (nonatomic,strong) SocketIOClient *client;
 @property (nonatomic,strong) SocketManager *manager;
-
+@property (nonatomic,strong) LXCustomSwith *danmuSwitch;
 
 @end
 
 @implementation GiGaFlingCommitVC
 
+- (LXCustomSwith *)danmuSwitch{
+    if (!_danmuSwitch) {
+        _danmuSwitch = [[LXCustomSwith alloc] initWithFrame:CGRectMake(KMainW - 50 - 25 , 64 + PhoneX_TopMargin +10, 50, 18)];
+        
+        [_danmuSwitch setOffthumTitle:@"弹幕"];
+        [_danmuSwitch setOnthumTitle:@"弹幕"];
+        [_danmuSwitch setOnTintColor:GIGARGB(91, 0, 2, 1)];
+        [_danmuSwitch setTintColor:GIGARGB(91, 0, 2, 1)];
+        [_danmuSwitch setThumbTintColor:GIGARGB(203, 42, 50, 1)];
+        _danmuSwitch.on = YES;
+        _danmuSwitch.thumbLabel.font = GIGA_TEXTFONTMEDIUM(10);
+        _danmuSwitch.thumbLabel.textColor = [UIColor whiteColor];
+        [_danmuSwitch addTarget:self action:@selector(mycuntomSwitchAction:) forControlEvents:UIControlEventValueChanged];
+    }
+    
+    return _danmuSwitch;
+}
+
+- (GiGaFlyingCommitInputView *)commitInputView{
+    
+    if (!_commitInputView) {
+        _commitInputView = [[GiGaFlyingCommitInputView alloc] initWithFrame:self.view.bounds];
+        [_commitInputView setPalceholderText:@"请输入弹幕"];
+    }
+    return _commitInputView;
+}
+
+//弹幕按钮
+
+-(void)mycuntomSwitchAction:(id)sender{
+    
+    LXCustomSwith *nkswitch = (LXCustomSwith *)sender;
+    if (nkswitch.isOn)
+        NSLog(@"switchPressed ON");
+    else
+    [self.manager disconnectSocket:self.client];
+    [self.manager disconnect];
+    [self.client disconnect];
+    self.client = nil;
+    self.manager = nil;
+    [self dismissViewControllerAnimated:YES completion:nil];
+    NSLog(@"switchPressed OFF");
+}
+
 -(void)viewWillAppear:(BOOL)animated{
     [super viewWillAppear:animated];
     NC_ADD_TARGET_NAME_OBJECT(self, @selector(maskTimeEnd), kUserNoti_MASKEND, nil);
@@ -46,9 +92,13 @@
     [super viewDidLoad];
     
     // Do any additional setup after loading the view.
-    [self.view addSubview: self.commitInputView];
-    weakify(self);
     
+    [self.view addSubview: self.commitInputView];
+    [self.view addSubview:self.danmuSwitch];
+    [self.view bringSubviewToFront:self.danmuSwitch];
+    
+    
+    weakify(self);
     self.commitInputView.SendCommentHandler = ^(NSString *content) {
         GILog(@"发送->:%@",content);
         NSArray *arr = @[@{
@@ -62,7 +112,6 @@
     };
     
     //开启弹幕
-    
     [[LXDanMuManager shareInstance] createDanmuWithTrackSpeedArray:@[@1.00,@1.00,@3.00,@4.00] centerY:KMainH / 4  trackWidth:KMainW showInView:self.view];
     [[LXDanMuManager shareInstance] start];
     //socket
@@ -73,26 +122,27 @@
 -(void)connetction{
     
     NSURL* url = [[NSURL alloc] initWithString:@"http://wsyts.s1.natapp.cc"];
-//     NSDictionary* headers = @{@"EncodeUTF8":@YES};
-    SocketManager *manager = [[SocketManager alloc] initWithSocketURL:url config:@{@"log": @NO, @"forcePolling": @YES,@"connectParams":@{@"token":@""},@"doubleEncodeUTF8":@YES}];
-    
+    SocketManager *manager = [[SocketManager alloc] initWithSocketURL:url config:@{@"log": @NO, @"forcePolling": @YES,@"connectParams":@{@"token":@""}}];
     
     _manager = manager;
     _client = manager.defaultSocket;
-    
     [self.manager connect];
+    
     weakify(self);
     [self.client on:@"connect" callback:^(NSArray* data, SocketAckEmitter* ack) {
+        GIGA_WIndowTost(@"客户端上线");
         NSLog(@"*************\n\niOS客户端上线\n\n*************");
     }];
     
     [self.client on:@"connectedSocket" callback:^(NSArray * _Nonnull event, SocketAckEmitter * _Nonnull ack) {
+        [GIGAMBHUDHelper  messageAddto:self.view title:@"弹幕链接成功"];
         NSLog(@"connectedSocket:%@",event);
+        
     }];
 
-    [self.client on:@"onTalk" callback:^(NSArray * _Nonnull envent, SocketAckEmitter * _Nonnull ack) {
+    [self.client on:@"onTalk" callback:^(NSArray * _Nonnull data, SocketAckEmitter * _Nonnull ack) {
         
-        NSString *json =envent[0];
+        NSString *json =data[0];
         NSLog(@"callback json***:%@",json);
         NSDictionary *dic = [GiGaHelper dictionaryWithJsonString:json];
         
@@ -105,11 +155,16 @@
         }
     }];
     
+    
     [self.client on:@"disconnect" callback:^(NSArray * _Nonnull event, SocketAckEmitter * _Nonnull ack) {
+        
+        GIGA_WIndowTost(@"客户端下线");
         NSLog(@"*************\n\niOS客户端下线\n\n*************%@",event?event[0]:@"");
     }];
     
     [self.client on:@"error" callback:^(NSArray * _Nonnull event, SocketAckEmitter * _Nonnull ack) {
+        
+        [GIGAMBHUDHelper  messageAddto:self.view title:@"连接弹幕"];
 //        NSString *htmlString =event[0];
 //        htmlString = [self htmlEntityDecode:htmlString];
 //
@@ -119,17 +174,8 @@
 //
 //        NSLog(@"*************\n\n%@\n\n*************",event?event[0]:@"");
         GILog(@"请求超时");
-        
-    }];
-}
-
-- (GiGaFlyingCommitInputView *)commitInputView{
     
-    if (!_commitInputView) {
-        _commitInputView = [[GiGaFlyingCommitInputView alloc] initWithFrame:self.view.bounds];
-        [_commitInputView setPalceholderText:@"请输入弹幕"];
-    }
-    return _commitInputView;
+    }];
 }
 
 
@@ -156,13 +202,5 @@
     NSLog(@"dealloc");
 }
 
-- (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event{
-    [self.manager disconnectSocket:self.client];
-    [self.manager disconnect];
-    [self.client disconnect];
-     self.client = nil;
-    self.manager = nil;
-    [self dismissViewControllerAnimated:YES completion:nil];
-}
 
 @end