Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud

# Conflicts: # LiveVideoCloud/LiveVideoCloud.xcodeproj/project.pbxproj

Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud
# Conflicts: # LiveVideoCloud/LiveVideoCloud.xcodeproj/project.pbxproj
张旭
2 parents 57e31e4a f7db071f
Showing 32 changed files with 615 additions and 261 deletions
LiveVideoCloud/LiveVideoCloud.xcodeproj/project.pbxproj
LiveVideoCloud/LiveVideoCloud/AppDelegate/AppDelegate.m
LiveVideoCloud/LiveVideoCloud/Classes/CNLiveSDK/CNLiveChatManager.framework/CNLiveChatManager
LiveVideoCloud/LiveVideoCloud/Classes/CNLiveSDK/CNLiveChatManager.framework/Headers/CNLiveChatMessage.h
LiveVideoCloud/LiveVideoCloud/Classes/CNLiveSDK/CNLiveChatManager.framework/Headers/CNLiveChatUserInfo.h
LiveVideoCloud/LiveVideoCloud/Classes/CNLiveSDK/CNLiveChatManager.framework/Modules/module.modulemap
LiveVideoCloud/LiveVideoCloud/Classes/CNLiveSDK/CNLiveMsgTools.framework/CNLiveMsgTools
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/BounceView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Chat/ChatMsgModel/chatMsgModel.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/LVCInteractionController.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/LiveBaseView.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/LiveBaseView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/PrivateView/PriChatCell.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/PrivateView/PrivateView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/TopToolView/TopToolView.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/TopToolView/TopToolView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/LiveSections/Controller/LVCLiveViewController.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/LiveSections/View/FilterFunctionView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/LiveSections/View/LVCUGCLivePrepareView.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/LiveSections/View/LVCUGCLivePrepareView.m
@@ -164,12 +164,6 @@
 		D25BF8831E7F775F007FB138 /* LVCUGCPlayerLoadingView.m in Sources */ = {isa = PBXBuildFile; fileRef = D25BF8821E7F775F007FB138 /* LVCUGCPlayerLoadingView.m */; };
 		D25BF8901E7F7F8F007FB138 /* UGCLoading.jpeg in Resources */ = {isa = PBXBuildFile; fileRef = D25BF88F1E7F7F8F007FB138 /* UGCLoading.jpeg */; };
 		D25BF8931E7FBAEA007FB138 /* LVCUGCBackgroundView.m in Sources */ = {isa = PBXBuildFile; fileRef = D25BF8921E7FBAEA007FB138 /* LVCUGCBackgroundView.m */; };
-		D25BF8971E7FE01B007FB138 /* CNLiveMsgTools.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D25BF8961E7FE01B007FB138 /* CNLiveMsgTools.framework */; };
-		D25BF8991E7FE033007FB138 /* CNLiveChatManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D25BF8981E7FE033007FB138 /* CNLiveChatManager.framework */; };
-		D25BF89A1E7FE046007FB138 /* CNLiveChatManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D25BF8981E7FE033007FB138 /* CNLiveChatManager.framework */; };
-		D25BF89B1E7FE046007FB138 /* CNLiveChatManager.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D25BF8981E7FE033007FB138 /* CNLiveChatManager.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		D25BF89C1E7FE049007FB138 /* CNLiveMsgTools.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D25BF8961E7FE01B007FB138 /* CNLiveMsgTools.framework */; };
-		D25BF89D1E7FE049007FB138 /* CNLiveMsgTools.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D25BF8961E7FE01B007FB138 /* CNLiveMsgTools.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		D25BF8A01E80C4BD007FB138 /* UIImage+LVCVagueImage.m in Sources */ = {isa = PBXBuildFile; fileRef = D25BF89F1E80C4BD007FB138 /* UIImage+LVCVagueImage.m */; };
 		D25BF8A31E80C4FC007FB138 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D25BF8A21E80C4FC007FB138 /* Accelerate.framework */; };
 		D25BF8A51E80EC76007FB138 /* 头像.jpg in Resources */ = {isa = PBXBuildFile; fileRef = D25BF8A41E80EC76007FB138 /* 头像.jpg */; };
@@ -179,10 +173,17 @@
 		D2888DB41E6EC154003A77C8 /* HomeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888DB31E6EC154003A77C8 /* HomeViewController.m */; };
 		D2888DB71E6EC1B8003A77C8 /* LVCMyViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888DB61E6EC1B8003A77C8 /* LVCMyViewController.m */; };
 		D29E81ED1E88DC5B008C9906 /* PriChatCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D29E81EC1E88DC5B008C9906 /* PriChatCell.m */; };
+		D29D88481E88C53300543A03 /* LVCUGCLivePrepareView.m in Sources */ = {isa = PBXBuildFile; fileRef = D29D88471E88C53300543A03 /* LVCUGCLivePrepareView.m */; };
 		D2A803081E80BD6F009D6F1C /* TopToolView.m in Sources */ = {isa = PBXBuildFile; fileRef = D2A803071E80BD6F009D6F1C /* TopToolView.m */; };
+		D2B2ED7A1E88F90C00F7538A /* CNLiveChatManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2D236B21E88F8E600B7C517 /* CNLiveChatManager.framework */; };
+		D2B2ED7B1E88F90C00F7538A /* CNLiveChatManager.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D2D236B21E88F8E600B7C517 /* CNLiveChatManager.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		D2B2ED7C1E88F90F00F7538A /* CNLiveMsgTools.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2D236B31E88F8E600B7C517 /* CNLiveMsgTools.framework */; };
+		D2B2ED7D1E88F90F00F7538A /* CNLiveMsgTools.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D2D236B31E88F8E600B7C517 /* CNLiveMsgTools.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		D2B7B2511E8247D400ED084E /* ChatBarrageManager.m in Sources */ = {isa = PBXBuildFile; fileRef = D2B7B2501E8247D400ED084E /* ChatBarrageManager.m */; };
 		D2B7B2541E824B2D00ED084E /* ChatBarrageView.m in Sources */ = {isa = PBXBuildFile; fileRef = D2B7B2531E824B2D00ED084E /* ChatBarrageView.m */; };
 		D2B7B2571E8261EF00ED084E /* ChatBarrOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = D2B7B2561E8261EF00ED084E /* ChatBarrOperation.m */; };
+		D2D236B41E88F8E600B7C517 /* CNLiveChatManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2D236B21E88F8E600B7C517 /* CNLiveChatManager.framework */; };
+		D2D236B51E88F8E600B7C517 /* CNLiveMsgTools.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2D236B31E88F8E600B7C517 /* CNLiveMsgTools.framework */; };
 /* End PBXBuildFile section */
 /* Begin PBXContainerItemProxy section */
