no message

zhangxiaowen
1 parent 74bb97df
Showing 10 changed files with 43 additions and 66 deletions
CNLivePlayer/Classes/Streamer/CNLiveBgmPlayer.h
CNLivePlayer/Classes/Streamer/CNLiveBgmPlayer.m
CNLivePlayer/Classes/Streamer/CNLiveStreamerKit.m
CNLivePlayer/Classes/Streamer/CNLiveStreamerTools.h
CNLivePlayer/Classes/Streamer/CNLiveWatermark.h
Example/CNLivePlayer.xcodeproj/project.pbxproj
Example/CNLivePlayer/CNLiveViewController.m
Example/CNLivePlayer/Streamer/FloatingViewController.h → Example/CNLivePlayer/Streamer/CNLiveFloatingController.h
Example/CNLivePlayer/Streamer/FloatingViewController.m → Example/CNLivePlayer/Streamer/CNLiveFloatingController.m
Example/CNLivePlayer/Streamer/CNLiveStreamerDetailController.m
@@ -6,6 +6,10 @@
 //  Copyright © 2019 153993236@qq.com. All rights reserved.
 //
+/**
+ * 背景音乐播放器
+ */
+
 #import <Foundation/Foundation.h>
 #import <AVFoundation/AVFoundation.h>
 #import "CNLivePlayerDefines.h"
@@ -18,7 +18,7 @@ NSString * const CNLiveBgmAudioStateDidChangeNotification = @&quot;CNLiveBgmAudioStat
 - (instancetype)init {
     self = [super init];
     if (self) {
-        [self addBgmObservers];
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(audioStateDidChange) name:KSYAudioStateDidChangeNotification object:nil];
         STREAMER_Manager_BgmPlayer.audioDataBlock = ^ BOOL(uint8_t** pData, int len, const AudioStreamBasicDescription* fmt, CMTime pts){
             [STREAMER_Manager.aMixer processAudioData:pData nbSample:len withFormat:fmt timeinfo:pts of:STREAMER_Manager.bgmTrack];
@@ -35,23 +35,16 @@ NSString * const CNLiveBgmAudioStateDidChangeNotification = @&quot;CNLiveBgmAudioStat
     return self;
 }
-- (void)addBgmObservers {
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(audioStateDidChange)
-                                                 name:KSYAudioStateDidChangeNotification
-                                               object:nil];
-}
-
 - (CNLiveBgmPlayerState)audioStateDidChange {
     return (CNLiveBgmPlayerState)STREAMER_Manager_BgmPlayer.bgmPlayerState;
 }
 - (void)dealloc {
-    [[NSNotificationCenter defaultCenter] removeObserver:self
-                                                    name:KSYAudioStateDidChangeNotification
-                                                  object:nil];
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+     
 }
+#pragma mark - methods
 - (BOOL)startPlayBgm:(NSString *)path isLoop:(BOOL)loop {
     return [STREAMER_Manager_BgmPlayer startPlayBgm:path isLoop:loop];
 }
@@ -213,14 +213,15 @@ NSString * const CNLiveServiceConnectBreakNotification = @&quot;CNLiveServiceConnectB
     else {
         //设置初始美颜
         _filter = [[KSYGPUBeautifyExtFilter alloc] init];
-        [(KSYGPUBeautifyExtFilter *)_filter setBeautylevel: 0.5];
+        [(KSYGPUBeautifyExtFilter *)_filter setBeautylevel:0.5];
         [_manager.kit setupFilter:_filter];
         //摄像头位置
         _manager.kit.cameraPosition = AVCaptureDevicePositionFront;
     }
-    _manager.kit.streamerBase.shouldEnableKSYStatModule = NO;   //收集网络相关状态的日志(不收集)
+    _manager.kit.streamerBase.shouldEnableKSYStatModule = NO;
+    //收集网络相关状态的日志(不收集)
     _manager.kit.videoProcessingCallback = ^(CMSampleBufferRef sampleBuffer){
     };
