提交0.0.18

梁星国
1 parent 76eed0b5
Showing 6 changed files with 266 additions and 9 deletions
CNLiveServiceCenterModule.podspec
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/Category/NSString+Random.h
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/Category/NSString+Random.m
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/Controller/CNLiveBServiceCenterController.m
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/View/CNLiveBServiceCenterHeaderView.h
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/View/CNLiveBServiceCenterHeaderView.m
@@ -8,7 +8,7 @@
  
 Pod::Spec.new do |s|
     s.name             = 'CNLiveServiceCenterModule'
-    s.version          = '0.0.17'
+    s.version          = '0.0.18'
     s.summary          = '网家家企业端服务中心模块'
  
     # This description is used to generate tags and improve search results.
+/*
+ * Copyright (C) 2011 Michael Dippery <mdippery@gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#import <Foundation/Foundation.h>
+
+@interface NSString (Randomized)
++ (NSString *)defaultAlphabet;
++ (id)randomizedString;
++ (id)randomizedStringWithAlphabet:(NSString *)alphabet;
++ (id)randomizedStringWithAlphabet:(NSString *)alphabet length:(NSUInteger)len;
+- (id)initWithDefaultAlphabet;
+- (id)initWithAlphabet:(NSString *)alphabet;
+- (id)initWithAlphabet:(NSString *)alphabet length:(NSUInteger)len;
+@end
+/*
+ * Copyright (C) 2011 Michael Dippery <mdippery@gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#import "NSString+Random.h"
+#include <stdlib.h>
+
+#define DEFAULT_LENGTH  8
+
+@implementation NSString (Randomized)
+
++ (NSString *)defaultAlphabet
+{
+    return @"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXZY0123456789";
+}
+
++ (id)randomizedString
+{
+    return [self randomizedStringWithAlphabet:[self defaultAlphabet]];
+}
+
++ (id)randomizedStringWithAlphabet:(NSString *)alphabet
+{
+    return [self randomizedStringWithAlphabet:alphabet length:DEFAULT_LENGTH];
+}
+
++ (id)randomizedStringWithAlphabet:(NSString *)alphabet length:(NSUInteger)len
+{
+    return [[self alloc] initWithAlphabet:alphabet length:len];
+}
+
+- (id)initWithDefaultAlphabet
+{
+    return [self initWithAlphabet:[NSString defaultAlphabet]];
+}
+
+- (id)initWithAlphabet:(NSString *)alphabet
+{
+    return [self initWithAlphabet:alphabet length:DEFAULT_LENGTH];
+}
+
+- (id)initWithAlphabet:(NSString *)alphabet length:(NSUInteger)len
+{
+    NSMutableString *s = [NSMutableString stringWithCapacity:len];
+    for (NSUInteger i = 0U; i < len; i++) {
+        u_int32_t r = arc4random() % [alphabet length];
+        unichar c = [alphabet characterAtIndex:r];
+        [s appendFormat:@"%C", c];
+    }
+    return [NSString stringWithString:s];
+}
+
+@end
@@ -26,6 +26,8 @@
 #import <CNLiveBServices/CNLiveLiveSetHomeProtocol.h>
 #import "CNLiveBCreatorViewController.h"
 #import "CNLiveBServiceLiveSelectedView.h"
+#import "NSString+Random.h"
+#import <CNLiveBServices/CNLiveBStreamServiceProtocol.h>
  
 /// 认证状态
 #define CNLiveBGetServiceStatusUrl          cn_API_OpenApi2(@"/user/readWJJBStatusById")
@@ -110,9 +112,9 @@
     self.navigationController.navigationBarHidden = YES;
     [self loadStatus];
     if (self.headerView) {
-         [self.headerView eidtHeaderView];
+        [self.headerView eidtHeaderView];
     }
-   
+    
  
 }
  
@@ -179,6 +181,9 @@
         [weakSelf  checkPersonCertification];
     };
  
+    ///天机获取参数
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(updateServiceStatusNotification:) name:@"UpdateServiceStatus" object:nil];
+    
 }
  
 #pragma mark -
@@ -266,6 +271,15 @@
     }else {
         headerView.titleL.text = @"";
     }
+    
+#pragma mark - TODO: 测试使用
+    __weak typeof(self) weakSelf = self;
+    headerView.clickTestViewBlock = ^(CNLiveBCenterHeaderFooterView * _Nonnull view) {
+        NSLog(@"点击了头部");
+        [self testLiveVC];
+        
+    };
+    
     return headerView;
  
 }
@@ -346,6 +360,85 @@
  
  
 #pragma mark - *** 事件实现 ***
+
+
+#pragma mark - TODO: 测试需要后期直接删除
+- (void)testLiveVC {
+    
+    NSString *strUrl = [self getStreamCloudURL];
+    NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:[NSURL URLWithString:strUrl]];
+    request.HTTPMethod = @"GET";
+    request.timeoutInterval = 10;
+    
+    NSURLSessionDataTask *task = [[NSURLSession sharedSession] dataTaskWithRequest:request completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) {
+        
+        
+        if (error != nil || response == nil || data == nil) {
+            NSLog(@"get play json faild, %@, %@, %@", error, response, data);
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.4 * NSEC_PER_SEC)), dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+                [self testLiveVC];
+            });
+            return;
+        }
+        
+        NSURL *streamURL = [NSURL URLWithString:[[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]];
+        
+        dispatch_async(dispatch_get_main_queue(), ^{
+            NSString *streamURLString = streamURL.absoluteString;
+            
+            NSMutableDictionary *params = [[NSMutableDictionary alloc] init];
+            [params setValue:@"10515174" forKey:@"userId"];
+            [params setValue:@"UGC主播测试-0412-4" forKey:@"spName"];
+            [params setValue:@"604" forKey:@"spId"];
+            [params setValue:@"769_bb50cde6847011ea9f1bfa163e21407f" forKey:@"activityId"];
+            [params setValue:@"AVCR_769_9295cbc6883b11eaa436fa163e21407f" forKey:@"chatRoomId"];
+            [params setValue:@"欢迎进入聊天室" forKey:@"appLiveNotice"];
+            [params setValue:@"分享直播可获得平台积分奖励，进行奖赏，增加热度" forKey:@"spLiveNotice"];
+            [params setValue:@"1919" forKey:@"fansNum"];
+            [params setValue:@"1919" forKey:@"onlineCount"];
+            [params setValue:@"1" forKey:@"legalize"];
+            [params setValue:@"https://wjjtest.ys2.cnliveimg.com/802/img_new/1586916434665.HEIC" forKey:@"activityImg"];
+            [params setValue:@"https://wjjtest.ys2.cnliveimg.com/802/img_new/1559115890722.png" forKey:@"spIcon"];
+            [params setValue:[NSString stringWithFormat:@"%@",streamURLString] forKey:@"streamLocation"];
+            [params setValue:@"0" forKey:@"isAuthLive"];
+            
+            NSLog(@"输出内容参数 = %@",params);
+            /// 详情页
+            id<CNLiveBStreamServiceProtocol> serviceProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveBStreamServiceProtocol)];
+            UIViewController *vc = [serviceProtocol getStreamController:params];
+            vc.hidesBottomBarWhenPushed = YES;
+            [self.navigationController pushViewController:vc animated:YES];
+            
+        });
+        
+    }];
+    [task resume];
+    
+    
+    
+    
+}
+
+- (NSString *)getStreamCloudURL {
+#warning 在这里填写获取推流地址的业务服务器 url
+    NSString *streamServer = @"https://api-demo.qnsdk.com/v1/live/stream/";
+    NSString *streamID = [NSString randomizedString];
+    NSString *streamURLString = [streamServer stringByAppendingPathComponent:streamID];
+    return streamURLString;
+}
+
+
+/// 通知实现
+- (void)updateServiceStatusNotification:(NSNotification *)notification  {
+    
+    [self loadStatus];
+    if (self.headerView) {
+        [self.headerView eidtHeaderView];
+    }
+    
+}
+
+
 ///跳转个人
 - (void)jumpPersonVC {
     /// 详情页
@@ -424,17 +517,63 @@
         if (!err) {
             NSDictionary * contentDic = (NSDictionary *)data;
             if ([contentDic containsObjectForKey:@"personStatus"]) {
-                self.personStatus = [NSString stringWithFormat:@"%@",[contentDic objectForKey:@"personStatus"] ? [contentDic objectForKey:@"personStatus"] : @"0"];
-                self.centerModel.personStatus = self.personStatus;
+                
+                if (CNUserShareModel.wjjStatus) {
+                    if (![[NSString stringWithFormat:@"%@",CNUserShareModel.wjjStatus.personStatus ? CNUserShareModel.wjjStatus.personStatus : @"0"] isEqualToString:@"0"]) {
+                        self.personStatus = [NSString stringWithFormat:@"%@",CNUserShareModel.wjjStatus.personStatus ? CNUserShareModel.wjjStatus.personStatus : @"0"];
+                        self.centerModel.personStatus = self.personStatus;
+                        
+                        
+                    }else {
+                        self.personStatus = [NSString stringWithFormat:@"%@",[contentDic objectForKey:@"personStatus"] ? [contentDic objectForKey:@"personStatus"] : @"0"];
+                        self.centerModel.personStatus = self.personStatus;
+                    }
+                }else {
+                    self.personStatus = [NSString stringWithFormat:@"%@",[contentDic objectForKey:@"personStatus"] ? [contentDic objectForKey:@"personStatus"] : @"0"];
+                    self.centerModel.personStatus = self.personStatus;
+                }
  
             }
  
             if ([contentDic containsObjectForKey:@"institutionStatus"]) {
-                self.institutionStatus = [NSString stringWithFormat:@"%@",[contentDic objectForKey:@"institutionStatus"] ? [contentDic objectForKey:@"institutionStatus"] : @"0"];
+                
+                if (CNUserShareModel.wjjStatus) {
+                    if (![[NSString stringWithFormat:@"%@",CNUserShareModel.wjjStatus.institutionStatus ? CNUserShareModel.wjjStatus.institutionStatus : @"0"] isEqualToString:@"0"]) {
+                        
+                        self.institutionStatus = [NSString stringWithFormat:@"%@",CNUserShareModel.wjjStatus.institutionStatus ? CNUserShareModel.wjjStatus.institutionStatus : @"0"];
+                        self.centerModel.institutionStatus = self.institutionStatus;
+                        
+                    }else {
+                        self.institutionStatus = [NSString stringWithFormat:@"%@",[contentDic objectForKey:@"institutionStatus"] ? [contentDic objectForKey:@"institutionStatus"] : @"0"];
+                        self.centerModel.institutionStatus = self.institutionStatus;
+                        
+                    }
+                    
+                }else {
+                    self.institutionStatus = [NSString stringWithFormat:@"%@",[contentDic objectForKey:@"institutionStatus"] ? [contentDic objectForKey:@"institutionStatus"] : @"0"];
+                    self.centerModel.institutionStatus = self.institutionStatus;
+                }
+                
+            }
+            
+            
+            if (self.headerView) {
+                [self.headerView configUIWithIsPerson:self.personStatus isEnterprise:self.institutionStatus];
+            }
+            [self.tableView reloadData];
+            
+            
+        }else {
+            if (CNUserShareModel.wjjStatus) {
+                self.personStatus = [NSString stringWithFormat:@"%@",CNUserShareModel.wjjStatus.personStatus ? CNUserShareModel.wjjStatus.personStatus : @"0"];
+                self.institutionStatus = [NSString stringWithFormat:@"%@",CNUserShareModel.wjjStatus.institutionStatus ? CNUserShareModel.wjjStatus.institutionStatus : @"0"];
+                self.centerModel.personStatus = self.personStatus;
                 self.centerModel.institutionStatus = self.institutionStatus;
  
             }
-            [self.headerView configUIWithIsPerson:self.personStatus isEnterprise:self.institutionStatus];
+            if (self.headerView) {
+                [self.headerView configUIWithIsPerson:self.personStatus isEnterprise:self.institutionStatus];
+            }
             [self.tableView reloadData];
         }
  
@@ -621,7 +760,7 @@
                                     vc.hidesBottomBarWhenPushed = YES;
                                     [self.navigationController pushViewController:vc animated:YES];
                                 });
-
+                                
                             }else {
  
                             }
@@ -643,7 +782,7 @@
                                     vc.hidesBottomBarWhenPushed = YES;
                                     [self.navigationController pushViewController:vc animated:YES];
                                 });
-
+                                
  
                             }else {
  
@@ -54,6 +54,9 @@ NS_ASSUME_NONNULL_BEGIN
  
 /***  题头 ***/
 @property (nonatomic, strong) UILabel *titleL;
+
+/** 点击用户认证实现*/
+@property (nonatomic, copy) void(^clickTestViewBlock)(CNLiveBCenterHeaderFooterView *view);
 @end
  
 NS_ASSUME_NONNULL_END
@@ -618,6 +618,11 @@
     [self setBackgroundColor:[UIColor yellowColor]];
     [self.contentView addSubview:self.titleL];
     self.titleL.frame = CGRectMake(15, 4, KScreenWidth - 30, 15);
+
+#pragma mark - TODO:测试添加后期要删掉
+    ///测试添加
+    UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(tapAction:)];
+    [self addGestureRecognizer:tap];
  
 }
  
@@ -629,6 +634,12 @@
 #pragma mark - editUI
  
 #pragma mark - ***事件实现***
+- (void)tapAction:(UITapGestureRecognizer *)tap {
+    
+    if (self.clickTestViewBlock) {
+        self.clickTestViewBlock(self);
+    }
+}
  
  
 #pragma mark - ***私有方法***