@@ -210,8 +211,8 @@
 			dstSubfolderSpec = 10;
 			files = (
 				811BB6851E8106AF005C6291 /* CNLivePlayerSDK.framework in Embed Frameworks */,
-				D25BF89B1E7FE046007FB138 /* CNLiveChatManager.framework in Embed Frameworks */,
-				D25BF89D1E7FE049007FB138 /* CNLiveMsgTools.framework in Embed Frameworks */,
+				D2B2ED7B1E88F90C00F7538A /* CNLiveChatManager.framework in Embed Frameworks */,
+				D2B2ED7D1E88F90F00F7538A /* CNLiveMsgTools.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -548,8 +549,6 @@
 		D25BF88F1E7F7F8F007FB138 /* UGCLoading.jpeg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = UGCLoading.jpeg; sourceTree = "<group>"; };
 		D25BF8911E7FBAEA007FB138 /* LVCUGCBackgroundView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCBackgroundView.h; sourceTree = "<group>"; };
 		D25BF8921E7FBAEA007FB138 /* LVCUGCBackgroundView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCBackgroundView.m; sourceTree = "<group>"; };
-		D25BF8961E7FE01B007FB138 /* CNLiveMsgTools.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveMsgTools.framework; sourceTree = "<group>"; };
-		D25BF8981E7FE033007FB138 /* CNLiveChatManager.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveChatManager.framework; sourceTree = "<group>"; };
 		D25BF89E1E80C4BD007FB138 /* UIImage+LVCVagueImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImage+LVCVagueImage.h"; sourceTree = "<group>"; };
 		D25BF89F1E80C4BD007FB138 /* UIImage+LVCVagueImage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImage+LVCVagueImage.m"; sourceTree = "<group>"; };
 		D25BF8A21E80C4FC007FB138 /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = System/Library/Frameworks/Accelerate.framework; sourceTree = SDKROOT; };
@@ -566,6 +565,8 @@
 		D2888DB61E6EC1B8003A77C8 /* LVCMyViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCMyViewController.m; sourceTree = "<group>"; };
 		D29E81EB1E88DC5B008C9906 /* PriChatCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PriChatCell.h; sourceTree = "<group>"; };
 		D29E81EC1E88DC5B008C9906 /* PriChatCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PriChatCell.m; sourceTree = "<group>"; };
+		D29D88461E88C53300543A03 /* LVCUGCLivePrepareView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLivePrepareView.h; sourceTree = "<group>"; };
+		D29D88471E88C53300543A03 /* LVCUGCLivePrepareView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLivePrepareView.m; sourceTree = "<group>"; };
 		D2A803061E80BD6F009D6F1C /* TopToolView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TopToolView.h; sourceTree = "<group>"; };
 		D2A803071E80BD6F009D6F1C /* TopToolView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TopToolView.m; sourceTree = "<group>"; };
 		D2B7B24F1E8247D400ED084E /* ChatBarrageManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChatBarrageManager.h; sourceTree = "<group>"; };
@@ -574,6 +575,8 @@
 		D2B7B2531E824B2D00ED084E /* ChatBarrageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChatBarrageView.m; sourceTree = "<group>"; };
 		D2B7B2551E8261EF00ED084E /* ChatBarrOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChatBarrOperation.h; sourceTree = "<group>"; };
 		D2B7B2561E8261EF00ED084E /* ChatBarrOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChatBarrOperation.m; sourceTree = "<group>"; };
+		D2D236B21E88F8E600B7C517 /* CNLiveChatManager.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveChatManager.framework; sourceTree = "<group>"; };
+		D2D236B31E88F8E600B7C517 /* CNLiveMsgTools.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveMsgTools.framework; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 /* Begin PBXFrameworksBuildPhase section */
@@ -583,11 +586,11 @@
 			files = (
 				D25BF8A31E80C4FC007FB138 /* Accelerate.framework in Frameworks */,
 				D2575C7D1E76A4F300E3A8FC /* NHGiftAnimtionSDK.a in Frameworks */,
-				D25BF89A1E7FE046007FB138 /* CNLiveChatManager.framework in Frameworks */,
-				D25BF8971E7FE01B007FB138 /* CNLiveMsgTools.framework in Frameworks */,
-				D25BF8991E7FE033007FB138 /* CNLiveChatManager.framework in Frameworks */,
-				D25BF89C1E7FE049007FB138 /* CNLiveMsgTools.framework in Frameworks */,
+				D2B2ED7C1E88F90F00F7538A /* CNLiveMsgTools.framework in Frameworks */,
+				D2B2ED7A1E88F90C00F7538A /* CNLiveChatManager.framework in Frameworks */,
+				D2D236B51E88F8E600B7C517 /* CNLiveMsgTools.framework in Frameworks */,
 				811BB6831E8106A2005C6291 /* CNLivePlayerSDK.framework in Frameworks */,
+				D2D236B41E88F8E600B7C517 /* CNLiveChatManager.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -657,9 +660,9 @@
 		812E504E1E7699B9004F5FCD /* CNLiveSDK */ = {
 			isa = PBXGroup;
 			children = (
+				D2D236B21E88F8E600B7C517 /* CNLiveChatManager.framework */,
+				D2D236B31E88F8E600B7C517 /* CNLiveMsgTools.framework */,
 				811BB6821E8106A2005C6291 /* CNLivePlayerSDK.framework */,
-				D25BF8981E7FE033007FB138 /* CNLiveChatManager.framework */,
-				D25BF8961E7FE01B007FB138 /* CNLiveMsgTools.framework */,
 				D25BF87C1E7B8C78007FB138 /* KSYGPUResource.bundle */,
 			);
 			path = CNLiveSDK;
@@ -1441,6 +1444,8 @@
 				D25BF8771E7B8A82007FB138 /* FilterFunctionView.m */,
 				D25BF8781E7B8A82007FB138 /* SliderView.h */,
 				D25BF8791E7B8A82007FB138 /* SliderView.m */,
+				D29D88461E88C53300543A03 /* LVCUGCLivePrepareView.h */,
+				D29D88471E88C53300543A03 /* LVCUGCLivePrepareView.m */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -1867,6 +1872,7 @@
 				D2029CB31E6EADE10027CD92 /* UIScrollView+MJRefresh.m in Sources */,
 				D2029D051E6EAE2E0027CD92 /* UILabel+labelFitSize.m in Sources */,
 				D2029CB21E6EADE10027CD92 /* UIScrollView+MJExtension.m in Sources */,
+				D29D88481E88C53300543A03 /* LVCUGCLivePrepareView.m in Sources */,
 				D2029D091E6EAE2E0027CD92 /* Foundation+Log.m in Sources */,
 				D2029C8E1E6EADE10027CD92 /* AFImageDownloader.m in Sources */,
 				D2029BCA1E6EADD70027CD92 /* BaseModel.m in Sources */,
@@ -27,20 +27,20 @@
     //初始化聊天SDK并连接服务器
     [[CNLiveChatManager sharedCNLiveChatManager] initWithAppKey:AppKey appId:AppId];
-    [[CNLiveChatManager sharedCNLiveChatManager] connectServerSuccess:^{
-        NSLog(@"连接服务器-----success");
+//    [[CNLiveChatManager sharedCNLiveChatManager] connectServerSuccess:^{
+//        NSLog(@"连接服务器-----success");
+//    } error:^(CNLiveChatConnectErrorCode errors) {
+//        NSLog(@"连接服务器失败-----%ld", errors);
+//    }];
+    // 20170327 20170328
+    CNLiveChatUserInfo *userInfo = [[CNLiveChatUserInfo alloc] initWithUserId:@"20170328" name:@"20170328" portrait:@""];
+    [[CNLiveChatManager sharedCNLiveChatManager] loginServer:userInfo success:^(NSString *userId) {
+            NSLog(@"连接服务器-----success");
+
     } error:^(CNLiveChatConnectErrorCode errors) {
         NSLog(@"连接服务器失败-----%ld", errors);
-    }];;
-    
-    [self.window makeKeyAndVisible];
-    
-    [[CNLiveChatManager sharedCNLiveChatManager] initWithAppKey:AppKey appId:AppId];
-    [[CNLiveChatManager sharedCNLiveChatManager] connectServerSuccess:^{
-        NSLog(@"connectSuccess");
-    } error:^(CNLiveChatConnectErrorCode errors) {
-        NSLog(@"errors%ld",errors);
     }];
+    [self.window makeKeyAndVisible];
     return YES;
 }
@@ -20,17 +20,17 @@
 /**
  目标ID(消息来自聊天室的ID / 接收者ID)
  */
-@property (nonatomic, assign) NSString *targetId;
+@property (nonatomic, copy) NSString *targetId;
 /**
  消息ID(本地存储的消息的唯一值（数据库索引唯一值）)
  */
-@property (nonatomic, assign) NSString *messageId;
+@property (nonatomic, copy) NSString *messageId;
 /**
  消息内容
  */
-@property (nonatomic, strong) NSString *messageContent;
+@property (nonatomic, copy) NSString *messageContent;
 /**
  发送者的用户信息(userId, name, portraitUri)
@@ -13,17 +13,17 @@
 /*!
  用户ID(一旦以一个用户ID连接到服务器,就不能再修改用户ID了,如果修改也会被忽略)
  */
-@property(nonatomic, strong, readonly) NSString *userId;
+@property(nonatomic, copy, readonly) NSString *userId;
 /*!
  用户名称
  */
-@property(nonatomic, strong) NSString *name;
+@property(nonatomic, copy) NSString *name;
 /*!
  用户头像的URL
  */
-@property(nonatomic, strong) NSString *portraitUri;
+@property(nonatomic, copy) NSString *portraitUri;
 /*!
  用户信息的初始化方法,
-framework module CNLiveChatManager {
-  umbrella header "CNLiveChatManager.h"
-
-  export *
-  module * { export * }
-}
@@ -8,6 +8,7 @@
 #import "BounceView.h"
 #import "userInfoModel.h"
+#import "LiveBaseView.h"
 @interface BounceView ()
@@ -60,21 +61,24 @@
 - (void)closeClick
 {
     [Tools closeBouces];
+    [[LiveBaseView liveBaseView] bounceBtnType:BounceBtnTypeHome model:_model];
 }
 - (void)aiteHeBtnClick
 {
-    NSLog(@"aiteHeBtnClick");
+    [Tools closeBouces];
+    [[LiveBaseView liveBaseView] bounceBtnType:BounceBtnTypeAite model:_model];
 }
 - (void)privateChatClick
 {
-    NSLog(@"privateChatClick");
+    [Tools closeBouces];
+    [[LiveBaseView liveBaseView] bounceBtnType:BounceBtnTypePriChat model:_model];
 }
 - (void)homeBtnClick
 {
-    NSLog(@"homeBtnClick");
+    [Tools closeBouces];
 }
 - (UIImageView *)icon
@@ -22,7 +22,7 @@
     //文字
     CGFloat textMaxW = self.cellWidth;
     CGSize textMaxSize = CGSizeMake(textMaxW, MAXFLOAT);
-    CGSize textSize = [content boundingRectWithSize:textMaxSize options:NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:14]} context:nil].size;
+    CGSize textSize = [content boundingRectWithSize:textMaxSize options:NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:kContentFont]} context:nil].size;
     //底部空隙
     _cellHeight += textSize.height + ChatCellMargin;
@@ -40,10 +40,10 @@
     //文字
     CGFloat textMaxW = self.priCellWidth;
     CGSize textMaxSize = CGSizeMake(textMaxW, MAXFLOAT);
-    CGSize textSize = [content boundingRectWithSize:textMaxSize options:NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:14]} context:nil].size;
+    CGSize textSize = [content boundingRectWithSize:textMaxSize options:NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:kContentFont]} context:nil].size;
     //底部空隙
-    _priCellHeight += textSize.height + ChatCellMargin;
+    _priCellHeight += textSize.height + 5;
 //       NSLog(@"pricellHeight = %f",_priCellHeight);
     return _priCellHeight;
 }
@@ -32,7 +32,7 @@
 {
     if (!_liveBaseView)
     {
-        _liveBaseView = [[LiveBaseView alloc] initWithFrame:SCREEN_RECT];
+        _liveBaseView = [LiveBaseView liveBaseView];
         _liveBaseView.viewController = self;
         _liveBaseView.backgroundColor = [UIColor clearColor];
     }
@@ -9,9 +9,20 @@
 #import "BaseView.h"
 @class PresentView;
 @class AnimationBaseView;
+
+typedef NS_ENUM(NSInteger, BounceBtnType) {//弹窗按钮类型
+    BounceBtnTypeAite        = 1,//@TA按钮点击
+    BounceBtnTypePriChat        ,//私聊按钮点击
+    BounceBtnTypeHome           ,//主页按钮点击
+};
+
 @interface LiveBaseView : BaseView 
 @property (nonatomic ,strong) UIViewController * _Nullable             viewController;
 @property (nonatomic ,strong ,readonly) PresentView *   _Nullable presentView;
 @property (nonatomic ,strong ,readonly) AnimationBaseView * _Nullable             animationBaseView;
+
++ (instancetype _Nullable)liveBaseView;
+
+- (void)bounceBtnType:(BounceBtnType)btnType model:(userInfoModel *_Nonnull)model;
 @end
@@ -58,6 +58,17 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
 @implementation LiveBaseView
++ (instancetype _Nullable)liveBaseView
+{
+    static LiveBaseView *liveBaseView;
+    
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        liveBaseView = [[LiveBaseView alloc] initWithFrame:SCREEN_RECT];
+    });
+    return liveBaseView;
+}
+
 - (instancetype)initWithFrame:(CGRect)frame
 {
     if (self = [super initWithFrame:frame]) {
@@ -76,8 +87,8 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
         self.chatTableView.alpha = 0.7;
         [self.animationBaseView addSubview:self.topToolsView];
-        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillShow:) name:UIKeyboardWillShowNotification object:nil];
-        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillHidden:) name:UIKeyboardWillHideNotification object:nil];
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillShow:) name:UIKeyboardWillShowNotification object:self];
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillHidden:) name:UIKeyboardWillHideNotification object:self];
         [CNLiveChatManager sharedCNLiveChatManager].delegate = self;
         [[CNLiveChatManager sharedCNLiveChatManager] joinChatRoom:@"1234" messageCount:10 success:^(NSString *targetId) {
@@ -92,22 +103,25 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
 }
 - (void)keyboardWillShow:(NSNotification *)notify {
-    
-    NSDictionary *userInfo = notify.userInfo;
-    CGRect newFrameKeyboard = [userInfo[UIKeyboardFrameEndUserInfoKey] CGRectValue];//变化前的frame
-    [UIView animateWithDuration:0.25 animations:^{
-        self.animationBaseView.top = - newFrameKeyboard.size.height + self.bottomToolView.height;
-    }];
-    self.bottomToolView.hidden = YES;
+    if ([notify.object isKindOfClass:[LiveBaseView class]]) {
+        
+        NSDictionary *userInfo = notify.userInfo;
+        CGRect newFrameKeyboard = [userInfo[UIKeyboardFrameEndUserInfoKey] CGRectValue];//变化前的frame
+        [UIView animateWithDuration:0.25 animations:^{
+            self.animationBaseView.top = - newFrameKeyboard.size.height + self.bottomToolView.height;
+        }];
+        self.bottomToolView.hidden = YES;
+    }
 }
 - (void)keyboardWillHidden:(NSNotification *)notify {
-
-    [UIView animateWithDuration:0.1 animations:^{
-        self.animationBaseView.top = 0;
-        [self.animationBaseView setNeedsDisplay];
-    }];
-    self.bottomToolView.hidden = NO;
+    if ([notify.object isKindOfClass:[LiveBaseView class]]) {
+        [UIView animateWithDuration:0.1 animations:^{
+            self.animationBaseView.top = 0;
+            [self.animationBaseView setNeedsDisplay];
+        }];
+        self.bottomToolView.hidden = NO;
+    }
 }
 - (void)createCommentsView {
@@ -208,9 +222,34 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
         textField.text = @"";
     }
     [textField resignFirstResponder];
+
     return YES;
 }
+- (void)bounceBtnType:(BounceBtnType)btnType model:(userInfoModel *_Nonnull)model
+{
+    switch (btnType) {
+        case BounceBtnTypeAite:
+        {
+            [self bottomActionWithType:BtnClickTypeChat button:nil];
+            _commentText.text = [NSString stringWithFormat:@"@%@ ",model.name];
+        }
+            break;
+        case BounceBtnTypePriChat:
+        {
+            [self bottomActionWithType:BtnClickTypePriChat button:nil];
+        }
+            break;
+        case BounceBtnTypeHome:
+        {
+            
+        }
+            break;
+        default:
+            break;
+    }
+}
+
 #pragma mark - bottomBtnActionDelegate
 - (void)bottomActionWithType:(BtnClickType)btnType button:(UIButton *)button
 {
@@ -252,7 +291,6 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
     [self addSubview:privateView];
     privateView.delegate = self;
     self.giftPopView = privateView;
-    
     [UIView animateWithDuration:0.5 animations:^{
         privateView.top -= 300;
     } completion:^(BOOL finished) {
@@ -303,6 +341,8 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
                     self.giftPopView.frame = CGRectMake(0, SCREEN_HEIGHT, SCREEN_WIDTH, 300);
                     [self hiddenView:NO];
                 } completion:^(BOOL finished) {
+                    
+                    [self.giftPopView removeFromSuperview];
                 }];
             }
@@ -454,7 +494,7 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
             model.content = content;
             model.ID = message.targetId;
             model.icon = message.userInfo.portraitUri;
-            model.cellWidth = privateView.tableView.width - 20;
+            model.priCellWidth = privateView.tableView.width * 0.5 - 30;
             [privateView.chatArray addObject:model];
             [privateView.tableView reloadData];
@@ -606,8 +646,7 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
 {
     if (!_topToolsView)
     {
-        _topToolsView = [[TopToolView alloc] initWithFrame:CGRectMake(10, 20, 150, 30)];
-        _topToolsView.backgroundColor = ZXRandomColor;
+        _topToolsView = [[TopToolView alloc] initWithFrame:CGRectMake(10, 20, 100, 30) isHost:NO];
     }
     return _topToolsView;
 }
@@ -623,7 +662,6 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
         tableView.showsHorizontalScrollIndicator = NO;
         tableView.bounces = NO;
         tableView.backgroundColor = [UIColor clearColor];
-        tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
         _chatTableView = tableView;
     }
     return _chatTableView;
@@ -10,14 +10,12 @@
 #import "chatMsgModel.h"
 #define CHAT_POP_WIDTH 260
-#define TOP_MARGIN 6
 @interface PriChatCell ()
 @property (nonatomic ,strong) chatMsgModel * _Nullable model;
 @property (nonatomic ,strong) UIImageView *  _Nullable icon;
 @property (nonatomic ,strong) UILabel *      _Nullable content;
-@property (nonatomic ,strong) UIImageView *  _Nullable bgImgView;
 @end
@@ -43,13 +41,19 @@
 - (void)bindView
 {
-    self.icon.frame = CGRectMake(self.width - 30, TOP_MARGIN, 25, 25);
-//    NSLog(@"self.icon.centerY%f",self.height * 0.5);//13.353516
-    self.icon.top = 13.353516;
-    self.content.frame = CGRectMake(self.width - 30 - CHAT_POP_WIDTH, TOP_MARGIN, CHAT_POP_WIDTH, self.height - 2 * TOP_MARGIN);
-//    self.bgImgView.frame = CGRectMake(<#CGFloat x#>, <#CGFloat y#>, <#CGFloat width#>, <#CGFloat height#>);
-    self.icon.backgroundColor = ZXRandomColor;
-    self.content.backgroundColor = ZXRandomColor;
+    if (_model.isMine) {
+        self.icon.frame = CGRectMake(self.width - 30, 6, 25, 25);
+        NSLog(@"self.icon.centerY%f",self.height * 0.5);//13.353516
+        self.icon.centerY = (self.height - 25)*0.5 + 12.5;//13.353516;
+        self.content.frame = CGRectMake(self.width - 30 - 5 - CHAT_POP_WIDTH, 2.5, CHAT_POP_WIDTH, self.height - 5);
+        self.content.backgroundColor = [UIColor blueColorZX];
+        
+    }else{
+        self.icon.frame = CGRectMake(5, 6, 25, 25);
+        self.icon.centerY = (self.height - 25)*0.5 + 12.5;//13.353516;
+        self.content.frame = CGRectMake(5 + 30, 2.5, CHAT_POP_WIDTH, self.height - 5);
+        self.content.backgroundColor = [UIColor greenColor];
+    }
 }
 #pragma mark - getter
@@ -58,10 +62,12 @@
     if (!_content)
     {
         _content = [[UILabel alloc] init];
-        _content.textAlignment = NSTextAlignmentCenter;
+        _content.textAlignment = NSTextAlignmentLeft;
         _content.textColor = [UIColor blackColor];
         _content.numberOfLines = 0;
-        _content.font = [UIFont systemFontOfSize:14.f];
+        _content.font = [UIFont systemFontOfSize:kContentFont];
+        _content.layer.cornerRadius = 10;
+        _content.layer.masksToBounds = YES;
         [self addSubview:_content];
     }
     return _content;
@@ -79,16 +85,6 @@
     return _icon;
 }
-- (UIImageView * _Nullable)bgImgView
-{
-    if (!_bgImgView)
-    {
-        _bgImgView = [[UIImageView alloc] init];
-        [self addSubview:_bgImgView];
-    }
-    return _bgImgView;
-}
-
 - (void)awakeFromNib {
     [super awakeFromNib];
     // Initialization code
@@ -45,8 +45,8 @@ static NSString *message_content = @&quot;message_content&quot;;
         [self.bottomTool addSubview:self.sendBtn];
         [self.bottomTool addSubview:self.textField];
-        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillShow:) name:UIKeyboardWillShowNotification object:nil];
-        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillHidden:) name:UIKeyboardWillHideNotification object:nil];
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillShow:) name:UIKeyboardWillShowNotification object:self];
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillHidden:) name:UIKeyboardWillHideNotification object:self];
     }
     return self;
 }
@@ -65,22 +65,26 @@ static NSString *message_content = @&quot;message_content&quot;;
 - (void)keyboardWillShow:(NSNotification *)notify {
-    NSDictionary *userInfo = notify.userInfo;
-    CGRect newFrameKeyboard = [userInfo[UIKeyboardFrameEndUserInfoKey] CGRectValue];//变化前的frame
-    [UIView animateWithDuration:0.25 animations:^{
-        self.top = SCREEN_HEIGHT - newFrameKeyboard.size.height - self.height;
-    }];
-    self.isEditing = YES;
-    NSLog(@"showtop:%f",self.top);
+    if ([notify.object isKindOfClass:[PrivateView class]]) {
+        NSDictionary *userInfo = notify.userInfo;
+        CGRect newFrameKeyboard = [userInfo[UIKeyboardFrameEndUserInfoKey] CGRectValue];//变化前的frame
+        [UIView animateWithDuration:0.25 animations:^{
+            self.top = SCREEN_HEIGHT - newFrameKeyboard.size.height - self.height;
+        }];
+        self.isEditing = YES;
+        NSLog(@"showtop:%f",self.top);
+    }
 }
 - (void)keyboardWillHidden:(NSNotification *)notify {
-    [UIView animateWithDuration:0.1 animations:^{
-        self.top = SCREEN_HEIGHT - 300;
-    }];
-    NSLog(@"hiddentop:%f",self.top);
-    self.isEditing = NO;
+    if ([notify.object isKindOfClass:[PrivateView class]]) {
+        [UIView animateWithDuration:0.1 animations:^{
+            self.top = SCREEN_HEIGHT - 300;
+        }];
+        NSLog(@"hiddentop:%f",self.top);
+        self.isEditing = NO;
+    }
 }
 #pragma mark - UITextFieldDelegate
@@ -91,7 +95,7 @@ static NSString *message_content = @&quot;message_content&quot;;
         NSDictionary *dic = @{message_content:textField.text};
         weakself
         NSString *message = [Tools dictionaryToJson:dic];
-        [[CNLiveChatManager sharedCNLiveChatManager] sendMessage:message type:CNLive_ConversationType_PRIVATE targetId:@"1234" success:^(CNLiveChatMessage *message) {
+        [[CNLiveChatManager sharedCNLiveChatManager] sendMessage:message type:CNLive_ConversationType_PRIVATE targetId:@"20170327" success:^(CNLiveChatMessage *message) {
             dispatch_async(dispatch_get_main_queue(), ^{
                 strongself
@@ -103,7 +107,7 @@ static NSString *message_content = @&quot;message_content&quot;;
                 model.name = message.userInfo.name;
                 model.isMine = YES;
                 model.content = content;
-//                model.ID = message.targetId;
+                model.ID = message.targetId;
                 model.icon = message.userInfo.portraitUri;
                 model.priCellWidth = self.tableView.width * 0.5 - 30;
                 //        model.sendTime;//发送时间
@@ -205,6 +209,9 @@ static NSString *message_content = @&quot;message_content&quot;;
         _tableView.dataSource = self;
         _tableView.showsVerticalScrollIndicator = NO;
         _tableView.showsHorizontalScrollIndicator = NO;
+        _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
+        _tableView.bounces = NO;
+        _tableView.backgroundColor = [UIColor clearColor];
     }
     return _tableView;
 }
@@ -8,7 +8,10 @@
 #import <UIKit/UIKit.h>
+@class userInfoModel;
 @interface TopToolView : UIView
-- (instancetype)initWithFrame:(CGRect)frame isHost:(BOOL)isHost;
+- (instancetype _Nonnull)initWithFrame:(CGRect)frame isHost:(BOOL)isHost;
+
+@property (nonatomic ,strong) userInfoModel * _Nullable             model;
 @end
@@ -7,26 +7,96 @@
 //
 #import "TopToolView.h"
+#import "userInfoModel.h"
+
+@interface TopToolView ()
+
+@property (nonatomic ,strong) UIImageView * _Nullable             icon;
+@property (nonatomic ,strong) UIImageView * _Nullable             bgView;
+@property (nonatomic ,strong) UILabel * _Nullable             stateLbl;
+//@property (nonatomic ,strong) UILabel * _Nullable             numberLbl;
+
+@end
 @implementation TopToolView
 - (instancetype)initWithFrame:(CGRect)frame isHost:(BOOL)isHost
 {
     if (self = [super initWithFrame:frame]) {
-        
+       
+        [self addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapClick:)]];
+        [self addSubview:self.bgView];
+        [self addSubview:self.stateLbl];
         if (isHost) {
             //主播端没有自己头像
-            
         }else
         {//观众端有主播头像
-            
-            
+            [self addSubview:self.icon];
         }
     }
     return self;
 }
+- (void)setModel:(userInfoModel *)model
+{
+    _model = model;
+     [_icon zx_setHeader:model.icon];
+}
+
+- (void)tapClick:(UITapGestureRecognizer *)gesture
+{
+    userInfoModel *userModel = [[userInfoModel alloc ]init];
+    userModel.name = @"职业主播";
+    userModel.icon = @"http://b.hiphotos.baidu.com/zhidao/wh%3D450%2C600/sign=f0c5c08030d3d539c16807c70fb7c566/8ad4b31c8701a18bbef9f231982f07082838feba.jpg";
+    userModel.sign = @"哈哈啊哈哈啊哈哈,这是我的签名~";
+    userModel.uId =  @"123124";
+    
+    [Tools showBouncedWithModel:userModel callBackBlock:^(UIView * _Nullable bounceView) {
+        
+    }];
+}
+
+- (UIImageView *)icon
+{
+    if (!_icon)
+    {
+        _icon = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 30, 30)];
+        _icon.backgroundColor = ZXRandomColor;
+        _icon.layer.masksToBounds = YES;
+        _icon.layer.cornerRadius = _icon.height * 0.5;
+        [_icon zx_setHeader:@"http://b.hiphotos.baidu.com/zhidao/wh%3D450%2C600/sign=f0c5c08030d3d539c16807c70fb7c566/8ad4b31c8701a18bbef9f231982f07082838feba.jpg"];
+    }
+    return _icon;
+}
+
+- (UIImageView *)bgView
+{
+    if (!_bgView)
+    {
+        _bgView = [[UIImageView alloc] initWithFrame:self.bounds];
+        _bgView.backgroundColor = ZXRandomColor;
+        _bgView.layer.masksToBounds = YES;
+        _bgView.layer.cornerRadius = _bgView.height * 0.5;
+
+    }
+    return _bgView;
+}
+
+- (UILabel *)stateLbl
+{
+    if (!_stateLbl)
+    {
+        _stateLbl = [[UILabel alloc] initWithFrame:CGRectMake(self.icon.right + 5, 0, 60, 20)];
+        _stateLbl.textAlignment = NSTextAlignmentCenter;
+        _stateLbl.textColor = [UIColor whiteColor];
+        _stateLbl.text = @"直播";//直播 精彩回放
+        _stateLbl.height = [_stateLbl labelSize].height;
+        _stateLbl.font = [UIFont systemFontOfSize:kDetailContentFont];
+    }
+    return _stateLbl;
+}
+
 /*
 // Only override drawRect: if you perform custom drawing.
 // An empty implementation adversely affects performance during animation.
@@ -10,45 +10,32 @@
 #import <CNLivePlayerSDK/CNLiveGPUStreamerKit.h>
 #import <CNLivePlayerSDK/CNLiveWebcastManager.h>
 #import "FilterFunctionView.h"
+#import "LVCUGCLivePrepareView.h"
 #define KAppId @"60_irn9edco29"
 #define KAppKey @"69fe70bda67e059286ad509d9f5377f815955645b52f94"
-@interface LVCLiveViewController ()<UIGestureRecognizerDelegate> {
-    // 开始直播
-    UIButton *_startLiveBtn;
-    // 缩放因子
-    CGFloat _currentPinchZoomFactor;
-}
+@interface LVCLiveViewController ()<UIGestureRecognizerDelegate>
-@property (nonatomic,strong) UIView *captureView;
+@property (nonatomic, strong) LVCUGCLivePrepareView *prepareView;
-@property (nonatomic,strong) CNLiveGPUStreamerKit *kitCN;
+@property (nonatomic, strong) UIView *captureView;
-@property (nonatomic,strong) FilterFunctionView *filterView;
+@property (nonatomic, strong) CNLiveGPUStreamerKit *kitCN;
-@end
+@property (nonatomic, strong) FilterFunctionView *filterView;
-@implementation LVCLiveViewController
+@property (nonatomic, strong) UIButton *quitButton;
-- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
-    
-    if (_kitCN) {
-        return UIInterfaceOrientationMaskAllButUpsideDown;
-    } else {
-        return UIInterfaceOrientationMaskPortrait;
-    }
-}
+@property (nonatomic, strong) UIButton *openFilterButton;
--(void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation {
-    
-    UIInterfaceOrientation orie = [[UIApplication sharedApplication] statusBarOrientation];
-    [_kitCN rotatePreviewTo:orie];
-    
-    if (_kitCN.streamerBase.isStreaming) {
-        [_kitCN rotateStreamTo:orie];
-    }
-}
+@property (nonatomic, strong) UIButton *changeCameraButton;
+
+@property (nonatomic, strong) UIButton *openFlashButton;
+
+@end
+
+@implementation LVCLiveViewController
 - (void)viewDidLoad {
     [super viewDidLoad];
@@ -56,17 +43,18 @@
     self.view.backgroundColor = [UIColor blueColor];
     [self.view addSubview:self.captureView];
+    [self.view addSubview:self.prepareView];
+    [self.view addSubview:self.quitButton];
+    [self.view addSubview:self.changeCameraButton];
+    [self.view addSubview:self.openFilterButton];
+    [self.view addSubview:self.openFlashButton];
+    [self.view addSubview:self.filterView];
-    UIButton *closeBtn = [[UIButton alloc] initWithFrame:CGRectMake(SCREEN_WIDTH - 50, 30, 50, 30)];
-    [closeBtn setTitle:@"关闭" forState:UIControlStateNormal];
-    [closeBtn addTarget:self action:@selector(closeBtnClivk) forControlEvents:UIControlEventTouchUpInside];
-    [self.view addSubview:closeBtn];
-    
-    // 活动Id
+    // 初始化推流
     NSString *activityId = [NSString stringWithFormat:@"%d%d%d%d%d",arc4random()%9,arc4random()%9,arc4random()%9,arc4random()%9,arc4random()%9];
-    // 初始化直播云
+
     [[CNLiveWebcastManager manager] initWithAppId:KAppId appKey:KAppKey];
-    // 初始化推流
+
     _kitCN = [[CNLiveGPUStreamerKit alloc] initWithDefaultConfigWithActivityId:activityId channelId:@"iOStest" isHorizontalScreen:@"0"];
     //        _kitCN.activityName = @"iOS test";
@@ -74,25 +62,12 @@
     // 设置推流配置
     [self setStreamerCfg];
-    // 添加监听
-    [self addObservers];
-    
-    _startLiveBtn = [self addButton:@"开始直播" frame:CGRectMake(100, 40, 80, 40) action:@selector(startCapture:)];
-    [_startLiveBtn setTitle:@"开始直播" forState:UIControlStateNormal];
-    [_startLiveBtn setTitle:@"停止直播" forState:UIControlStateSelected];
-    [self addButton:@"关闭预览" frame:CGRectMake(10, 40, 80, 40) action:@selector(startPreview:)];
-//    [self addButton:@"退出" frame:CGRectMake(190, 40, 80, 40) action:@selector(quit)];
-    [self addButton:@"美颜" frame:CGRectMake(10, 100, 80, 40) action:@selector(openFilter:)];
-    [self addButton:@"摄像头" frame:CGRectMake(100, 100, 80, 40) action:@selector(changeCamera:)];
-    [self addButton:@"闪光灯" frame:CGRectMake(190, 100, 80, 40) action:@selector(openFlash)];
+    [self addObservers];
     UITapGestureRecognizer * singleRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(onTap:)];
     singleRecognizer.delegate = self;
     [self.captureView addGestureRecognizer:singleRecognizer];
-    
-    UIPinchGestureRecognizer *pinch = [[UIPinchGestureRecognizer alloc]initWithTarget:self action:@selector(pinchDetected:)];
-    [self.view addGestureRecognizer:pinch];
 }
 #pragma mark - initialization Streamer
@@ -124,75 +99,24 @@
     // 启动预览
     [_kitCN startPreview:self.captureView];
-    //水印图片
-//    _kitCN.watermark.logoPic = [UIImage imageNamed:@"互动电视180x180"];
-//    _kitCN.watermark.logoRect = CGRectMake(0.8, 0.8, 50, 50);
-//    _kitCN.watermark.logoAlpha = 0.6;
-    
-    //水印文字
-//    _kitCN.watermark.textLabel = [[UILabel alloc] init];
-//    _kitCN.watermark.textLabel.text = [NSString stringWithFormat:@"cnlive"];
-//    _kitCN.watermark.textLabel.font = [UIFont systemFontOfSize:8];
-//    _kitCN.watermark.textRect = CGRectMake(0.78, 0.88, 0.2, 0.04);
-//    [_kitCN.watermark updateTextLabel];
-    
 }
-#pragma mark - GetMethod   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-// 拍摄视图
-- (UIView *)captureView {
-    
-    if (!_captureView) {
-        _captureView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, self.view.bounds.size.width, self.view.bounds.size.height)];
-        _captureView.backgroundColor = [UIColor blackColor];
-    }
-    return _captureView;
-}
-
-
 #pragma mark - UIButton Action  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-// 开始推流
-- (void)startCapture:(UIButton *)button {
+- (void)startCapture:(UIButton *)button {   // 开始推流
-    button.selected = !button.selected;
+    [_prepareView removeFromSuperview];
-    if (button.selected) {
-        [_kitCN startStream:^{
-            NSLog(@"开启推流成功 ------- success");
-        } failure:^(NSDictionary *errorDic) {
-            NSString *str=[[NSMutableString alloc] initWithData:errorDic[@"errorMessage"] encoding:NSUTF8StringEncoding];
-            NSLog(@"%@",str);
-            [self toast:errorDic[@"errorMessage"]];
-            _startLiveBtn.selected = NO;
-        }];
-    }else{
-
-        [_kitCN stopStream];
-    }
+    [_kitCN startStream:^{
+        NSLog(@"开启推流成功 ------- success");
+    } failure:^(NSDictionary *errorDic) {
+        NSString *str=[[NSMutableString alloc] initWithData:errorDic[@"errorMessage"] encoding:NSUTF8StringEncoding];
+        NSLog(@"%@",str);
+        [self toast:errorDic[@"errorMessage"]];
+    }];
 }
-// 开始 / 关闭 预览
-- (void)startPreview:(UIButton *)button {
-    
-    button.selected = !button.selected;
-    if (button.selected) {
-        _startLiveBtn.enabled = NO;
-        [button setTitle:@"开启预览" forState:UIControlStateNormal];
-        if (_kitCN.streamState == CNLiveStreamStateConnected) {
-            [_kitCN stopStream];
-            _startLiveBtn.selected = NO;
-        }
-        [_kitCN stopPreview];
-    }else{
-        [_kitCN startPreview:self.captureView];
-        [button setTitle:@"关闭预览" forState:UIControlStateNormal];
-        _startLiveBtn.enabled = YES;
-    }
-}
-// 美颜滤镜
-- (void)openFilter:(UIButton *)button {
+- (void)openFilter:(UIButton *)button {  // 美颜滤镜
     button.selected = !button.selected;
@@ -220,14 +144,14 @@
     } else {
         _filterView.hidden = YES;
-        
     }
 }
-// 转换前后置摄像头
-- (void)changeCamera:(UIButton *)button {
+
+- (void)changeCamera:(UIButton *)button {   // 转换前后置摄像头
-//        button.selected = !button.selected;
+    button.selected = !button.selected;
+    _openFlashButton.hidden = !_openFlashButton.hidden;
 //        if (button.selected) {
 //            _kitCN.cameraPosition = AVCaptureDevicePositionBack;
 //        }else{
@@ -237,15 +161,16 @@
 }
-// 闪光灯
-- (void)openFlash {
+
+- (void)openFlash:(UIButton *)button {   // 闪光灯
+    button.selected = !button.selected;
     [_kitCN toggleTorch];
     //    [_kitCN setTorchMode:AVCaptureTorchModeOn];
 }
-// 退出
-- (void)closeBtnClivk {
+
+- (void)quitBtnClick {    // 退出
     if (_kitCN.streamState == CNLiveStreamStateConnected) {
         [_kitCN stopStream];
@@ -259,38 +184,32 @@
 #pragma mark - UIGestureRecognizer Action !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-//对焦与曝光
-- (void)onTap:(UIGestureRecognizer *)sender {
+
+- (void)onTap:(UIGestureRecognizer *)sender {  //对焦与曝光
     CGPoint current = [sender locationInView:self.view];
     CGPoint point = [self convertToPointOfInterestFromViewCoordinates:current];
     [_kitCN exposureAtPoint:point];
     [_kitCN focusAtPoint:point];
-}
-
-//缩放
-- (void)pinchDetected:(UIPinchGestureRecognizer *)recognizer {
-    if (recognizer.state == UIGestureRecognizerStateBegan) {
-        _currentPinchZoomFactor = _kitCN.pinchZoomFactor;
+    if ([_prepareView.titleTextField isFirstResponder]) {
+        [_prepareView.titleTextField resignFirstResponder];
     }
-    CGFloat zoomFactor = _currentPinchZoomFactor * recognizer.scale;//当前触摸缩放因子*坐标比例
-    [_kitCN setPinchZoomFactor:zoomFactor];
 }
 #pragma mark - notification  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-// 进入后台
-- (void)enterBg {
+
+- (void)enterBg {   // 进入后台
     [_kitCN appEnterBackground];
 }
-// 回到前台
-- (void)becameActive {
+
+- (void)becameActive {   // 回到前台
     [_kitCN appBecomeActive];
 }
-// 采集状态改变
-- (void)captureStateChange {
+
+- (void)captureStateChange {   // 采集状态改变
     if ( _kitCN.captureState == CNLiveCaptureStateIdle){
         //初始化时状态为空闲
@@ -325,8 +244,8 @@
     }
 }
-// 推流状态改变
-- (void)streamStateChange {
+
+- (void)streamStateChange {   // 推流状态改变
     if (_kitCN.streamState == CNLiveStreamStateIdle) {
@@ -362,8 +281,8 @@
         NSLog(@"---------CNLiveStopStreamSuccess");
     }
 }
-// 推流失败
-- (void)onStreamError {
+
+- (void)onStreamError {   // 推流失败
     CNLiveStreamErrorCode err = _kitCN.streamErrorCode;
@@ -384,7 +303,6 @@
     else if ( CNLiveStreamErrorCode_ABNORMAL == err) {
         [self toast:@"推流异常中断~~"];
-        _startLiveBtn.selected = NO;
     } else if (err == CNLiveStreamErrorCode_CODEC_OPEN_FAILED) {
         NSLog(@"video codec open failed, try software codec");
@@ -403,8 +321,8 @@
 }
-// 重试
-- (void) tryReconnect {
+
+- (void) tryReconnect {   // 重试
     dispatch_time_t delay = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC));
     dispatch_after(delay, dispatch_get_main_queue(), ^{
@@ -415,18 +333,16 @@
         [_kitCN startStream:^{
             NSLog(@"开启推流成功 ------- success");
-            _startLiveBtn.selected = YES;
         } failure:^(NSDictionary *errorDic) {
             [self toast:errorDic[@"errorMessage"]];
-            _startLiveBtn.selected = NO;
         }];
     });
 }
-// 提示框
-- (void)toast:(NSString*)message {
+
+- (void)toast:(NSString*)message { // 提示框
     UIAlertView *toast = [[UIAlertView alloc] initWithTitle:nil
                                                     message:message
@@ -441,8 +357,8 @@
 }
-// 将UI的坐标转换成相机坐标
-- (CGPoint)convertToPointOfInterestFromViewCoordinates:(CGPoint)viewCoordinates {
+
+- (CGPoint)convertToPointOfInterestFromViewCoordinates:(CGPoint)viewCoordinates {// 将UI的坐标转换成相机坐标
     CGPoint pointOfInterest = CGPointMake(.5f, .5f);
     CGSize frameSize = self.view.frame.size;
@@ -476,8 +392,76 @@
     return pointOfInterest;
 }
-#pragma mark - Action !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+#pragma mark - GetMethod   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+- (LVCUGCLivePrepareView *)prepareView {
+    
+    if (!_prepareView) {
+        _prepareView = [[LVCUGCLivePrepareView alloc] initWithFrame:self.view.bounds];
+        [_prepareView.startButton addTarget:self action:@selector(startCapture:) forControlEvents:UIControlEventTouchUpInside];
+        UITapGestureRecognizer * tapRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(onTap:)];
+        tapRecognizer.delegate = self;
+        [_prepareView addGestureRecognizer:tapRecognizer];
+    }
+    return _prepareView;
+}
+- (FilterFunctionView *)filterView
+{
+    if (!_filterView) {
+        _filterView = [[FilterFunctionView alloc] initWithFrame:CGRectMake(0, 75, SCREEN_WIDTH, 200)];
+        _filterView.hidden = YES;
+    }
+    return _filterView;
+}
+
+- (UIView *)captureView {  // 拍摄视图
+    
+    if (!_captureView) {
+        _captureView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, self.view.bounds.size.width, self.view.bounds.size.height)];
+        _captureView.backgroundColor = [UIColor blackColor];
+    }
+    return _captureView;
+}
+
+- (UIButton *)quitButton {
+    
+    if (!_quitButton) {
+        _quitButton = [self createButtonWithFrame:CGRectMake(SCREEN_WIDTH - 50, 30, 35, 35) image:@"LiveCloseNormal" selected:@"LiveCloseTouch"];
+        [_quitButton addTarget:self action:@selector(quitBtnClick) forControlEvents:UIControlEventTouchUpInside];
+    }
+    return _quitButton;
+}
+
+- (UIButton *)changeCameraButton {
+    
+    if (!_changeCameraButton) {
+        _changeCameraButton = [self createButtonWithFrame:CGRectMake(SCREEN_WIDTH - 100, 30, 35, 35) image:@"camera" selected:@"Select the camera"];
+        [_changeCameraButton addTarget:self action:@selector(changeCamera:) forControlEvents:UIControlEventTouchUpInside];
+    }
+    return _changeCameraButton;
+}
+
+- (UIButton *)openFlashButton {
+    
+    if (!_openFlashButton) {
+        _openFlashButton = [self createButtonWithFrame:CGRectMake(SCREEN_WIDTH - 100, 75, 35, 35) image:@"open flash" selected:@"Flash off"];
+        _openFlashButton.hidden = YES;
+        [_openFlashButton addTarget:self action:@selector(openFlash:) forControlEvents:UIControlEventTouchUpInside];
+    }
+    return _openFlashButton;
+}
+
+- (UIButton *)openFilterButton {
+    
+    if (!_openFilterButton) {
+        _openFilterButton = [self createButtonWithFrame:CGRectMake(SCREEN_WIDTH - 150, 30, 35, 35) image:@"Is closed" selected:@"Is open"];
+        [_openFilterButton addTarget:self action:@selector(openFilter:) forControlEvents:UIControlEventTouchUpInside];
+    }
+    return _openFilterButton;
+}
+
+#pragma mark - Action !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 - (void)addObservers {
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(captureStateChange) name:CNLiveCaptureStateDidChangeNotification object:nil];
@@ -517,6 +501,15 @@
 }
+- (UIButton *)createButtonWithFrame:(CGRect)frame image:(NSString *)image selected:(NSString *)selected {
+    
+    UIButton *btn = [UIButton buttonWithType:UIButtonTypeCustom];
+    [btn setFrame:frame];
+    [btn setImage:[UIImage imageNamed:image] forState:UIControlStateNormal];
+    [btn setImage:[UIImage imageNamed:selected] forState:UIControlStateSelected];
+    return btn;
+}
+
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.
@@ -28,9 +28,9 @@
 {
     self = [super initWithFrame:frame];
     if (self) {
-        [self addSubview:self.slider1];
-        [self addSubview:self.slider2];
-        [self addSubview:self.slider3];
+//        [self addSubview:self.slider1];
+//        [self addSubview:self.slider2];
+//        [self addSubview:self.slider3];
         [self addSubview:self.effectPicker];
         [self addSubview:self.filterGroupType];
@@ -135,7 +135,7 @@
 - (UIPickerView *)effectPicker
 {
     if (!_effectPicker) {
-        _effectPicker = [[UIPickerView alloc] initWithFrame:CGRectMake(8, 130, self.bounds.size.width-16, 100)];
+        _effectPicker = [[UIPickerView alloc] initWithFrame:CGRectMake(8, 20, self.bounds.size.width-16, 100)];
         _effectPicker.showsSelectionIndicator=YES;
         _effectPicker.tintColor = [UIColor whiteColor];
         _effectPicker.dataSource = self;
+//
+//  LVCUGCLivePrepareView.h
+//  LiveVideoCloud
+//
+//  Created by cnliveJunBo on 17/3/27.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface LVCUGCLivePrepareView : UIView
+
+@property (nonatomic, strong) UIButton *startButton;
+
+@property (nonatomic, strong) UITextField *titleTextField;
+
+@end
+//
+//  LVCUGCLivePrepareView.m
+//  LiveVideoCloud
+//
+//  Created by cnliveJunBo on 17/3/27.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "LVCUGCLivePrepareView.h"
+
+@interface LVCUGCLivePrepareView()
+
+@property (nonatomic, strong) UIImageView *iconView;
+
+@property (nonatomic, strong) UIView *lineView;
+
+@end
+
+@implementation LVCUGCLivePrepareView
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        self.backgroundColor = [UIColor clearColor];
+        [self addSubview:self.iconView];
+        [self addSubview:self.titleTextField];
+        [self addSubview:self.lineView];
+        [self addSubview:self.startButton];
+    }
+    return self;
+}
+
+#pragma mark - GetMethod !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+- (UIImageView *)iconView {
+    
+    if (!_iconView) {
+        NSString *path = [[NSBundle mainBundle] pathForResource:@"头像" ofType:@"jpg"];
+        UIImage *image = [UIImage imageWithContentsOfFile:path];
+        _iconView = [[UIImageView alloc] initWithImage:image];
+        _iconView.frame = CGRectMake(10, SCREEN_HEIGHT * 0.35, 90, 90);
+        _iconView.layer.cornerRadius = 45;
+        _iconView.layer.masksToBounds = YES;
+    }
+    return _iconView;
+}
+
+- (UITextField *)titleTextField {
+    
+    if (!_titleTextField) {
+        _titleTextField = [[UITextField alloc] initWithFrame:CGRectMake(110, SCREEN_HEIGHT * 0.35 + 50, SCREEN_WIDTH - 120, 30)];
+        
+        NSMutableAttributedString *placeholder = [[NSMutableAttributedString alloc]initWithString:@"起个名字开始直播~"];
+        
+        
+        _titleTextField.attributedPlaceholder = placeholder;
+        
+        _titleTextField.font = [UIFont systemFontOfSize:19];
+    }
+    return _titleTextField;
+}
+
+- (UIView *)lineView {
+    
+    if (!_lineView) {
+        _lineView = [[UIView alloc] initWithFrame:CGRectMake(110, SCREEN_HEIGHT * 0.35 + 82, SCREEN_WIDTH - 120, 2)];
+        _lineView.backgroundColor = [UIColor blackColor];
+    }
+    return _lineView;
+}
+
+- (UIButton *)startButton {
+    
+    if (!_startButton) {
+        _startButton = [UIButton buttonWithType:UIButtonTypeCustom];
+        _startButton.frame = CGRectMake(30, SCREEN_HEIGHT * 0.62, SCREEN_WIDTH - 60, 38);
+        _startButton.backgroundColor = [UIColor redColor];
+        [_startButton setTitle:@"开始直播" forState:UIControlStateNormal];
+        _startButton.titleLabel.font = [UIFont systemFontOfSize:20];
+        [_startButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+        [_startButton setTitleColor:[UIColor blackColor] forState:UIControlStateHighlighted];
+        _startButton.layer.cornerRadius = 19;
+        _startButton.layer.masksToBounds = YES;
+    }
+    return _startButton;
+}
+
+
+@end
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "Flash off.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "Is closed.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "Is open.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "Select the camera.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "camera.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "open flash.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file