@@ -410,22 +411,7 @@ NSString * const CNLiveServiceConnectBreakNotification = @&quot;CNLiveServiceConnectB
 - (void)quitStreaming {
-    [[NSNotificationCenter defaultCenter] removeObserver:self
-                                                    name:KSYCaptureStateDidChangeNotification
-                                                  object:nil];
-    
-    [[NSNotificationCenter defaultCenter] removeObserver:self
-                                                    name:KSYStreamStateDidChangeNotification
-                                                  object:nil];
-    
-    [[NSNotificationCenter defaultCenter] removeObserver:self
-                                                    name:UIApplicationWillResignActiveNotification
-                                                  object:nil];
-    
-    [[NSNotificationCenter defaultCenter] removeObserver:self
-                                                    name:UIApplicationDidBecomeActiveNotification
-                                                  object:nil];
-    
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
     [self.heartTimer invalidate];
     self.heartTimer = nil;
@@ -11,9 +11,10 @@
 NS_ASSUME_NONNULL_BEGIN
 @interface CNLiveStreamerTools : NSObject
-//SHA加密
+//签名
 + (NSMutableDictionary *)encryptionSignWithParameter:(NSMutableDictionary *)parameter;
+//SHA加密
 + (NSString*)sha1:(NSString *)string;
 + (NSString *)signvalue:(NSDictionary*)parameter;
@@ -20,7 +20,6 @@ NS_ASSUME_NONNULL_BEGIN
  @abstract   水印logo的图片
  @discussion 设置为nil为清除水印图片
  @discussion 请注意背景图片的尺寸, 太大的图片会导致内存占用过高
- @see
  */
 @property (nonatomic, readwrite) GPUImagePicture *logoPic;
@@ -16,7 +16,7 @@
 		08740E52230E7DFB00B5D28D /* CNLiveStreamerDetailController.m in Sources */ = {isa = PBXBuildFile; fileRef = 08740E40230E7DFA00B5D28D /* CNLiveStreamerDetailController.m */; };
 		08740E53230E7DFB00B5D28D /* FilterFunctionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 08740E41230E7DFA00B5D28D /* FilterFunctionView.m */; };
 		08740E54230E7DFB00B5D28D /* SliderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 08740E44230E7DFA00B5D28D /* SliderView.m */; };
-		08740E55230E7DFB00B5D28D /* FloatingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 08740E45230E7DFA00B5D28D /* FloatingViewController.m */; };
+		08740E55230E7DFB00B5D28D /* CNLiveFloatingController.m in Sources */ = {isa = PBXBuildFile; fileRef = 08740E45230E7DFA00B5D28D /* CNLiveFloatingController.m */; };
 		08740E56230E7DFB00B5D28D /* AudioStreamingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 08740E46230E7DFA00B5D28D /* AudioStreamingViewController.m */; };
 		08740E59230E7DFB00B5D28D /* BgmPlayerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 08740E4D230E7DFA00B5D28D /* BgmPlayerView.m */; };
 		08740E5E230E8A0700B5D28D /* house.gif in Resources */ = {isa = PBXBuildFile; fileRef = 08740E5D230E8A0700B5D28D /* house.gif */; };
