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

Conflicts: LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/Controller/HomeViewController.m

Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud
Conflicts: LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/Controller/HomeViewController.m
朱林
2 parents c5309b94 2d64d84c
Showing 43 changed files with 1465 additions and 566 deletions
LiveVideoCloud/LiveVideoCloud.xcodeproj/project.pbxproj
LiveVideoCloud/LiveVideoCloud/AppDelegate/AppDelegate.m
LiveVideoCloud/LiveVideoCloud/Classes/Helpers/Tools.h
LiveVideoCloud/LiveVideoCloud/Classes/Helpers/Tools.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/AnimationBaseView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/BounceView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Chat/BarrageManager/BarrageManager.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Chat/BarrageManager/BarrageManager.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Chat/ChatBarrageManager/ChatBarrageView.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Chat/ChatMsgModel/chatMsgModel.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Chat/ChatMsgModel/chatMsgModel.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftViews/GiftListView.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.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/PrivateView/PriChatCell.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/PrivateView/PrivateView.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/PrivateView/PrivateView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/TopToolView/TopToolView.h
@@ -145,7 +145,6 @@
 		D2029D091E6EAE2E0027CD92 /* Foundation+Log.m in Sources */ = {isa = PBXBuildFile; fileRef = D2029CF21E6EAE2E0027CD92 /* Foundation+Log.m */; };
 		D2029D0A1E6EAE2E0027CD92 /* ZXServerUrl.m in Sources */ = {isa = PBXBuildFile; fileRef = D2029CFE1E6EAE2E0027CD92 /* ZXServerUrl.m */; };
 		D2029D161E6EB00D0027CD92 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = D2029D151E6EB00D0027CD92 /* AppDelegate.m */; };
-		D207BE9E1E84BD68006A0CE8 /* BarrageManager.m in Sources */ = {isa = PBXBuildFile; fileRef = D207BE9D1E84BD68006A0CE8 /* BarrageManager.m */; };
 		D207BEA11E84C1EC006A0CE8 /* AnimationBaseView.m in Sources */ = {isa = PBXBuildFile; fileRef = D207BEA01E84C1EC006A0CE8 /* AnimationBaseView.m */; };
 		D217A24A1E7B76C7003B44CB /* PresentView.m in Sources */ = {isa = PBXBuildFile; fileRef = D217A2471E7B76C7003B44CB /* PresentView.m */; };
 		D217A24B1E7B76C7003B44CB /* PresentViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D217A2491E7B76C7003B44CB /* PresentViewCell.m */; };
@@ -192,14 +191,19 @@
 		D2888DB41E6EC154003A77C8 /* HomeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888DB31E6EC154003A77C8 /* HomeViewController.m */; };
 		D2888DB71E6EC1B8003A77C8 /* LVCMyViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888DB61E6EC1B8003A77C8 /* LVCMyViewController.m */; };
 		D29D88481E88C53300543A03 /* LVCUGCLivePrepareView.m in Sources */ = {isa = PBXBuildFile; fileRef = D29D88471E88C53300543A03 /* LVCUGCLivePrepareView.m */; };
+		D29E81ED1E88DC5B008C9906 /* PriChatCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D29E81EC1E88DC5B008C9906 /* PriChatCell.m */; };
+		D2A089E81E89FA720071412C /* LVCUGCLivePlayerCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D2A089E71E89FA720071412C /* LVCUGCLivePlayerCell.m */; };
+		D2A089EB1E8A09CB0071412C /* LVCUGCLivePlayerModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D2A089EA1E8A09CB0071412C /* LVCUGCLivePlayerModel.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, ); }; };
+		D2B2ED801E88FC5200F7538A /* LVCUGCLiveEndView.m in Sources */ = {isa = PBXBuildFile; fileRef = D2B2ED7F1E88FC5200F7538A /* LVCUGCLiveEndView.m */; };
 		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 */; };
+		D2CC7B871E891AA50034B8BF /* LVCUGCLiveListController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2CC7B861E891AA50034B8BF /* LVCUGCLiveListController.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 */
@@ -531,8 +535,6 @@
 		D2029CFF1E6EAE2E0027CD92 /* UtilKits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UtilKits.h; sourceTree = "<group>"; };
 		D2029D121E6EAF8D0027CD92 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		D2029D151E6EB00D0027CD92 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
-		D207BE9C1E84BD68006A0CE8 /* BarrageManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BarrageManager.h; sourceTree = "<group>"; };
-		D207BE9D1E84BD68006A0CE8 /* BarrageManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BarrageManager.m; sourceTree = "<group>"; };
 		D207BE9F1E84C1EC006A0CE8 /* AnimationBaseView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AnimationBaseView.h; sourceTree = "<group>"; };
 		D207BEA01E84C1EC006A0CE8 /* AnimationBaseView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AnimationBaseView.m; sourceTree = "<group>"; };
 		D217A2451E7B76C7003B44CB /* PresentModelAble.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PresentModelAble.h; sourceTree = "<group>"; };
@@ -621,14 +623,24 @@
 		D2888DB61E6EC1B8003A77C8 /* LVCMyViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCMyViewController.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>"; };
+		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>"; };
+		D2A089E61E89FA720071412C /* LVCUGCLivePlayerCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLivePlayerCell.h; sourceTree = "<group>"; };
+		D2A089E71E89FA720071412C /* LVCUGCLivePlayerCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLivePlayerCell.m; sourceTree = "<group>"; };
+		D2A089E91E8A09CB0071412C /* LVCUGCLivePlayerModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLivePlayerModel.h; sourceTree = "<group>"; };
+		D2A089EA1E8A09CB0071412C /* LVCUGCLivePlayerModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLivePlayerModel.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>"; };
+		D2B2ED7E1E88FC5200F7538A /* LVCUGCLiveEndView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLiveEndView.h; sourceTree = "<group>"; };
+		D2B2ED7F1E88FC5200F7538A /* LVCUGCLiveEndView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLiveEndView.m; sourceTree = "<group>"; };
 		D2B7B24F1E8247D400ED084E /* ChatBarrageManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChatBarrageManager.h; sourceTree = "<group>"; };
 		D2B7B2501E8247D400ED084E /* ChatBarrageManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChatBarrageManager.m; sourceTree = "<group>"; };
 		D2B7B2521E824B2D00ED084E /* ChatBarrageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChatBarrageView.h; sourceTree = "<group>"; };
 		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>"; };
+		D2CC7B851E891AA50034B8BF /* LVCUGCLiveListController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLiveListController.h; sourceTree = "<group>"; };
+		D2CC7B861E891AA50034B8BF /* LVCUGCLiveListController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLiveListController.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 */
@@ -752,6 +764,8 @@
 				81A4831F1E88F4BF0097A80A /* LVCProgramModel.m */,
 				81A482FF1E88B0130097A80A /* LVCChatRoomModel.h */,
 				81A483001E88B0130097A80A /* LVCChatRoomModel.m */,
+				D2A089E91E8A09CB0071412C /* LVCUGCLivePlayerModel.h */,
+				D2A089EA1E8A09CB0071412C /* LVCUGCLivePlayerModel.m */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -1348,15 +1362,6 @@
 			path = AppDelegate;
 			sourceTree = "<group>";
 		};