@@ -64,14 +64,14 @@
 		08740E41230E7DFA00B5D28D /* FilterFunctionView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FilterFunctionView.m; sourceTree = "<group>"; };
 		08740E43230E7DFA00B5D28D /* BgmPlayerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BgmPlayerView.h; sourceTree = "<group>"; };
 		08740E44230E7DFA00B5D28D /* SliderView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SliderView.m; sourceTree = "<group>"; };
-		08740E45230E7DFA00B5D28D /* FloatingViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FloatingViewController.m; sourceTree = "<group>"; };
+		08740E45230E7DFA00B5D28D /* CNLiveFloatingController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNLiveFloatingController.m; sourceTree = "<group>"; };
 		08740E46230E7DFA00B5D28D /* AudioStreamingViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AudioStreamingViewController.m; sourceTree = "<group>"; };
 		08740E49230E7DFA00B5D28D /* FilterFunctionView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FilterFunctionView.h; sourceTree = "<group>"; };
 		08740E4A230E7DFA00B5D28D /* CNLiveStreamerDetailController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNLiveStreamerDetailController.h; sourceTree = "<group>"; };
 		08740E4B230E7DFA00B5D28D /* CNLiveStreamerController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNLiveStreamerController.h; sourceTree = "<group>"; };
 		08740E4C230E7DFA00B5D28D /* SliderView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SliderView.h; sourceTree = "<group>"; };
 		08740E4D230E7DFA00B5D28D /* BgmPlayerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BgmPlayerView.m; sourceTree = "<group>"; };
-		08740E4E230E7DFA00B5D28D /* FloatingViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FloatingViewController.h; sourceTree = "<group>"; };
+		08740E4E230E7DFA00B5D28D /* CNLiveFloatingController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNLiveFloatingController.h; sourceTree = "<group>"; };
 		08740E50230E7DFA00B5D28D /* AudioStreamingViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioStreamingViewController.h; sourceTree = "<group>"; };
 		08740E5D230E8A0700B5D28D /* house.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = house.gif; sourceTree = "<group>"; };
 		08740E60230E8C6500B5D28D /* CNLivePlayerController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNLivePlayerController.m; sourceTree = "<group>"; };
@@ -168,8 +168,8 @@
 				08740E40230E7DFA00B5D28D /* CNLiveStreamerDetailController.m */,
 				08740E50230E7DFA00B5D28D /* AudioStreamingViewController.h */,
 				08740E46230E7DFA00B5D28D /* AudioStreamingViewController.m */,
-				08740E4E230E7DFA00B5D28D /* FloatingViewController.h */,
-				08740E45230E7DFA00B5D28D /* FloatingViewController.m */,
+				08740E4E230E7DFA00B5D28D /* CNLiveFloatingController.h */,
+				08740E45230E7DFA00B5D28D /* CNLiveFloatingController.m */,
 				08740E49230E7DFA00B5D28D /* FilterFunctionView.h */,
 				08740E41230E7DFA00B5D28D /* FilterFunctionView.m */,
 				08740E43230E7DFA00B5D28D /* BgmPlayerView.h */,
@@ -511,7 +511,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				08740E55230E7DFB00B5D28D /* FloatingViewController.m in Sources */,
+				08740E55230E7DFB00B5D28D /* CNLiveFloatingController.m in Sources */,
 				08740E69230E989000B5D28D /* CNLiveMoreFunctionsView.m in Sources */,
 				6003F59E195388D20070C39A /* CNLiveAppDelegate.m in Sources */,
 				08740E52230E7DFB00B5D28D /* CNLiveStreamerDetailController.m in Sources */,
@@ -17,8 +17,7 @@
 @implementation CNLiveViewController
-- (void)viewDidLoad
-{
+- (void)viewDidLoad {
     [super viewDidLoad];
 	// Do any additional setup after loading the view, typically from a nib.
@@ -45,7 +44,6 @@
     label.font = [UIFont systemFontOfSize:16];
     label.textAlignment = NSTextAlignmentCenter;
     [self.view addSubview:label];
-
 }
 - (void)btnDidClicked1{
@@ -57,10 +55,4 @@
 }
-- (void)didReceiveMemoryWarning
-{
-    [super didReceiveMemoryWarning];
-    // Dispose of any resources that can be recreated.
-}
-
 @end
 //
-//  FloatingViewController.h
-//  CNLivePlayerSDKDemo
+//  CNLiveFloatingController.h
+//  CNLivePlayer_Example
 //
-//  Created by iOS on 2017/9/20.
-//  Copyright © 2017年 雷浩杰. All rights reserved.
+//  Created by CNLive-zxw on 2019/8/17.
+//  Copyright © 2019 153993236@qq.com. All rights reserved.
 //
 #import <UIKit/UIKit.h>
 #import "CNLiveStreamerKit.h"
-@interface FloatingViewController : UIViewController
+@interface CNLiveFloatingController : UIViewController
 @property (nonatomic, strong) CNLiveStreamerKit *kit;
 //
-//  FloatingViewController.m
-//  CNLivePlayerSDKDemo
+//  CNLiveFloatingController.m
+//  CNLivePlayer_Example
 //
-//  Created by iOS on 2017/9/20.
-//  Copyright © 2017年 雷浩杰. All rights reserved.
+//  Created by CNLive-zxw on 2019/8/17.
+//  Copyright © 2019 153993236@qq.com. All rights reserved.
 //
-#import "FloatingViewController.h"
+#import "CNLiveFloatingController.h"
 #define Width [UIScreen mainScreen].bounds.size.width
 #define Height [UIScreen mainScreen].bounds.size.height
-@interface FloatingViewController ()
+@interface CNLiveFloatingController ()
 @property (nonatomic, strong) UIView *preView;
 @property CGPoint loc_in;
 @end
-@implementation FloatingViewController
+@implementation CNLiveFloatingController
 - (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation {
@@ -52,6 +52,7 @@
 - (void)backAction {
     [self dismissViewControllerAnimated:YES completion:NULL];
+    
 }
 - (void)pan:(UIPanGestureRecognizer *)ges{
@@ -81,9 +82,9 @@
     [UIView animateWithDuration:0 animations:^{
         _preView.center = CGPointMake(x, y);
     }];
+    
 }
-
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.
@@ -13,7 +13,7 @@
 #import <GPUImage/GPUImage.h>
 #import <YYImage/YYImage.h>
-#import "FloatingViewController.h"
+#import "CNLiveFloatingController.h"
 #import "CNLiveStreamerKit.h"
 #import "CNLiveLoadingView.h"
@@ -40,8 +40,7 @@
     UIButton *_flashBtn;             //打开闪光灯
     UIButton *_filterBtn;            //滤镜
     UIButton *_voiceBtn;             //声音
-    UIButton *_moreBtn;             //更多
-
+    UIButton *_moreBtn;              //更多
     CGFloat _currentPinchZoomFactor; //当前触摸缩放因子
@@ -68,7 +67,7 @@
 @property (nonatomic, strong) NSLock *dlLock;
 @property (nonatomic, strong) GPUImagePicture *logoPicure;
-@property (nonatomic, strong) CADisplayLink   *displayLink;
+@property (nonatomic, strong) CADisplayLink *displayLink;
 @end
@@ -96,11 +95,12 @@
     UIDeviceOrientation toDeviceOrientation = [UIDevice currentDevice].orientation;
     if (toDeviceOrientation == UIDeviceOrientationPortrait) {
+        //竖屏
         newTransform = CGAffineTransformIdentity;
         newFrame = CGRectMake(0, 0, minLength, maxLength);
     }
     else {
-        
+        //横屏
         if (currentInterfaceOrientation == UIInterfaceOrientationPortrait) {
             newTransform = CGAffineTransformMakeRotation(M_PI_2*(toDeviceOrientation == UIDeviceOrientationLandscapeRight ? 1 : -1));
         }
@@ -142,7 +142,8 @@
         }
         _previewBtn.frame = CGRectMake(20, Screen_Height-60, 90, 30);
         _startLiveBtn.frame = CGRectMake(Screen_Width-90-20, Screen_Height-60, 90, 30);
-        
+        _stateLabel.frame = newFrame;
+
     }];
 }
@@ -562,7 +563,7 @@
 }
 - (void)floatingWindowBtnClicked {
-    FloatingViewController *vc = [[FloatingViewController alloc] init];
+    CNLiveFloatingController *vc = [[CNLiveFloatingController alloc] init];
     vc.kit = _kitCN;
     [self presentViewController:vc animated:YES completion:NULL];
 }