-		D207BE9B1E84BD3E006A0CE8 /* BarrageManager */ = {
-			isa = PBXGroup;
-			children = (
-				D207BE9C1E84BD68006A0CE8 /* BarrageManager.h */,
-				D207BE9D1E84BD68006A0CE8 /* BarrageManager.m */,
-			);
-			path = BarrageManager;
-			sourceTree = "<group>";
-		};
 		D217A2441E7B76C7003B44CB /* Present */ = {
 			isa = PBXGroup;
 			children = (
@@ -1383,7 +1388,6 @@
 		D22830F61E77C26C00627701 /* Chat */ = {
 			isa = PBXGroup;
 			children = (
-				D207BE9B1E84BD3E006A0CE8 /* BarrageManager */,
 				D2B7B24E1E8247B500ED084E /* ChatBarrageManager */,
 				D236968F1E7FC83800E4BF71 /* ChatMsgModel */,
 				D22830F71E77C27A00627701 /* ChatViews */,
@@ -1450,6 +1454,8 @@
 			children = (
 				D24571611E83C40B00AA85D6 /* PrivateView.h */,
 				D24571621E83C40B00AA85D6 /* PrivateView.m */,
+				D29E81EB1E88DC5B008C9906 /* PriChatCell.h */,
+				D29E81EC1E88DC5B008C9906 /* PriChatCell.m */,
 			);
 			path = PrivateView;
 			sourceTree = "<group>";
@@ -1544,6 +1550,8 @@
 				D25BF8791E7B8A82007FB138 /* SliderView.m */,
 				D29D88461E88C53300543A03 /* LVCUGCLivePrepareView.h */,
 				D29D88471E88C53300543A03 /* LVCUGCLivePrepareView.m */,
+				D2B2ED7E1E88FC5200F7538A /* LVCUGCLiveEndView.h */,
+				D2B2ED7F1E88FC5200F7538A /* LVCUGCLiveEndView.m */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -1644,6 +1652,8 @@
 				810B64E21E779AFE00133E15 /* LVCLivePlayerController.m */,
 				810B65081E77B39D00133E15 /* LVCFullScreenPlayerController.h */,
 				810B65091E77B39D00133E15 /* LVCFullScreenPlayerController.m */,
+				D2CC7B851E891AA50034B8BF /* LVCUGCLiveListController.h */,
+				D2CC7B861E891AA50034B8BF /* LVCUGCLiveListController.m */,
 				D25BF87E1E7BD266007FB138 /* LVCUGCLivePlayerController.h */,
 				D25BF87F1E7BD266007FB138 /* LVCUGCLivePlayerController.m */,
 				81A483151E88BED00097A80A /* LVCTVLiveViewController.h */,
@@ -1673,6 +1683,8 @@
 				81A483041E88B32C0097A80A /* LVCHeaderRollCollectionViewCell.m */,
 				8112D42F1E7927A5002E00F6 /* LVCPlayerLoadingView.h */,
 				8112D4301E7927A5002E00F6 /* LVCPlayerLoadingView.m */,
+				D2A089E61E89FA720071412C /* LVCUGCLivePlayerCell.h */,
+				D2A089E71E89FA720071412C /* LVCUGCLivePlayerCell.m */,
 				D25BF8811E7F775F007FB138 /* LVCUGCPlayerLoadingView.h */,
 				D25BF8821E7F775F007FB138 /* LVCUGCPlayerLoadingView.m */,
 				D25BF8911E7FBAEA007FB138 /* LVCUGCBackgroundView.h */,
@@ -1904,6 +1916,7 @@
 				D2029C941E6EADE10027CD92 /* UIRefreshControl+AFNetworking.m in Sources */,
 				D2029C911E6EADE10027CD92 /* UIButton+AFNetworking.m in Sources */,
 				D2029C931E6EADE10027CD92 /* UIProgressView+AFNetworking.m in Sources */,
+				D2A089E81E89FA720071412C /* LVCUGCLivePlayerCell.m in Sources */,
 				D2029C8D1E6EADE10027CD92 /* AFAutoPurgingImageCache.m in Sources */,
 				81A483111E88B8630097A80A /* LVCChannelDetailsModel.m in Sources */,
 				D2029D011E6EAE2E0027CD92 /* UIColor+HexString.m in Sources */,
@@ -1916,6 +1929,7 @@
 				810B65061E779B1F00133E15 /* View+MASAdditions.m in Sources */,
 				D2029D161E6EB00D0027CD92 /* AppDelegate.m in Sources */,
 				D2029CB71E6EADE10027CD92 /* NSData+ImageContentType.m in Sources */,
+				D29E81ED1E88DC5B008C9906 /* PriChatCell.m in Sources */,
 				D2029CD01E6EADE10027CD92 /* SearchPresenter.m in Sources */,
 				D2888DB71E6EC1B8003A77C8 /* LVCMyViewController.m in Sources */,
 				D2029CBE1E6EADE10027CD92 /* SDWebImagePrefetcher.m in Sources */,
@@ -1947,12 +1961,14 @@
 				D2029CC41E6EADE10027CD92 /* UIImageView+WebCache.m in Sources */,
 				D236967E1E7F9E4100E4BF71 /* GiftPayButton.m in Sources */,
 				81A483081E88B6140097A80A /* UIView+ViewController.m in Sources */,
+				D2A089EB1E8A09CB0071412C /* LVCUGCLivePlayerModel.m in Sources */,
 				D2029CC81E6EADE10027CD92 /* SVProgressAnimatedView.m in Sources */,
 				D2029C961E6EADE10027CD92 /* MBProgressHUD.m in Sources */,
 				810B65071E779B1F00133E15 /* ViewController+MASAdditions.m in Sources */,
 				D2029C9A1E6EADE10027CD92 /* MJProperty.m in Sources */,
 				D2029CB91E6EADE10027CD92 /* SDWebImageCompat.m in Sources */,
 				D2029CB61E6EADE10027CD92 /* MKAnnotationView+WebCache.m in Sources */,
+				D2B2ED801E88FC5200F7538A /* LVCUGCLiveEndView.m in Sources */,
 				810B64FE1E779B1F00133E15 /* MASCompositeConstraint.m in Sources */,
 				D2029C981E6EADE10027CD92 /* MJExtensionConst.m in Sources */,
 				D2575C671E76A25400E3A8FC /* LVCInteractionController.m in Sources */,
@@ -2010,11 +2026,11 @@
 				D217A24A1E7B76C7003B44CB /* PresentView.m in Sources */,
 				D22830F11E778C0F00627701 /* LiveBaseView.m in Sources */,
 				D2029CBA1E6EADE10027CD92 /* SDWebImageDecoder.m in Sources */,
-				D207BE9E1E84BD68006A0CE8 /* BarrageManager.m in Sources */,
 				8112D4311E7927A5002E00F6 /* LVCPlayerLoadingView.m in Sources */,
 				D2029D081E6EAE2E0027CD92 /* ZXDeviceInfo.m in Sources */,
 				D24571631E83C40B00AA85D6 /* PrivateView.m in Sources */,
 				D2029CC21E6EADE10027CD92 /* UIImage+WebP.m in Sources */,
+				D2CC7B871E891AA50034B8BF /* LVCUGCLiveListController.m in Sources */,
 				D2029BCD1E6EADD70027CD92 /* BaseViewController.m in Sources */,
 				810B64E01E779AE900133E15 /* LVCPlayer.m in Sources */,
 				810B64FF1E779B1F00133E15 /* MASConstraint.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;
 }
@@ -27,6 +27,8 @@ typedef NS_ENUM(NSInteger, ShowMessageType) {//消息背景类型
 + (void)closeBouces;
++ (void)showNaviViewWithMessage:(NSString *_Nonnull)message;
+
 + (NSString *_Nullable)dictionaryToJson:(NSDictionary *_Nullable)dic;
 + (NSDictionary *_Nullable)dictionaryWithJsonString:(NSString *_Nullable)jsonString;
@@ -83,6 +83,32 @@
     }];
 }
++ (void)showNaviViewWithMessage:(NSString *_Nonnull)message
+{
+    UIImageView *bgView = [[UIImageView alloc] initWithFrame:CGRectMake(0, - 60, SCREEN_WIDTH, 60)];
+    bgView.backgroundColor = [UIColor cyanColor];
+    UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(10, 25, SCREEN_WIDTH - 20, 30)];
+    label.text = message;
+    label.textAlignment = NSTextAlignmentCenter;
+    label.textColor = [UIColor whiteColor];
+    [bgView addSubview:label];
+    [[UIApplication sharedApplication].keyWindow addSubview:bgView];
+    
+    [UIView animateWithDuration:0.5 animations:^{
+        bgView.top = 0;
+    } completion:^(BOOL finished) {
+        NSTimer *timer = [NSTimer timerWithTimeInterval:3 repeats:NO block:^(NSTimer * _Nonnull timer) {
+            [UIView animateWithDuration:0.5 animations:^{
+                bgView.top = - 60;
+            } completion:^(BOOL finished) {
+                [bgView removeFromSuperview];
+            }];
+        }];
+        [[NSRunLoop currentRunLoop] addTimer:timer forMode:NSRunLoopCommonModes];
+    }];
+}
+
+
 /**
  把字典转换成格式化的JSON格式的字符串
@@ -7,14 +7,14 @@
 //
 #import "AnimationBaseView.h"
-#import "ChatBarrageView.h"
+
 @implementation AnimationBaseView
 - (instancetype)initWithFrame:(CGRect)frame
 {
     if (self = [super initWithFrame:frame]) {
-        self.backgroundColor = [UIColor redColor];
+
         self.clipsToBounds = YES;
     }
     return self;
@@ -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
-//
-//  BarrageManager.h
-//  LiveVideoCloud
-//
-//  Created by 张旭 on 2017/3/24.
-//  Copyright © 2017年 cnlive. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-@class chatMsgModel;
-@class ChatBarrageView;
-#import "AnimationBaseView.h"
-@interface BarrageManager : NSObject <TouchPointDelegate>
-
-/**
- 初始化管理类
- @return 当前manager
- */
-+ (instancetype)sharedManager;
-
-- (ChatBarrageView *)addAnimationWithModel:(chatMsgModel *)model animContentView:(UIView *)animContentView;
-
-@end
-//
-//  BarrageManager.m
-//  LiveVideoCloud
-//
-//  Created by 张旭 on 2017/3/24.
-//  Copyright © 2017年 cnlive. All rights reserved.
-//
-
-#import "BarrageManager.h"
-#import "chatMsgModel.h"
-#import "ChatBarrageView.h"
-
-@interface BarrageManager ()<CAAnimationDelegate>
-
-@property (nonatomic ,strong) NSTimer *           _Nullable       timer;
-@property (nonatomic ,strong) ChatBarrageView *_Nullable          barrageView;
-@property (nonatomic ,strong) AnimationBaseView * _Nullable       animBaseView;
-@property (nonatomic ,assign) CGRect                              barrCurrentRect;
-
-@end
-@implementation BarrageManager
-
-/**
- 初始化管理类
- @return 当前manager
- */
-+ (instancetype)sharedManager{
-    
-    static BarrageManager *manager;
-    
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        manager = [[BarrageManager alloc] init];
-    });
-    return manager;
-}
-
-//- (AnimationBaseView *)animBaseView
-//{
-//    if (!_animBaseView)
-//    {
-//        _animBaseView = [[AnimationBaseView alloc] init];
-//    }
-//    return _animBaseView;
-//}
-
-/**
- 根据实际model添加动画
- 
- @param model modelobj
- */
-- (ChatBarrageView *)addAnimationWithModel:(chatMsgModel *)model animContentView:(UIView *)animContentView
-{
-    ChatBarrageView *barrageView = [ChatBarrageView barrageViewWithPoint:CGPointMake(SCREEN_WIDTH + 50, 100)];
-    barrageView.backgroundColor = [UIColor blackColor];
-    [animContentView addSubview:barrageView];
-    self.barrageView = barrageView;
-    self.animBaseView = (AnimationBaseView *)animContentView;
-
-    barrageView.model = model;
-    
-    [self animationWithDuration:8
-                        YValues:@[ @(SCREEN_WIDTH + 50), @(-(200))]
-                       keyTimes:@[@0.0, @1.0]
-                timingFunctions:@[
-                                  [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionLinear],
-                                  ]
-                        addView:barrageView];
-    [self createTimer];
-    self.animBaseView.isBarrage = YES;
-    
-//    [UIView animateWithDuration:10 animations:^{
-//        
-//        barrageView.left = - 200;
-//    } completion:^(BOOL finished) {
-//        [self stopTimer];
-//        [barrageView removeFromSuperview];
-//        NSLog(@"finished");
-//    }];
-    return barrageView;
-}
-
-// 实时监测 ，也可以用循环定时器
-- (void)createTimer{
-    if (!self.timer) {
-        self.timer = [NSTimer scheduledTimerWithTimeInterval:0.1 target:self selector:@selector(jianCe) userInfo:nil repeats:YES];
-    }
-}
-- (void) jianCe{
-    CGRect rect = [[self.barrageView.layer presentationLayer ]frame];  // view指动画中移动的view
-    self.barrCurrentRect = rect;
-//    NSLog(@"箭%@",NSStringFromCGRect(rect));
-}
-
-- (void)stopTimer
-{
-    if(self.timer)
-    {
-        [self.timer invalidate];
-        self.timer = nil;
-    }
-}
-
-#pragma mark - touchPointDelegate
-- (void)touchPoint:(CGPoint)touchPoint
-{
-    CGFloat dxLeft = touchPoint.x - self.barrCurrentRect.origin.x;// >0
-    CGFloat dxRight = touchPoint.x - self.barrCurrentRect.origin.x - self.barrCurrentRect.size.width;// < 0
-    CGFloat dyLeft = touchPoint.y - self.barrCurrentRect.origin.y;// >0
-    CGFloat dyRight = touchPoint.y - self.barrCurrentRect.origin.y - self.barrCurrentRect.size.height;// <0
-
-    if (dxLeft > 0 && dxRight < 0 && dyLeft > 0 && dyRight < 0) {
-        //在当前矩形区域内
-//        NSLog(@"在当前矩形区域内");
-        [self.barrageView barrageViewClickWithModel:self.barrageView.model];
-    }else
-    {
-//        NSLog(@"不在当前矩形区域内");
-    }
-}
-
-- (void)animationWithDuration:(float)duration YValues:(NSArray *)YValues keyTimes:(NSArray *)keyTimes timingFunctions:(NSArray *)timingFunctions addView:(UIView *)addView{
-    CAKeyframeAnimation *rocketAnim = [CAKeyframeAnimation animation];
-    rocketAnim.keyPath = @"position.x";
-    rocketAnim.values = YValues;
-    rocketAnim.keyTimes = keyTimes;
-    rocketAnim.timingFunctions = timingFunctions;
-    rocketAnim.duration = duration;
-    rocketAnim.fillMode = kCAFillModeForwards;
-    rocketAnim.removedOnCompletion = NO;
-    rocketAnim.delegate = self;
-    [addView.layer addAnimation:rocketAnim forKey:@"positionY"];
-}
-
-- (void)animationDidStop:(CAAnimation *)anim finished:(BOOL)flag{
-    NSLog(@"didStop");
-    [self stopTimer];
-    [self.barrageView removeFromSuperview];
-    self.animBaseView.isBarrage = NO;
-}
-@end
@@ -8,6 +8,7 @@
 #import "ChatBarrageAnimAction.h"
+
 @class AnimationBaseView;
 @class chatMsgModel;
 @interface ChatBarrageView : ChatBarrageAnimAction
@@ -21,4 +21,9 @@
 @property (nonatomic) BOOL isMine;//消息是否是自己发送
 @property (nonatomic ,copy) NSString * _Nullable            ID;//唯一标识
+/////
+@property (nonatomic ,assign) CGFloat                          priCellHeight;
+@property (nonatomic ,assign) CGFloat                          priCellWidth;
+
+
 @end
@@ -22,11 +22,29 @@
     //文字
     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;
      //   NSLog(@"cellHeight = %f",_cellHeight);
     return _cellHeight;
 }
+
+- (CGFloat)priCellHeight
+{
+    //如果计算过高度,直接返回
+    if (_priCellHeight) return _priCellHeight;
+    
+    _priCellHeight = 10;
+    NSString *content = self.content;
+    //文字
+    CGFloat textMaxW = self.priCellWidth;
+    CGSize textMaxSize = CGSizeMake(textMaxW, MAXFLOAT);
+    CGSize textSize = [content boundingRectWithSize:textMaxSize options:NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:kContentFont]} context:nil].size;
+    
+    //底部空隙
+    _priCellHeight += textSize.height + 10;
+//       NSLog(@"pricellHeight = %f",_priCellHeight);
+    return _priCellHeight;
+}
 @end
@@ -111,6 +111,7 @@
 - (void)sendClick
 {
     NSLog(@"sendClick");
+    [Tools showNaviViewWithMessage:@"请先充值钻石哦"];
 }
 - (void)payClick
@@ -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,25 @@
 #import "BaseView.h"
 @class PresentView;
 @class AnimationBaseView;
+
+typedef NS_ENUM(NSInteger, BounceBtnType) {//弹窗按钮类型
+    BounceBtnTypeAite        = 1,//@TA按钮点击
+    BounceBtnTypePriChat        ,//私聊按钮点击
+    BounceBtnTypeHome           ,//主页按钮点击
+};
+
+typedef NS_ENUM(NSInteger, JumpControllerType) {//跳转控制器类型
+    JumpControllerTypePresent        = 1,//present
+    JumpControllerTypePush               //push
+};
 @interface LiveBaseView : BaseView 
+@property (nonatomic) JumpControllerType              jumpType;
 @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
@@ -20,7 +20,6 @@
 #import "ChatBarrageManager.h"
 #import "userInfoModel.h"
 #import "PrivateView.h"
-//#import "BarrageManager.h"
 #import "ChatBarrageView.h"
 #import "AnimationBaseView.h"
@@ -35,7 +34,7 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
     PopTypePriMessage        //私信弹窗
 };
-@interface LiveBaseView ()<bottomBtnDeledate,PresentViewDelegate,UIScrollViewDelegate,UITableViewDelegate,UITableViewDataSource,UITextFieldDelegate,userClickDelegate,CNLiveChatManagerDelegate>
+@interface LiveBaseView ()<bottomBtnDeledate,PresentViewDelegate,UIScrollViewDelegate,UITableViewDelegate,UITableViewDataSource,UITextFieldDelegate,userClickDelegate,CNLiveChatManagerDelegate,PopViewDelegate>
 @property (nonatomic ,strong           ) UIScrollView *   _Nullable scrollView;
 @property (nonatomic ,strong ,readwrite) AnimationBaseView *         _Nullable animationBaseView;//展示层View
@@ -53,14 +52,23 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
 @property (nonatomic ,assign           ) CGFloat   offsetHeight;
 @property (nonatomic ,strong           ) UISwitch *           _Nullable barrageSwitch;
 @property (nonatomic ,strong           ) ChatBarrageManager * _Nullable chatManager;
-//@property (nonatomic ,strong           ) BarrageManager * _Nullable barrManager;
-
-@property (nonatomic ,strong) ChatBarrageView * _Nullable             barrageView;
+@property (nonatomic ,strong           ) ChatBarrageView *    _Nullable barrageView;
 @end
 @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]) {
@@ -94,23 +102,35 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
     return self;
 }
+- (void)dealloc
+{
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:UIKeyboardWillShowNotification object:nil];
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:UIKeyboardWillHideNotification object:nil];
+}
+
 - (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;
+    NSString *class = [[NSUserDefaults standardUserDefaults] objectForKey:keyboard];
+    if ([class isEqualToString:NSStringFromClass([self 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;
+    NSString *class = [[NSUserDefaults standardUserDefaults] objectForKey:keyboard];
+    if ([class isEqualToString:NSStringFromClass([self class])])
+    {
+        [UIView animateWithDuration:0.1 animations:^{
+            self.animationBaseView.top = 0;
+            [self.animationBaseView setNeedsDisplay];
+        }];
+        self.bottomToolView.hidden = NO;
+    }
 }
 - (void)createCommentsView {
@@ -211,9 +231,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
 {
@@ -223,7 +268,8 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
         case BtnClickTypeChat:
         {
             self.popType = PopTypeChat;
-            
+            [[NSUserDefaults standardUserDefaults] setObject:NSStringFromClass([self class]) forKey:keyboard];
+            [[NSUserDefaults standardUserDefaults] synchronize];
             [self showCommentText];
         }
             break;
@@ -232,6 +278,8 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
             self.popType = PopTypePriMessage;
             [self hiddenView:YES];
             [self showPrivateView];
+            [[NSUserDefaults standardUserDefaults] setObject:NSStringFromClass([PrivateView class]) forKey:keyboard];
+            [[NSUserDefaults standardUserDefaults] synchronize];
         }
             break;
         case BtnClickTypeGift:
@@ -251,9 +299,15 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
 - (void)showPrivateView
 {
     PrivateView *privateView = [PrivateView privateView];
-    privateView.backgroundColor = [UIColor yellowColor];
+    privateView.backgroundColor = [UIColor whiteColor];
     [self addSubview:privateView];
+    privateView.delegate = self;
     self.giftPopView = privateView;
+    [UIView animateWithDuration:0.5 animations:^{
+        privateView.top -= 300;
+    } completion:^(BOOL finished) {
+        
+    }];
 }
 - (void)hiddenView:(BOOL)isHidden
@@ -288,12 +342,21 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
             break;
         case PopTypePriMessage:
         {
-            [UIView animateWithDuration:0.25 animations:^{
-                
-                self.giftPopView.frame = CGRectMake(0, SCREEN_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT);
-                [self hiddenView:NO];
-            } completion:^(BOOL finished) {
-            }];
+            if (((PrivateView *)self.giftPopView).isEditing) {
+                //正在编辑
+                [(PrivateView *)self.giftPopView endCurrentEditing];
+
+            }else//已结束编辑
+            {
+                [UIView animateWithDuration:0.25 animations:^{
+                    
+                    self.giftPopView.frame = CGRectMake(0, SCREEN_HEIGHT, SCREEN_WIDTH, 300);
+                    [self hiddenView:NO];
+                } completion:^(BOOL finished) {
+                    
+                    [self.giftPopView removeFromSuperview];
+                }];
+            }
         }
             break;
         default:
@@ -301,7 +364,6 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
     }
 }
-
 #pragma mark - buttonClick触摸屏幕关闭方法
 - (void)tapGestureClick:(UITapGestureRecognizer *)gesture
 {
@@ -312,7 +374,20 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
 - (void)closeAction
 {
-    [self.viewController.navigationController popViewControllerAnimated:YES];
+    switch (self.jumpType) {
+        case JumpControllerTypePresent:
+        {
+            [self.viewController dismissViewControllerAnimated:YES completion:nil];
+        }
+            break;
+        case JumpControllerTypePush:
+        {
+            [self.viewController.navigationController popViewControllerAnimated:YES];
+        }
+            break;
+        default:
+            break;
+    }
 }
 - (void)sendClick
@@ -345,6 +420,12 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
     }];
 }
+#pragma mark - PriClosePopViewDelegate
+- (void)closeCurrentPopView
+{
+    [self clearCurrentPopView];
+}
+
 #pragma mark - CNLiveChatManagerDelegate
 /**
  连接状态的的监听器
@@ -387,40 +468,70 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
 - (void)onReceived:(CNLiveChatMessage *)message
 {
 //    NSLog(@"onReceived");
-    NSDictionary *JSONDic = [Tools dictionaryWithJsonString:message.messageContent];
-    NSString *content = [JSONDic objectForKey:message_content];
-
-    //将消息显示到列表中
-    chatMsgModel *model = [[chatMsgModel alloc] init];
-    model.name = message.userInfo.name;
-    model.content = content;
-    model.ID = message.targetId;
-    model.icon = message.userInfo.portraitUri;
-    model.cellWidth = self.chatTableView.width - 20;
-    [self.chatMsgArray addObject:model];
-    [self.chatTableView reloadData];
-    
-    NSInteger section = [self.chatTableView numberOfSections];
-    if (section < 1) return;
-    NSInteger row = [self.chatTableView numberOfRowsInSection:section - 1];
-    if (row < 1) return;
-    NSIndexPath *indexPath = [NSIndexPath indexPathForRow:row - 1 inSection:section - 1];
-    [self.chatTableView scrollToRowAtIndexPath:indexPath atScrollPosition:UITableViewScrollPositionBottom animated:YES];
-    [self.chatTableView reloadData];
-    
-    NSInteger isBarrage = [[JSONDic objectForKey:message_barrage] integerValue];
-    
-    if (isBarrage) {//此条消息飘弹幕
-
-        chatMsgModel *barrageModel = [[chatMsgModel alloc] init];
-        barrageModel.name = message.userInfo.name;
-        barrageModel.content = content;
-        barrageModel.icon = message.userInfo.portraitUri;
-//        self.barrageView = [self.barrManager addAnimationWithModel:barrageModel animContentView:self.animationBaseView];
-        [self.chatManager addAnimationWithModel:barrageModel animContentView:self.animationBaseView];//self.barrageView = 
+    switch (message.conversationType) {
+        case CNLive_ConversationType_CHATROOM:
+        {
+            NSDictionary *JSONDic = [Tools dictionaryWithJsonString:message.messageContent];
+            NSString *content = [JSONDic objectForKey:message_content];
+            
+            //将消息显示到列表中
+            chatMsgModel *model = [[chatMsgModel alloc] init];
+            model.name = message.userInfo.name;
+            model.content = content;
+            model.ID = message.targetId;
+            model.icon = message.userInfo.portraitUri;
+            model.cellWidth = self.chatTableView.width - 20;
+            [self.chatMsgArray addObject:model];
+            [self.chatTableView reloadData];
+            
+            NSInteger section = [self.chatTableView numberOfSections];
+            if (section < 1) return;
+            NSInteger row = [self.chatTableView numberOfRowsInSection:section - 1];
+            if (row < 1) return;
+            NSIndexPath *indexPath = [NSIndexPath indexPathForRow:row - 1 inSection:section - 1];
+            [self.chatTableView scrollToRowAtIndexPath:indexPath atScrollPosition:UITableViewScrollPositionBottom animated:YES];
+            [self.chatTableView reloadData];
+            
+            NSInteger isBarrage = [[JSONDic objectForKey:message_barrage] integerValue];
+            
+            if (isBarrage) {//此条消息飘弹幕
+                
+                chatMsgModel *barrageModel = [[chatMsgModel alloc] init];
+                barrageModel.name = message.userInfo.name;
+                barrageModel.content = content;
+                barrageModel.icon = message.userInfo.portraitUri;
+                [self.chatManager addAnimationWithModel:barrageModel animContentView:self.animationBaseView];
+            }
+        }
+            break;
+        case CNLive_ConversationType_PRIVATE:
+        {
+            NSDictionary *JSONDic = [Tools dictionaryWithJsonString:message.messageContent];
+            NSString *content = [JSONDic objectForKey:message_content];
+            PrivateView *privateView = [PrivateView privateView];
-        self.animationBaseView.delegate = self.chatManager;
-//        self.animationBaseView.barrageView = self.barrageView;
+            //将消息显示到列表中
+            chatMsgModel *model = [[chatMsgModel alloc] init];
+            model.name = message.userInfo.name;
+            model.isMine = NO;
+            model.content = content;
+            model.ID = message.targetId;
+            model.icon = message.userInfo.portraitUri;
+            model.priCellWidth = privateView.tableView.width * 0.5 - 30;
+            [privateView.chatArray addObject:model];
+            [privateView.tableView reloadData];
+            
+            NSInteger section = [privateView.tableView numberOfSections];
+            if (section < 1) return;
+            NSInteger row = [privateView.tableView numberOfRowsInSection:section - 1];
+            if (row < 1) return;
+            NSIndexPath *indexPath = [NSIndexPath indexPathForRow:row - 1 inSection:section - 1];
+            [privateView.tableView scrollToRowAtIndexPath:indexPath atScrollPosition:UITableViewScrollPositionBottom animated:YES];
+            [privateView.tableView reloadData];
+        }
+            break;
+        default:
+            break;
     }
 }
@@ -558,8 +669,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;
 }
@@ -575,7 +685,6 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
         tableView.showsHorizontalScrollIndicator = NO;
         tableView.bounces = NO;
         tableView.backgroundColor = [UIColor clearColor];
-        tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
         _chatTableView = tableView;
     }
     return _chatTableView;
@@ -629,14 +738,6 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
     return _giftListView;
 }
-//- (BarrageManager *)barrManager
-//{
-//    if (!_barrManager)
-//    {
-//        _barrManager = [BarrageManager sharedManager];
-//    }
-//    return _barrManager;
-//}
 - (ChatBarrageManager *)chatManager
 {
     if (!_chatManager)
+//
+//  PriChatCell.h
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/27.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "BaseTableViewCell.h"
+
+@class chatMsgModel;
+@interface PriChatCell : BaseTableViewCell
+
+@end
+//
+//  PriChatCell.m
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/27.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "PriChatCell.h"
+#import "chatMsgModel.h"
+
+#define CHAT_POP_WIDTH 260
+
+@interface PriChatCell ()
+
+@property (nonatomic ,strong) chatMsgModel * _Nullable model;
+@property (nonatomic ,strong) UIImageView *  _Nullable icon;
+@property (nonatomic ,strong) UILabel *      _Nullable content;
+
+@end
+
+@implementation PriChatCell
+
+- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier
+{
+    self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
+    if (self) {
+        self.backgroundColor = [UIColor clearColor];
+        self.selectionStyle = UITableViewCellSelectionStyleNone;
+    }
+    return self;
+}
+
+- (void)loadUIWithModel:(chatMsgModel *)model
+{
+    _model = model;
+    [self bindView];
+    [self.icon sd_setImageWithURL:[NSURL URLWithString:model.icon] placeholderImage:nil];
+    self.content.text = model.content;
+    CGSize size = [self.content labelSizeWithWidth:_model.priCellWidth];
+    if (_model.isMine) {
+        if (_model.priCellHeight < 37) {//1行 // 36.7
+            
+            self.content.frame = CGRectMake(self.width - 30 - size.width - 10, 2.5, size.width, size.height);//self.height - 5
+            self.content.textAlignment = NSTextAlignmentRight;
+            self.content.centerY = self.icon.centerY;
+        }else
+        {
+            self.content.frame = CGRectMake(self.width - 30 - size.width - 10, 10, size.width, size.height);//self.height - 5
+            self.content.textAlignment = NSTextAlignmentLeft;
+        }
+    }else
+    {
+         if (_model.priCellHeight < 37) {//1行
+             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 + 10, 2.5, size.width, size.height);//self.height - 5
+             self.content.textAlignment = NSTextAlignmentLeft;
+             self.content.centerY = self.icon.centerY;
+         }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 + 10, 10, size.width, size.height);//self.height - 5
+             self.content.textAlignment = NSTextAlignmentLeft;
+         }
+    }
+}
+
+- (void)bindView
+{
+    if (_model.isMine) {
+        self.icon.frame = CGRectMake(self.width - 30, 6, 25, 25);
+        NSLog(@"self.icon.centerY%f,%f",self.height * 0.5,_model.priCellHeight);//13.353516 21.707031 155.363281
+        self.icon.centerY = (self.height - 25)*0.5 + 12.5;//13.353516;
+        self.content.frame = CGRectMake(self.width - 30 - CHAT_POP_WIDTH, 2.5, CHAT_POP_WIDTH - 10, 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
+- (UILabel * _Nullable)content
+{
+    if (!_content)
+    {
+        _content = [[UILabel alloc] init];
+        _content.textAlignment = NSTextAlignmentLeft;
+        _content.textColor = [UIColor blackColor];
+        _content.numberOfLines = 0;
+        _content.font = [UIFont systemFontOfSize:kContentFont];
+        [self addSubview:_content];
+    }
+    return _content;
+}
+
+- (UIImageView * _Nullable)icon
+{
+    if (!_icon)
+    {
+        _icon = [[UIImageView alloc] init];
+        _icon.layer.masksToBounds = YES;
+        _icon.layer.cornerRadius = 15.f;
+        [self addSubview:_icon];
+    }
+    return _icon;
+}
+
+- (void)awakeFromNib {
+    [super awakeFromNib];
+    // Initialization code
+}
+
+- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
+    [super setSelected:selected animated:animated];
+
+    // Configure the view for the selected state
+}
+
+@end
@@ -8,8 +8,24 @@
 #import <UIKit/UIKit.h>
+
+@protocol PopViewDelegate <NSObject>
+
+- (void)closeCurrentPopView;
+
+@end
+
 @interface PrivateView : UIView
-+ (instancetype)privateView;
++ (instancetype _Nonnull)privateView;
+
+- (void)endCurrentEditing;
+
+@property (nonatomic ,assign) BOOL                          isEditing;
+
+@property (nonatomic ,strong) _Nonnull id <PopViewDelegate>             delegate;
+@property (nonatomic ,strong) UITableView *      _Nullable tableView;
+
+@property (nonatomic ,strong) NSMutableArray * _Nullable             chatArray;
 @end
@@ -7,13 +7,261 @@
 //
 #import "PrivateView.h"
+#import "PriChatCell.h"
+#import "chatMsgModel.h"
+
+@interface PrivateView ()<UITextFieldDelegate,UITableViewDelegate,UITableViewDataSource>
+
+@property (nonatomic ,strong) UILabel *          _Nullable nameLbl;
+@property (nonatomic ,strong) UIButton *         _Nullable closeBtn;
+
+@property (nonatomic ,strong) UIImageView *      _Nullable bottomTool;
+@property (nonatomic ,strong) UIButton *         _Nullable sendBtn;
+@property (nonatomic ,strong) UITextField *      _Nullable textField;
+
+@end
 @implementation PrivateView
+static NSString *message_content = @"message_content";
+
 + (instancetype)privateView
 {
-    return [[PrivateView alloc] initWithFrame:CGRectMake(0, SCREEN_HEIGHT - 300, SCREEN_WIDTH, 300)];
+    static PrivateView *privateView;
+    
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        privateView = [[PrivateView alloc] initWithFrame:CGRectMake(0, SCREEN_HEIGHT, SCREEN_WIDTH, 300)];
+    });
+    return privateView;
+}
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+    if (self = [super initWithFrame:frame]) {
+        
+        [self addSubview:self.tableView];
+        [self addSubview:self.nameLbl];
+        [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];
+    }
+    return self;
+}
+
+- (void)closeAction
+{
+    if ([self.delegate respondsToSelector:@selector(closeCurrentPopView)]) {
+        [self.delegate closeCurrentPopView];
+    }
+}
+
+- (void)sendClick
+{
+    [self textFieldShouldReturn:self.textField];
+}
+
+- (void)dealloc
+{
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:UIKeyboardWillShowNotification object:nil];
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:UIKeyboardWillHideNotification object:nil];
+}
+
+- (void)keyboardWillShow:(NSNotification *)notify {
+    
+    NSString *class = [[NSUserDefaults standardUserDefaults] objectForKey:keyboard];
+    if ([class isEqualToString:NSStringFromClass([self 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 {
+    NSString *class = [[NSUserDefaults standardUserDefaults] objectForKey:keyboard];
+    if ([class isEqualToString:NSStringFromClass([self class])])
+    {
+        [UIView animateWithDuration:0.1 animations:^{
+            self.top = SCREEN_HEIGHT - 300;
+        }];
+        NSLog(@"hiddentop:%f",self.top);
+        self.isEditing = NO;
+    }
+}
+
+#pragma mark - UITextFieldDelegate
+- (BOOL)textFieldShouldReturn:(UITextField *)textField
+{
+    if (![textField.text isEqualToString:@""]) {
+                
+        NSDictionary *dic = @{message_content:textField.text};
+        weakself
+        NSString *message = [Tools dictionaryToJson:dic];
+        [[CNLiveChatManager sharedCNLiveChatManager] sendMessage:message type:CNLive_ConversationType_PRIVATE targetId:@"20170327" success:^(CNLiveChatMessage *message) {
+            
+            dispatch_async(dispatch_get_main_queue(), ^{
+                strongself
+                NSDictionary *JSONDic = [Tools dictionaryWithJsonString:message.messageContent];
+                NSString *content = [JSONDic objectForKey:message_content];
+                
+                //将消息显示到列表中
+                chatMsgModel *model = [[chatMsgModel alloc] init];
+                model.name = message.userInfo.name;
+                model.isMine = YES;
+                model.content = content;
+                model.ID = message.targetId;
+                model.icon = message.userInfo.portraitUri;
+                model.priCellWidth = self.tableView.width * 0.5 - 30;
+                //        model.sendTime;//发送时间
+                [self.chatArray addObject:model];
+                [self.tableView reloadData];
+                
+                NSInteger section = [self.tableView numberOfSections];
+                if (section < 1) return;
+                NSInteger row = [self.tableView numberOfRowsInSection:section - 1];
+                if (row < 1) return;
+                NSIndexPath *indexPath = [NSIndexPath indexPathForRow:row - 1 inSection:section - 1];
+                [self.tableView scrollToRowAtIndexPath:indexPath atScrollPosition:UITableViewScrollPositionBottom animated:YES];
+                [self.tableView reloadData];
+
+            });
+        } error:^(CNLiveChatErrorCode errors, NSString *messageId, NSString *targetId) {
+            NSLog(@"%@",messageId);
+        }];
+        
+        textField.text = @"";
+    }
+    [textField resignFirstResponder];
+    return YES;
+}
+
+- (void)endCurrentEditing
+{
+    self.top = SCREEN_HEIGHT - 300;
+    [self.textField resignFirstResponder];
+}
+
+#pragma mark - 私聊消息列表
+#pragma mark - UITableViewDataSource
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+    return self.chatArray.count;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    PriChatCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([PriChatCell class]) forIndexPath:indexPath];
+    [cell loadUIWithModel:self.chatArray[indexPath.row]];
+    return cell;
+}
+
+#pragma mark - UITableViewDelegate
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    return [self.chatArray[indexPath.row] priCellHeight];
 }
+
+- (NSMutableArray *)chatArray
+{
+    if (!_chatArray)
+    {
+        _chatArray = [[NSMutableArray alloc] init];
+    }
+    return _chatArray;
+}
+
+- (UILabel *)nameLbl
+{
+    if (!_nameLbl)
+    {
+        _nameLbl = [[UILabel alloc] initWithFrame:CGRectMake(100, 5, self.width - 100, 30)];
+        _nameLbl.centerX = self.width * 0.5;
+        _nameLbl.text = @"哈哈哈主播的名字";
+        [_nameLbl setTextColor:[UIColor cyanColor]];
+        _nameLbl.numberOfLines = 1;
+        _nameLbl.textAlignment = NSTextAlignmentCenter;
+    }
+    return _nameLbl;
+}
+
+- (UIButton *)closeBtn
+{
+    if (!_closeBtn)
+    {
+        UIButton *closeBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+        closeBtn.frame = CGRectMake(SCREEN_WIDTH - 41,10, 31, 30);
+        [closeBtn setImage:[UIImage imageNamed:@"close"] forState:UIControlStateNormal];
+        [closeBtn setImage:[UIImage imageNamed:@"close"] forState:UIControlStateHighlighted];
+        [closeBtn addTarget:self action:@selector(closeAction) forControlEvents:UIControlEventTouchUpInside];
+        _closeBtn = closeBtn;
+        [self addSubview:_closeBtn];
+
+    }
+    return _closeBtn;
+}
+
+- (UITableView *)tableView
+{
+    if (!_tableView)
+    {
+        _tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, self.closeBtn.bottom + 10, self.width, self.height - self.closeBtn.bottom - 10 - self.bottomTool.height)];
+        [_tableView registerClass:[PriChatCell class] forCellReuseIdentifier:NSStringFromClass([PriChatCell class])];
+        _tableView.delegate = self;
+        _tableView.dataSource = self;
+        _tableView.showsVerticalScrollIndicator = NO;
+        _tableView.showsHorizontalScrollIndicator = NO;
+        _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
+        _tableView.bounces = NO;
+        _tableView.backgroundColor = [UIColor clearColor];
+    }
+    return _tableView;
+}
+
+- (UIImageView *)bottomTool
+{
+    if (!_bottomTool)
+    {
+        _bottomTool = [[UIImageView alloc] initWithFrame:CGRectMake(0, self.height - 40, self.width, 40)];
+        _bottomTool.image = [[UIImage imageNamed:@"priToolBg"] resizableImageWithCapInsets:UIEdgeInsetsMake(0, 0, 0, 0) resizingMode:UIImageResizingModeStretch];
+        _bottomTool.userInteractionEnabled = YES;
+        
+        [self addSubview:_bottomTool];
+    }
+    return _bottomTool;
+}
+
+- (UIButton *)sendBtn
+{
+    if (!_sendBtn)
+    {
+        _sendBtn = [[UIButton alloc] initWithFrame:CGRectMake(self.bottomTool.width - 60, 4, 60, self.bottomTool.height - 8)];
+        [_sendBtn setTitle:@"发送" forState:UIControlStateNormal];
+        [_sendBtn setTitleColor:[UIColor cyanColor] forState:UIControlStateNormal];
+        [_sendBtn addTarget:self action:@selector(sendClick) forControlEvents:UIControlEventTouchUpInside];
+    }
+    return _sendBtn;
+}
+
+- (UITextField *)textField
+{
+    if (!_textField)
+    {
+        _textField = [[UITextField alloc] initWithFrame:CGRectMake(4, 4, self.bottomTool.width - self.sendBtn.width - 8, self.bottomTool.height - 8)];
+        _textField.borderStyle = UITextBorderStyleLine;
+        _textField.returnKeyType       = UIReturnKeySend;
+        _textField.delegate = self;
+    }
+    return _textField;
+}
+
 /*
 // Only override drawRect: if you perform custom drawing.
 // An empty implementation adversely affects performance during animation.
@@ -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.
@@ -11,11 +11,13 @@
 #import <CNLivePlayerSDK/CNLiveWebcastManager.h>
 #import "FilterFunctionView.h"
 #import "LVCUGCLivePrepareView.h"
+#import "LiveBaseView.h"
+#import "LVCUGCLiveEndView.h"
-#define KAppId @"60_irn9edco29"
-#define KAppKey @"69fe70bda67e059286ad509d9f5377f815955645b52f94"
-
-@interface LVCLiveViewController ()<UIGestureRecognizerDelegate>
+@interface LVCLiveViewController ()<UIGestureRecognizerDelegate> {
+    
+    BOOL _isStreaming;
+}
 @property (nonatomic, strong) LVCUGCLivePrepareView *prepareView;
@@ -33,6 +35,10 @@
 @property (nonatomic, strong) UIButton *openFlashButton;
+@property (nonatomic ,strong) LiveBaseView * _Nullable             liveBaseView;
+
+@property (nonatomic, strong) LVCUGCLiveEndView *endView;
+
 @end
 @implementation LVCLiveViewController
@@ -43,6 +49,7 @@
     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];
@@ -53,8 +60,6 @@
     // 初始化推流
     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";
@@ -101,13 +106,32 @@
 }
+- (LiveBaseView *)liveBaseView
+{
+    if (!_liveBaseView)
+    {
+        _liveBaseView = [LiveBaseView liveBaseView];
+        _liveBaseView.jumpType = JumpControllerTypePresent;
+        _liveBaseView.viewController = self;
+        _liveBaseView.backgroundColor = [UIColor clearColor];
+    }
+    return _liveBaseView;
+}
+
 #pragma mark - UIButton Action  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 - (void)startCapture:(UIButton *)button {   // 开始推流
+
+    [_quitButton removeFromSuperview];
+    _isStreaming = YES;
+
     [_prepareView removeFromSuperview];
     [_kitCN startStream:^{
         NSLog(@"开启推流成功 ------- success");
+        
+        [self.view insertSubview:self.liveBaseView atIndex:1];
+
     } failure:^(NSDictionary *errorDic) {
         NSString *str=[[NSMutableString alloc] initWithData:errorDic[@"errorMessage"] encoding:NSUTF8StringEncoding];
         NSLog(@"%@",str);
@@ -172,19 +196,31 @@
 - (void)quitBtnClick {    // 退出
+    if (_isStreaming) {
+        [self.view addSubview:self.endView];
+    } else {
+        if (_kitCN.captureState == CNLiveCaptureStateCapturing) {
+            [_kitCN stopPreview];
+        }
+        [self dismissViewControllerAnimated:YES completion:nil];
+    }
+}
+
+- (void)continueButtonClick {
+    
+    [_endView removeFromSuperview];
+}
+
+- (void)endButtonClick {
+    
     if (_kitCN.streamState == CNLiveStreamStateConnected) {
         [_kitCN stopStream];
     }
-    if (_kitCN.captureState == CNLiveCaptureStateCapturing) {
-        [_kitCN stopPreview];
-    }
-    
     [self dismissViewControllerAnimated:YES completion:nil];
 }
-#pragma mark - UIGestureRecognizer Action !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
+#pragma mark - UIGestureRecognizer Action !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 - (void)onTap:(UIGestureRecognizer *)sender {  //对焦与曝光
     CGPoint current = [sender locationInView:self.view];
@@ -197,8 +233,7 @@
     }
 }
-#pragma mark - notification  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
+#pragma mark - notification  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 - (void)enterBg {   // 进入后台
     [_kitCN appEnterBackground];
@@ -461,6 +496,18 @@
     return _openFilterButton;
 }
+- (LVCUGCLiveEndView *)endView {
+    
+    if (!_endView) {
+        _endView = [[LVCUGCLiveEndView alloc] initWithFrame:CGRectMake(20, SCREEN_HEIGHT * 0.3, SCREEN_WIDTH - 40, SCREEN_WIDTH - 40)];
+        _endView.layer.cornerRadius = 20;
+        _endView.layer.masksToBounds = YES;
+        [_endView.continueButton addTarget:self action:@selector(continueButtonClick) forControlEvents:UIControlEventTouchUpInside];
+        [_endView.endButton addTarget:self action:@selector(endButtonClick) forControlEvents:UIControlEventTouchUpInside];
+    }
+    return _endView;
+}
+
 #pragma mark - Action !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 - (void)addObservers {
@@ -482,25 +529,6 @@
                                                object:nil];
 }
-- (UIButton *)addButton:(NSString*)title
-                  frame:(CGRect)frame
-                 action:(SEL)action {
-    UIButton * button;
-    button = [UIButton buttonWithType:UIButtonTypeCustom];
-    button.frame = frame;
-    [button setTitle: title forState: UIControlStateNormal];
-    [button addTarget:self action:action forControlEvents:UIControlEventTouchUpInside];
-    button.titleLabel.font = [UIFont systemFontOfSize:15];
-    [button setTitleColor:[UIColor colorWithRed:23/255.0 green:110/255.0 blue:254/255.0 alpha:1] forState:UIControlStateNormal];
-    button.layer.cornerRadius = 10;
-    button.layer.masksToBounds = YES;
-    button.layer.borderColor = [UIColor blackColor].CGColor;
-    button.layer.borderWidth = 1;
-    [self.captureView addSubview:button];
-    return button;
-    
-}
-
 - (UIButton *)createButtonWithFrame:(CGRect)frame image:(NSString *)image selected:(NSString *)selected {
     UIButton *btn = [UIButton buttonWithType:UIButtonTypeCustom];
+//
+//  LVCUGCLiveEndView.h
+//  LiveVideoCloud
+//
+//  Created by cnliveJunBo on 17/3/27.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface LVCUGCLiveEndView : UIView
+
+@property (nonatomic, strong) UIButton *continueButton;
+
+@property (nonatomic, strong) UIButton *endButton;
+
+@end
+//
+//  LVCUGCLiveEndView.m
+//  LiveVideoCloud
+//
+//  Created by cnliveJunBo on 17/3/27.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "LVCUGCLiveEndView.h"
+
+#define selfLength self.bounds.size.width
+
+@interface LVCUGCLiveEndView()
+
+@property (nonatomic, strong) UIImageView *iconView;
+
+@property (nonatomic, strong) UILabel *infoLabel;
+@property (nonatomic, strong) UILabel *attentionLabel;
+
+@end
+
+@implementation LVCUGCLiveEndView
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        self.backgroundColor = [UIColor whiteColor];
+        [self addSubview:self.iconView];
+        [self addSubview:self.infoLabel];
+        [self addSubview:self.attentionLabel];
+        [self addSubview:self.continueButton];
+        [self addSubview:self.endButton];
+    }
+    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((selfLength - 50) * 0.5, 20, 50, 50);
+        _iconView.layer.cornerRadius = 25;
+        _iconView.layer.masksToBounds = YES;
+    }
+    return _iconView;
+}
+
+- (UILabel *)infoLabel {
+    
+    if (!_infoLabel) {
+        _infoLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, selfLength * 0.3, selfLength, 20)];
+        _infoLabel.text = @"10000人看过你的直播~";
+        _infoLabel.textAlignment = NSTextAlignmentCenter;
+        _infoLabel.textColor = [UIColor grayColor];
+    }
+    return _infoLabel;
+}
+
+- (UILabel *)attentionLabel {
+    
+    if (!_attentionLabel) {
+        _attentionLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, selfLength * 0.5, selfLength, 30)];
+        _attentionLabel.text = @"确定要结束直播吗?";
+        _attentionLabel.textAlignment = NSTextAlignmentCenter;
+        _attentionLabel.textColor = [UIColor orangeColor];
+        _attentionLabel.font = [UIFont systemFontOfSize:21];
+    }
+    return _attentionLabel;
+}
+
+- (UIButton *)continueButton {
+    
+    if (!_continueButton) {
+        _continueButton = [UIButton buttonWithType:UIButtonTypeCustom];
+        _continueButton.frame = CGRectMake(15, selfLength * 0.7, selfLength * 0.4, 35);
+        [_continueButton setTitle:@"继续" forState:UIControlStateNormal];
+        [_continueButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+        [_continueButton setTitleColor:[UIColor blackColor] forState:UIControlStateHighlighted];
+        _continueButton.backgroundColor = [UIColor redColor];
+        _continueButton.layer.cornerRadius = 17.5;
+        _continueButton.layer.masksToBounds = YES;
+    }
+    return _continueButton;
+}
+
+- (UIButton *)endButton {
+    
+    if (!_endButton) {
+        _endButton = [UIButton buttonWithType:UIButtonTypeCustom];
+        _endButton.frame = CGRectMake(selfLength * 0.6 - 15, selfLength * 0.7, selfLength * 0.4, 35);
+        [_endButton setTitle:@"结束" forState:UIControlStateNormal];
+        [_endButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+        [_endButton setTitleColor:[UIColor blackColor] forState:UIControlStateHighlighted];
+        _endButton.backgroundColor = [UIColor redColor];
+        _endButton.layer.cornerRadius = 17.5;
+        _endButton.layer.masksToBounds = YES;
+    }
+    return _endButton;
+}
+
+@end
@@ -49,11 +49,9 @@
     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;
+
+        UIColor *color = [UIColor colorWithRed:23/255.0 green:110/255.0 blue:254/255.0 alpha:1];
+        _titleTextField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"起个名字开始直播~" attributes:@{NSForegroundColorAttributeName: color}];
         _titleTextField.font = [UIFont systemFontOfSize:19];
     }
@@ -8,31 +8,17 @@
 #import "HomeViewController.h"
 #import "LVCLivePlayerController.h"
-#import "LVCInteractionController.h"
 #import "LVCLivePlayerController.h"
 #import "LVCUGCLivePlayerController.h"
-#import "LVCLivePlayerController.h"
+#import "LVCTVLiveViewController.h"
+#import "LVCUGCLiveListController.h"
 @interface HomeViewController ()
-@property (nonatomic ,strong) UIButton * _Nullable             interactionBtn;
-
 @end
 @implementation HomeViewController
-- (void)viewWillAppear:(BOOL)animated
-{
-    [super viewWillAppear:animated];
-    [[UIApplication sharedApplication].keyWindow addSubview:self.interactionBtn];
-}
-
-- (void)viewWillDisappear:(BOOL)animated
-{
-    [super viewWillDisappear:animated];
-    [self.interactionBtn removeFromSuperview];
-}
-
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
@@ -51,13 +37,17 @@
     [UGCLiveBtn addTarget:self action:@selector(UGCLiveAction) forControlEvents:UIControlEventTouchUpInside];
     [self.view addSubview:UGCLiveBtn];
-    [[UIApplication sharedApplication].keyWindow addSubview:self.interactionBtn];
+    UIButton *UGCLiveListBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+    UGCLiveListBtn.frame = CGRectMake(0, 300, self.view.width, 40);
+    [UGCLiveListBtn setTitle:@"UGC直播列表" forState:UIControlStateNormal];
+    [UGCLiveListBtn addTarget:self action:@selector(UGCLiveListAction) forControlEvents:UIControlEventTouchUpInside];
+    [self.view addSubview:UGCLiveListBtn];
 }
 - (void)liveAction
 {
-    LVCLivePlayerController *liveVC = [[LVCLivePlayerController alloc] init];
-    self.navigationController.navigationBar.hidden = YES;
+    LVCTVLiveViewController *liveVC = [[LVCTVLiveViewController alloc] init];
+//    self.navigationController.navigationBar.hidden = YES;
     [self.navigationController pushViewController:liveVC animated:YES];
 }
@@ -67,26 +57,10 @@
     [self.navigationController pushViewController:UGCLiveVC animated:YES];
 }
-- (void)interactionAction
-{
-    LVCInteractionController *intVC = [[LVCInteractionController alloc] init];
-    self.navigationController.navigationBar.hidden = YES;
-    [self.navigationController pushViewController:intVC animated:YES];
-}
-
-
-- (UIButton *)interactionBtn
+- (void)UGCLiveListAction
 {
-    if (!_interactionBtn)
-    {
-        UIButton *interactionBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        interactionBtn.frame = CGRectMake(200, 400, 50, 30);
-        [interactionBtn setTitle:@"互动" forState:UIControlStateNormal];
-        [interactionBtn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
-        [interactionBtn addTarget:self action:@selector(interactionAction) forControlEvents:UIControlEventTouchUpInside];
-        _interactionBtn = interactionBtn;
-    }
-    return _interactionBtn;
+    LVCUGCLiveListController *listVC = [[LVCUGCLiveListController alloc] init];
+    [self.navigationController pushViewController:listVC animated:YES];
 }
 - (void)didReceiveMemoryWarning {
+//
+//  LVCUGCLiveListController.h
+//  LiveVideoCloud
+//
+//  Created by cnliveJunBo on 17/3/27.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface LVCUGCLiveListController : UIViewController
+
+@end
+//
+//  LVCUGCLiveListController.m
+//  LiveVideoCloud
+//
+//  Created by cnliveJunBo on 17/3/27.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "LVCUGCLiveListController.h"
+#import "CommonCrypto/CommonDigest.h"
+
+@interface LVCUGCLiveListController ()
+
+@end
+
+@implementation LVCUGCLiveListController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    self.view.backgroundColor = [UIColor whiteColor];
+    
+    [self loadData];
+}
+
+- (void)loadData {
+    
+    NSInteger time = [[NSDate date] timeIntervalSince1970];
+    NSString *timeString = [NSString stringWithFormat:@"%ld", (long)time];
+    NSMutableDictionary *parameter=[@{@"platform_id": [NSBundle mainBundle].bundleIdentifier,
+                              @"timestamp": timeString,
+                              @"appId": AppId} mutableCopy];
+    NSString *string = [NSString stringWithFormat:@"%@&key=%@", [self sortParameters:parameter], AppKey];
+    NSString *signString = [[self sha1:string] uppercaseString];
+    [parameter setObject:signString forKey:@"sign"];
+    
+    [[AFHTTPSessionManager manager] GET:@"http://api.cnlive.com/open/api2/live_epg/sp/activityList4App" parameters:parameter progress:nil success:^(NSURLSessionDataTask * _Nonnull task, id  _Nullable responseObject) {
+        
+        NSLog(@"%@",responseObject);
+        
+    } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
+        
+        NSLog(@"%@",error);
+    }];
+        
+}
+
+//sha1加密
+- (NSString*)sha1:(NSString *)string
+{
+    NSData *data = [string dataUsingEncoding:NSUTF8StringEncoding];
+    
+    uint8_t digest[CC_SHA1_DIGEST_LENGTH];
+    
+    CC_SHA1(data.bytes, data.length, digest);
+    
+    NSMutableString* output = [NSMutableString stringWithCapacity:CC_SHA1_DIGEST_LENGTH * 2];
+    
+    for(int i = 0; i < CC_SHA1_DIGEST_LENGTH; i++)
+        [output appendFormat:@"%02x", digest[i]];
+    
+    while ([[output substringToIndex:1] isEqualToString:@"0"]) {
+        output = [[NSMutableString alloc] initWithString:[output substringFromIndex:1]];
+    }
+    
+    return output;
+}
+//参数排序
+- (NSString *)sortParameters:(NSDictionary*)parameters
+{
+    //对所有传入参数按照字段名的 ASCII 码从小到大排序
+    NSArray *keyArr=[parameters allKeys];
+    NSArray *arr = [keyArr sortedArrayUsingSelector:@selector(compare:)];
+    
+    NSMutableString *string1 = [[NSMutableString alloc]init];
+    for (int i=0; i<arr.count; i++) {
+        
+        NSString *parametersString = parameters[[arr objectAtIndex:i]];
+        if (parametersString.length > 0) {
+            [string1 appendString:[NSString stringWithFormat:@"%@=%@&",[arr objectAtIndex:i],parameters[[arr objectAtIndex:i]]]];
+        }
+    }
+    
+    if (string1.length > 0) {
+        [string1 deleteCharactersInRange:NSMakeRange(string1.length-1, 1)];
+    }
+    
+    return string1;
+}
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+@end
@@ -10,18 +10,16 @@
 #import <CNLivePlayerSDK/CNLiveWebcastManager.h>
 #import "LVCUGCPlayerLoadingView.h"
 #import "LVCUGCBackgroundView.h"
+#import "LVCUGCLivePlayerCell.h"
-#define KAppId @"60_irn9edco29"
-#define KAppKey @"69fe70bda67e059286ad509d9f5377f815955645b52f94"
+static NSString *cellId = @"cellId";
-@interface LVCUGCLivePlayerController ()
+@interface LVCUGCLivePlayerController ()<UICollectionViewDelegate, UICollectionViewDataSource>
-@property (nonatomic, strong) CNLiveMoviePlayerController *player;// 播放器
+@property (nonatomic, strong) UICollectionView *collectionView;
 @property (nonatomic, strong) LVCUGCBackgroundView *bgView; // 背景视图
-@property (nonatomic, strong) LVCUGCPlayerLoadingView *loadingView; // 加载视图
-
 @end
 @implementation LVCUGCLivePlayerController
@@ -45,226 +43,62 @@
     self.view.backgroundColor = [UIColor whiteColor];
-    [self.view addSubview:self.loadingView];
     [self.view addSubview:self.bgView];
+    [self.view addSubview:self.collectionView];
-    //添加播放器通知
-    [self installMovieNotificationObservers];
-    
-    [[CNLiveWebcastManager manager] initWithAppId:KAppId appKey:KAppKey];
-    
-    //直播播放
-    _player = [[CNLiveMoviePlayerController alloc] initLivePlayWithChannelId:@"iOStest"
-                                                                 authSuccess:^{
-                                                                     
-                                                                     _player.videoDecoderMode = CNLiveMovieVideoDecoderMode_AUTO;
-                                                                     _player.view.frame = self.view.bounds;
-                                                                     _player.shouldAutoplay = YES;
-                                                                     [_player prepareToPlay];
-                                                                     [self.view addSubview:_player.view];
-                                                                     [self.view sendSubviewToBack:_player.view];
-                                                                     
-                                                                 } authFailed:^(NSDictionary *errorInfo) {
-                                                                     NSLog(@"初始化直播播放器失败：%@", errorInfo);
-                                                                     
-                                                                     
-                                                                 } getAnchorStatusResult:^(BOOL result) {
-                                                                     
-                                                                     NSLog(@"-------------获取主播状态%d", result ? YES : NO);
-                                                                     
-                                                                 }];
 }
-#pragma mark - 添加通知监听 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
--(void)installMovieNotificationObservers   //添加视频播放通知
-{
-    //视频加载状态改变
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(loadStateDidChange:)
-                                                 name:MPMoviePlayerLoadStateDidChangeNotification
-                                               object:nil];
-    
-    //视频播放错误及结束原因
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(moviePlayBackDidFinish:)
-                                                 name:MPMoviePlayerPlaybackDidFinishNotification
-                                               object:nil];
-    
-    //视频缓冲至可播放状态
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(mediaIsPreparedToPlayDidChange:)
-                                                 name:MPMediaPlaybackIsPreparedToPlayDidChangeNotification
-                                               object:nil];
-    
-    //视频播放状态改变
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(moviePlayBackStateDidChange:)
-                                                 name:MPMoviePlayerPlaybackStateDidChangeNotification
-                                               object:nil];
-    
-    
-    //获取主播状态通知（点播和普通播放不需要注册该通知）
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(anchorStatusChanged:)
-                                                 name:CNLiveAnchorStatusChangedNotification
-                                               object:nil];
+#pragma mark - UICollectionViewDelegate, UICollectionViewDataSource  !!!!!!!!!!!!!!!!!!!!!!!!!!!
+- (NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView {
+    return 1;
 }
-#pragma mark - 移除通知
-- (void)removeMovieNotificationObservers
-{
-    [[NSNotificationCenter defaultCenter]removeObserver:self
-                                                   name:MPMoviePlayerLoadStateDidChangeNotification
-                                                 object:nil];
-    [[NSNotificationCenter defaultCenter]removeObserver:self
-                                                   name:MPMoviePlayerPlaybackDidFinishNotification
-                                                 object:nil];
-    [[NSNotificationCenter defaultCenter]removeObserver:self
-                                                   name:MPMediaPlaybackIsPreparedToPlayDidChangeNotification
-                                                 object:nil];
-    [[NSNotificationCenter defaultCenter]removeObserver:self
-                                                   name:MPMoviePlayerPlaybackStateDidChangeNotification
-                                                 object:nil];
+- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section {
-    [[NSNotificationCenter defaultCenter]removeObserver:self
-                                                   name:CNLiveAnchorStatusChangedNotification
-                                                 object:nil];
-}
-
-#pragma mark - 通知 Action  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-//视频加载状态改变
-- (void)loadStateDidChange:(NSNotification *)notification
-{
-    if (_player) {
-        MPMovieLoadState loadState = _player.loadState;
-        if ((loadState & MPMovieLoadStatePlaythroughOK) != 0) {
-            
-            NSLog(@"loadStateDidChange: MPMovieLoadStatePlaythroughOK: %d\n", (int)loadState);
-            
-        } else if ((loadState & MPMovieLoadStateStalled) != 0) {
-            NSLog(@"loadStateDidChange: MPMovieLoadStateStalled: %d\n", (int)loadState);
-            
-        } else {
-            NSLog(@"loadStateDidChange: ???: %d\n", (int)loadState);
-        }
-    }
-}
-
-//视频播放错误及结束原因
-- (void)moviePlayBackDidFinish:(NSNotification *)notification
-{
-    if (_player) {
-        int reason = [[[notification userInfo] valueForKey:MPMoviePlayerPlaybackDidFinishReasonUserInfoKey] intValue];
-        if (MPMovieFinishReasonPlaybackError == reason) {
-            
-            
-        } else {
-            
-        }
-        
-        switch (reason)
-        {
-            case MPMovieFinishReasonPlaybackEnded:
-                NSLog(@"playbackStateDidChange: MPMovieFinishReasonPlaybackEnded: %d\n", reason);
-                break;
-                
-            case MPMovieFinishReasonUserExited:
-                NSLog(@"playbackStateDidChange: MPMovieFinishReasonUserExited: %d\n", reason);
-                break;
-                
-            case MPMovieFinishReasonPlaybackError:
-                NSLog(@"playbackStateDidChange: MPMovieFinishReasonPlaybackError: %d\n", reason);
-                break;
-                
-            default:
-                NSLog(@"playbackPlayBackDidFinish: ???: %d\n", reason);
-                break;
-        }
-    }
-}
-
-//视频缓冲至可播放状态
-- (void)mediaIsPreparedToPlayDidChange:(NSNotification *)notification
-{
-    if (_player) {
-        NSLog(@"isPreparedToPlay");
-        if (_loadingView) {
-            [_loadingView removeFromSuperview];
-        }
-    }
+    return 4;
 }
-//视频播放状态改变
-- (void)moviePlayBackStateDidChange:(NSNotification *)notification
-{
-    if (_player) {
-        
-        switch (_player.playbackState) {
-            case MPMoviePlaybackStateStopped: {
-                
-                NSLog(@"moviePlayBackStateDidChange : MPMoviePlaybackStateStopped");
-                break;
-            }
-            case MPMoviePlaybackStatePlaying: {
-                
-                NSLog(@"moviePlayBackStateDidChange : MPMoviePlaybackStatePlaying");
-                break;
-            }
-            case MPMoviePlaybackStatePaused:
-                
-                NSLog(@"moviePlayBackStateDidChange : MPMoviePlaybackStatePaused");
-                break;
-            case MPMoviePlaybackStateInterrupted:
-                
-                NSLog(@"moviePlayBackStateDidChange : MPMoviePlaybackStateInterrupted");
-                break;
-            case MPMoviePlaybackStateSeekingForward:
-                
-                NSLog(@"moviePlayBackStateDidChange : MPMoviePlaybackStateSeekingForward");
-                break;
-            case MPMoviePlaybackStateSeekingBackward:
-                
-                NSLog(@"moviePlayBackStateDidChange : MPMoviePlaybackStateSeekingBackward");
-                break;
-            default:
-        
-                NSLog(@"moviePlayBackStateDidChange : %ld", (long)_player.playbackState);
-                break;
-        }
-    }
+- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
+    
+    LVCUGCLivePlayerCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:cellId forIndexPath:indexPath];
+    
+    return cell;
 }
-
-
-//  获取主播状态通知
-- (void)anchorStatusChanged:(NSNotification *)notification
-{
-    if (_player.anchorStatus == 2) {  // 已结束
-        
-    }
-    _bgView.anchorStatus = _player.anchorStatus;
+- (void)scrollViewDidScroll:(UIScrollView *)scrollView {
+    
+    NSLog(@"一直");
 }
-//重新连接获取主播状态
-- (void)anchorStatusConnectFailed
-{
+- (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView {
+    NSLog(@"停止");
 }
-#pragma mark - getter
-- (LVCUGCPlayerLoadingView *)loadingView {
-    
-    if (!_loadingView) {
-        _loadingView = [[LVCUGCPlayerLoadingView alloc] initWithFrame:self.view.bounds bgImageURLStr:@""];
+
+#pragma mark - getMethod !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+- (UICollectionView *)collectionView {
+    
+    if (!_collectionView) {
+        UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init];
+        layout.minimumLineSpacing = 0;
+        layout.minimumInteritemSpacing = 0;
+        layout.itemSize = self.view.bounds.size;
+        _collectionView = [[UICollectionView alloc] initWithFrame:self.view.bounds collectionViewLayout:layout];
+        _collectionView.pagingEnabled = YES;
+        _collectionView.showsHorizontalScrollIndicator = NO;
+        _collectionView.dataSource = self;
+        _collectionView.delegate = self;
+        [_collectionView registerClass:[LVCUGCLivePlayerCell class] forCellWithReuseIdentifier:cellId];
     }
-    return _loadingView;
+    return _collectionView;
 }
 - (LVCUGCBackgroundView *)bgView {
     if (!_bgView) {
-        _bgView = [[LVCUGCBackgroundView alloc] init];
-        _bgView.backgroundColor = [UIColor whiteColor];
+        _bgView = [[LVCUGCBackgroundView alloc] initWithFrame:self.view.bounds];
         _bgView.hidden = YES;
     }
     return _bgView;
+//
+//  LVCUGCLivePlayerModel.h
+//  LiveVideoCloud
+//
+//  Created by cnliveJunBo on 17/3/28.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface LVCUGCLivePlayerModel : NSObject
+
+@end
+//
+//  LVCUGCLivePlayerModel.m
+//  LiveVideoCloud
+//
+//  Created by cnliveJunBo on 17/3/28.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "LVCUGCLivePlayerModel.h"
+
+@implementation LVCUGCLivePlayerModel
+
+@end
@@ -12,4 +12,6 @@
 @property (nonatomic, assign) int anchorStatus;     //设置主播状态
+@property (nonatomic, strong) UIButton *backButton;
+
 @end
@@ -16,8 +16,6 @@
 @property (nonatomic, strong) UILabel *playInfoLabel;
-@property (nonatomic, strong) UIButton *backButton;
-
 @end
 @implementation LVCUGCBackgroundView
@@ -27,6 +25,7 @@
 {
     self = [super initWithFrame:frame];
     if (self) {
+        self.backgroundColor = [UIColor whiteColor];
         [self addSubview:self.iconView];
         [self addSubview:self.nicknameLabel];
         [self addSubview:self.playInfoLabel];
@@ -66,7 +65,7 @@
         NSString *path = [[NSBundle mainBundle] pathForResource:@"头像" ofType:@"jpg"];
         UIImage *image = [UIImage imageWithContentsOfFile:path];
         _iconView = [[UIImageView alloc] initWithImage:image];
-        _iconView.frame = CGRectMake((SCREEN_WIDTH - 100) * 0.5, 200, 100, 100);
+        _iconView.frame = CGRectMake((SCREEN_WIDTH - 100) * 0.5, SCREEN_HEIGHT * 0.2, 100, 100);
         _iconView.layer.cornerRadius = 50;
         _iconView.layer.masksToBounds = YES;
     }
@@ -76,9 +75,9 @@
 - (UILabel *)nicknameLabel {
     if (!_nicknameLabel) {
-        _nicknameLabel = [[UILabel alloc] initWithFrame:CGRectMake((SCREEN_WIDTH - 100) * 0.5, 310, 100, 30)];
+        _nicknameLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, SCREEN_HEIGHT * 0.2 + 110, SCREEN_WIDTH, 30)];
         _nicknameLabel.textAlignment = NSTextAlignmentCenter;
-        _nicknameLabel.text = @"奥斯卡大家发你看";
+        _nicknameLabel.text = @"这是我的昵称哦";
     }
     return _nicknameLabel;
 }
@@ -86,9 +85,10 @@
 - (UILabel *)playInfoLabel {
     if (!_playInfoLabel) {
-        _playInfoLabel = [[UILabel alloc] initWithFrame:CGRectMake((SCREEN_WIDTH - 100) * 0.5, 350, 100, 50)];
+        _playInfoLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, SCREEN_HEIGHT * 0.5, SCREEN_WIDTH, 30)];
         _playInfoLabel.textAlignment = NSTextAlignmentCenter;
-        _playInfoLabel.font = [UIFont systemFontOfSize:18];
+        _playInfoLabel.font = [UIFont systemFontOfSize:22];
+        _playInfoLabel.textColor = [UIColor orangeColor];
     }
     return _playInfoLabel;
 }
@@ -97,12 +97,15 @@
     if (!_backButton) {
         _backButton = [UIButton buttonWithType:UIButtonTypeCustom];
-        _backButton.frame = CGRectMake((SCREEN_WIDTH - 200) * 0.5, 410, 200, 40);
+        _backButton.frame = CGRectMake(20, SCREEN_HEIGHT * 0.65, SCREEN_WIDTH - 40, 40);
         _backButton.layer.cornerRadius = 20;
         _backButton.layer.masksToBounds = YES;
-        _backButton.titleLabel.text = @"返回列表";
+        [_backButton setTitle:@"返回列表" forState:UIControlStateNormal];
         _backButton.titleLabel.textAlignment = NSTextAlignmentCenter;
-        _backButton.titleLabel.font = [UIFont systemFontOfSize:18];
+        _backButton.titleLabel.font = [UIFont systemFontOfSize:20];
+        _backButton.backgroundColor = [UIColor redColor];
+        [_backButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+        [_backButton setTitleColor:[UIColor blackColor] forState:UIControlStateHighlighted];
     }
     return _backButton;
 }
+//
+//  LVCUGCLivePlayerCell.h
+//  LiveVideoCloud
+//
+//  Created by cnliveJunBo on 17/3/28.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "LVCUGCPlayerLoadingView.h"
+
+@interface LVCUGCLivePlayerCell : UICollectionViewCell
+
+@property (nonatomic, strong) LVCUGCPlayerLoadingView *loadingView;
+
+@property (nonatomic, strong) CNLiveMoviePlayerController *player; // 播放器
+
+@end
+//
+//  LVCUGCLivePlayerCell.m
+//  LiveVideoCloud
+//
+//  Created by cnliveJunBo on 17/3/28.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "LVCUGCLivePlayerCell.h"
+
+@implementation LVCUGCLivePlayerCell
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        self.contentView.backgroundColor = [UIColor whiteColor];
+
+        [self installMovieNotificationObservers];
+        [self addSubview:self.loadingView];
+    }
+    return self;
+}
+
+#pragma mark - GetMethod !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+- (LVCUGCPlayerLoadingView *)loadingView {
+    
+    if (!_loadingView) {
+        _loadingView = [[LVCUGCPlayerLoadingView alloc] initWithFrame:self.contentView.bounds bgImageURLStr:@""];
+    }
+    return _loadingView;
+}
+
+- (CNLiveMoviePlayerController *)player {
+    
+    if (!_player) {
+        _player = [[CNLiveMoviePlayerController alloc] initLivePlayWithChannelId:@"iOStest"
+                                                                     authSuccess:^{
+                                                                         
+                                                                         _player.videoDecoderMode = CNLiveMovieVideoDecoderMode_AUTO;
+                                                                         _player.view.frame = self.contentView.bounds;
+                                                                         _player.shouldAutoplay = YES;
+                                                                         [_player prepareToPlay];
+                                                                         [self.contentView addSubview:_player.view];
+                                                                         [self.contentView sendSubviewToBack:_player.view];
+                                                                         
+                                                                     } authFailed:^(NSDictionary *errorInfo) {
+                                                                         NSLog(@"初始化直播播放器失败：%@", errorInfo);
+                                                                         
+                                                                         
+                                                                     } getAnchorStatusResult:^(BOOL result) {
+                                                                         
+                                                                         NSLog(@"-------------获取主播状态%d", result ? YES : NO);
+                                                                         
+                                                                     }];
+    }
+    return _player;
+}
+
+#pragma mark - 添加通知监听 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+-(void)installMovieNotificationObservers   //添加视频播放通知
+{
+    //视频加载状态改变
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(loadStateDidChange:)
+                                                 name:MPMoviePlayerLoadStateDidChangeNotification
+                                               object:nil];
+    
+    //视频播放错误及结束原因
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(moviePlayBackDidFinish:)
+                                                 name:MPMoviePlayerPlaybackDidFinishNotification
+                                               object:nil];
+    
+    //视频缓冲至可播放状态
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(mediaIsPreparedToPlayDidChange:)
+                                                 name:MPMediaPlaybackIsPreparedToPlayDidChangeNotification
+                                               object:nil];
+    
+    //视频播放状态改变
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(moviePlayBackStateDidChange:)
+                                                 name:MPMoviePlayerPlaybackStateDidChangeNotification
+                                               object:nil];
+    
+    
+    //获取主播状态通知（点播和普通播放不需要注册该通知）
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(anchorStatusChanged:)
+                                                 name:CNLiveAnchorStatusChangedNotification
+                                               object:nil];
+    
+}
+
+#pragma mark - 通知 Action  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+//视频加载状态改变
+- (void)loadStateDidChange:(NSNotification *)notification
+{
+    if (_player) {
+        MPMovieLoadState loadState = _player.loadState;
+        if ((loadState & MPMovieLoadStatePlaythroughOK) != 0) {
+            
+            NSLog(@"loadStateDidChange: MPMovieLoadStatePlaythroughOK: %d\n", (int)loadState);
+            
+        } else if ((loadState & MPMovieLoadStateStalled) != 0) {
+            NSLog(@"loadStateDidChange: MPMovieLoadStateStalled: %d\n", (int)loadState);
+            
+        } else {
+            NSLog(@"loadStateDidChange: ???: %d\n", (int)loadState);
+        }
+    }
+}
+
+//视频播放错误及结束原因
+- (void)moviePlayBackDidFinish:(NSNotification *)notification
+{
+    if (_player) {
+        int reason = [[[notification userInfo] valueForKey:MPMoviePlayerPlaybackDidFinishReasonUserInfoKey] intValue];
+        if (MPMovieFinishReasonPlaybackError == reason) {
+            
+            
+        } else {
+            
+        }
+        
+        switch (reason)
+        {
+            case MPMovieFinishReasonPlaybackEnded:
+                NSLog(@"playbackStateDidChange: MPMovieFinishReasonPlaybackEnded: %d\n", reason);
+                break;
+                
+            case MPMovieFinishReasonUserExited:
+                NSLog(@"playbackStateDidChange: MPMovieFinishReasonUserExited: %d\n", reason);
+                break;
+                
+            case MPMovieFinishReasonPlaybackError:
+                NSLog(@"playbackStateDidChange: MPMovieFinishReasonPlaybackError: %d\n", reason);
+                break;
+                
+            default:
+                NSLog(@"playbackPlayBackDidFinish: ???: %d\n", reason);
+                break;
+        }
+    }
+}
+
+//视频缓冲至可播放状态
+- (void)mediaIsPreparedToPlayDidChange:(NSNotification *)notification
+{
+    if (_player) {
+        NSLog(@"isPreparedToPlay");
+        //        if (_loadingView) {
+        //            [_loadingView removeFromSuperview];
+        //        }
+    }
+}
+
+//视频播放状态改变
+- (void)moviePlayBackStateDidChange:(NSNotification *)notification
+{
+    if (_player) {
+        
+        switch (_player.playbackState) {
+            case MPMoviePlaybackStateStopped: {
+                
+                NSLog(@"moviePlayBackStateDidChange : MPMoviePlaybackStateStopped");
+                break;
+            }
+            case MPMoviePlaybackStatePlaying: {
+                
+                NSLog(@"moviePlayBackStateDidChange : MPMoviePlaybackStatePlaying");
+                break;
+            }
+            case MPMoviePlaybackStatePaused:
+                
+                NSLog(@"moviePlayBackStateDidChange : MPMoviePlaybackStatePaused");
+                break;
+            case MPMoviePlaybackStateInterrupted:
+                
+                NSLog(@"moviePlayBackStateDidChange : MPMoviePlaybackStateInterrupted");
+                break;
+            case MPMoviePlaybackStateSeekingForward:
+                
+                NSLog(@"moviePlayBackStateDidChange : MPMoviePlaybackStateSeekingForward");
+                break;
+            case MPMoviePlaybackStateSeekingBackward:
+                
+                NSLog(@"moviePlayBackStateDidChange : MPMoviePlaybackStateSeekingBackward");
+                break;
+            default:
+                
+                NSLog(@"moviePlayBackStateDidChange : %ld", (long)_player.playbackState);
+                break;
+        }
+    }
+}
+
+
+
+//  获取主播状态通知
+- (void)anchorStatusChanged:(NSNotification *)notification
+{
+    if (_player.anchorStatus == 2) {  // 已结束
+        
+    }
+//    _bgView.anchorStatus = _player.anchorStatus;
+}
+
+//重新连接获取主播状态
+- (void)anchorStatusConnectFailed
+{
+    
+}
+
+#pragma mark - 移除通知   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+- (void)removeMovieNotificationObservers
+{
+    [[NSNotificationCenter defaultCenter]removeObserver:self
+                                                   name:MPMoviePlayerLoadStateDidChangeNotification
+                                                 object:nil];
+    [[NSNotificationCenter defaultCenter]removeObserver:self
+                                                   name:MPMoviePlayerPlaybackDidFinishNotification
+                                                 object:nil];
+    [[NSNotificationCenter defaultCenter]removeObserver:self
+                                                   name:MPMediaPlaybackIsPreparedToPlayDidChangeNotification
+                                                 object:nil];
+    [[NSNotificationCenter defaultCenter]removeObserver:self
+                                                   name:MPMoviePlayerPlaybackStateDidChangeNotification
+                                                 object:nil];
+    
+    [[NSNotificationCenter defaultCenter]removeObserver:self
+                                                   name:CNLiveAnchorStatusChangedNotification
+                                                 object:nil];
+}
+
+@end
@@ -24,6 +24,7 @@
 {
     self = [super initWithFrame:frame];
     if (self) {
+        self.backgroundColor = [UIColor whiteColor];
         _bgImageURLStr = bgImageURLStr;
         [self addSubview:self.bgImageView];
     }
@@ -23,3 +23,4 @@ CGFloat const kContentFont = 14.0;
 /** 详细内容字体字号 */
 CGFloat const kDetailContentFont = 12.0;
+
@@ -16,5 +16,4 @@
 /** 标题按钮重复点击的通知 */
 static NSString *const ZXTitleButtonDidRepeatClickNotification                    = @"ZXTitleButtonDidRepeatClickNotification";
-
 #endif /* NotificationMacro_h */
@@ -16,6 +16,7 @@
 /** 用户搜索信息key */
 static NSString *const UserInfoAllKeys                    = @"UserInfoAllKeys";
-
+/** 当前键盘监听者 */
+static NSString *const keyboard                    = @"keyboard";
 #endif /* UserDefaultKeyMacro_h */
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "iphone",
+      "filename" : "close.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "priToolBg.png",
+      "scale" : "1x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file