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

Conflicts: LiveVideoCloud/LiveVideoCloud.xcodeproj/project.pbxproj

Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud
Conflicts: LiveVideoCloud/LiveVideoCloud.xcodeproj/project.pbxproj
朱林
2 parents 1d5064a8 0782c6e7
Showing 88 changed files with 2777 additions and 216 deletions
LiveVideoCloud/LiveVideoCloud.xcodeproj/project.pbxproj
LiveVideoCloud/LiveVideoCloud/Classes/CNLiveSDK/CNLiveChatManager.framework/CNLiveChatManager
LiveVideoCloud/LiveVideoCloud/Classes/CNLiveSDK/CNLiveChatManager.framework/Headers/CNLiveChatManager.h
LiveVideoCloud/LiveVideoCloud/Classes/CNLiveSDK/CNLiveChatManager.framework/Headers/CNLiveChatMessage.h
LiveVideoCloud/LiveVideoCloud/Classes/CNLiveSDK/CNLiveChatManager.framework/Headers/CNLiveChatStatusDefine.h
LiveVideoCloud/LiveVideoCloud/Classes/CNLiveSDK/CNLiveChatManager.framework/Headers/CNLiveChatUserInfo.h
LiveVideoCloud/LiveVideoCloud/Classes/CNLiveSDK/CNLiveChatManager.framework/Info.plist
LiveVideoCloud/LiveVideoCloud/Classes/CNLiveSDK/CNLiveChatManager.framework/Modules/module.modulemap
LiveVideoCloud/LiveVideoCloud/Classes/CNLiveSDK/CNLiveMsgTools.framework/CNLiveMsgTools
LiveVideoCloud/LiveVideoCloud/Classes/CNLiveSDK/CNLiveMsgTools.framework/Headers/CNLiveMsgManager.h
LiveVideoCloud/LiveVideoCloud/Classes/CNLiveSDK/CNLiveMsgTools.framework/Info.plist
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/BottomToolView/BottomToolView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Chat/Barrage/CNBarrageManager.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Chat/Barrage/CNBarrageManager.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Chat/Barrage/CNBarrageView.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Chat/Barrage/CNBarrageView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Chat/ChatMsgModel/chatMsgModel.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Chat/ChatMsgModel/chatMsgModel.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Chat/ChatViews/chatListCell.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Chat/ChatViews/chatListCell.m
@@ -21,12 +21,8 @@
 		810B65071E779B1F00133E15 /* ViewController+MASAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 810B64FD1E779B1F00133E15 /* ViewController+MASAdditions.m */; };
 		810B650A1E77B39D00133E15 /* LVCFullScreenPlayerController.m in Sources */ = {isa = PBXBuildFile; fileRef = 810B65091E77B39D00133E15 /* LVCFullScreenPlayerController.m */; };
 		8112D4311E7927A5002E00F6 /* LVCPlayerLoadingView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8112D4301E7927A5002E00F6 /* LVCPlayerLoadingView.m */; };
-		811BB67A1E80F6F6005C6291 /* LVCChatView.m in Sources */ = {isa = PBXBuildFile; fileRef = 811BB6791E80F6F6005C6291 /* LVCChatView.m */; };
 		812E50531E7699DC004F5FCD /* CNLivePlayerSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 812E50501E7699DC004F5FCD /* CNLivePlayerSDK.framework */; };
-		812E50551E7699E9004F5FCD /* CNLiveMsgTools.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 812E504F1E7699DC004F5FCD /* CNLiveMsgTools.framework */; };
-		812E50561E7699E9004F5FCD /* CNLiveMsgTools.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 812E504F1E7699DC004F5FCD /* CNLiveMsgTools.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		812E50581E7699E9004F5FCD /* CNLivePlayerSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 812E50501E7699DC004F5FCD /* CNLivePlayerSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		814FC9661E7FB62F00944D7D /* LVCInputView.m in Sources */ = {isa = PBXBuildFile; fileRef = 814FC9651E7FB62F00944D7D /* LVCInputView.m */; };
 		81FB5B3C1E7A6FFC00F98E1D /* SevenSwitch.m in Sources */ = {isa = PBXBuildFile; fileRef = 81FB5B3B1E7A6FFC00F98E1D /* SevenSwitch.m */; };
 		D2029B861E6EAAA50027CD92 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = D2029B851E6EAAA50027CD92 /* main.m */; };
 		D2029B911E6EAAA50027CD92 /* animation.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D2029B901E6EAAA50027CD92 /* animation.xcassets */; };
@@ -133,6 +129,11 @@
 		D22830FC1E77C2D900627701 /* BottomToolView.m in Sources */ = {isa = PBXBuildFile; fileRef = D22830FB1E77C2D900627701 /* BottomToolView.m */; };
 		D22830FF1E77C69E00627701 /* GiftListView.m in Sources */ = {isa = PBXBuildFile; fileRef = D22830FE1E77C69E00627701 /* GiftListView.m */; };
 		D22831091E77D8D500627701 /* GiftModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D22831081E77D8D500627701 /* GiftModel.m */; };
+		D236967E1E7F9E4100E4BF71 /* GiftPayButton.m in Sources */ = {isa = PBXBuildFile; fileRef = D236967D1E7F9E4100E4BF71 /* GiftPayButton.m */; };
+		D23696841E7FC6A900E4BF71 /* chatListCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D23696831E7FC6A900E4BF71 /* chatListCell.m */; };
+		D236968D1E7FC7C200E4BF71 /* CNBarrageManager.m in Sources */ = {isa = PBXBuildFile; fileRef = D236968A1E7FC7C200E4BF71 /* CNBarrageManager.m */; };
+		D236968E1E7FC7C200E4BF71 /* CNBarrageView.m in Sources */ = {isa = PBXBuildFile; fileRef = D236968C1E7FC7C200E4BF71 /* CNBarrageView.m */; };
+		D23696921E7FC83800E4BF71 /* chatMsgModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D23696911E7FC83800E4BF71 /* chatMsgModel.m */; };
 		D25530001E7909AC00DF38A5 /* GiftAnimOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = D2552FFF1E7909AC00DF38A5 /* GiftAnimOperation.m */; };
 		D25530031E79115100DF38A5 /* AnimQueueManager.m in Sources */ = {isa = PBXBuildFile; fileRef = D25530021E79115100DF38A5 /* AnimQueueManager.m */; };
 		D25530061E7911A800DF38A5 /* GiftAnimationAction.m in Sources */ = {isa = PBXBuildFile; fileRef = D25530051E7911A800DF38A5 /* GiftAnimationAction.m */; };
@@ -150,6 +151,18 @@
 		D25BF87A1E7B8A82007FB138 /* FilterFunctionView.m in Sources */ = {isa = PBXBuildFile; fileRef = D25BF8771E7B8A82007FB138 /* FilterFunctionView.m */; };
 		D25BF87B1E7B8A82007FB138 /* SliderView.m in Sources */ = {isa = PBXBuildFile; fileRef = D25BF8791E7B8A82007FB138 /* SliderView.m */; };
 		D25BF87D1E7B8C78007FB138 /* KSYGPUResource.bundle in Resources */ = {isa = PBXBuildFile; fileRef = D25BF87C1E7B8C78007FB138 /* KSYGPUResource.bundle */; };
+		D25BF8801E7BD266007FB138 /* LVCUGCLivePlayerController.m in Sources */ = {isa = PBXBuildFile; fileRef = D25BF87F1E7BD266007FB138 /* LVCUGCLivePlayerController.m */; };
+		D25BF8831E7F775F007FB138 /* LVCUGCPlayerLoadingView.m in Sources */ = {isa = PBXBuildFile; fileRef = D25BF8821E7F775F007FB138 /* LVCUGCPlayerLoadingView.m */; };
+		D25BF8901E7F7F8F007FB138 /* UGCLoading.jpeg in Resources */ = {isa = PBXBuildFile; fileRef = D25BF88F1E7F7F8F007FB138 /* UGCLoading.jpeg */; };
+		D25BF8931E7FBAEA007FB138 /* LVCUGCBackgroundView.m in Sources */ = {isa = PBXBuildFile; fileRef = D25BF8921E7FBAEA007FB138 /* LVCUGCBackgroundView.m */; };
+		D25BF8971E7FE01B007FB138 /* CNLiveMsgTools.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D25BF8961E7FE01B007FB138 /* CNLiveMsgTools.framework */; };
+		D25BF8991E7FE033007FB138 /* CNLiveChatManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D25BF8981E7FE033007FB138 /* CNLiveChatManager.framework */; };
+		D25BF89A1E7FE046007FB138 /* CNLiveChatManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D25BF8981E7FE033007FB138 /* CNLiveChatManager.framework */; };
+		D25BF89B1E7FE046007FB138 /* CNLiveChatManager.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D25BF8981E7FE033007FB138 /* CNLiveChatManager.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		D25BF89C1E7FE049007FB138 /* CNLiveMsgTools.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D25BF8961E7FE01B007FB138 /* CNLiveMsgTools.framework */; };
+		D25BF89D1E7FE049007FB138 /* CNLiveMsgTools.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D25BF8961E7FE01B007FB138 /* CNLiveMsgTools.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		D25BF8A01E80C4BD007FB138 /* UIImage+LVCVagueImage.m in Sources */ = {isa = PBXBuildFile; fileRef = D25BF89F1E80C4BD007FB138 /* UIImage+LVCVagueImage.m */; };
+		D25BF8A31E80C4FC007FB138 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D25BF8A21E80C4FC007FB138 /* Accelerate.framework */; };
 		D2888D941E6EB8B4003A77C8 /* LVCTabBar.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888D931E6EB8B4003A77C8 /* LVCTabBar.m */; };
 		D2888D9E1E6EBF1B003A77C8 /* LVCLiveViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888D9B1E6EBF1B003A77C8 /* LVCLiveViewController.m */; };
 		D2888DB11E6EC05F003A77C8 /* TempViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888DB01E6EC05F003A77C8 /* TempViewController.m */; };
@@ -181,8 +194,9 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				812E50561E7699E9004F5FCD /* CNLiveMsgTools.framework in Embed Frameworks */,
 				812E50581E7699E9004F5FCD /* CNLivePlayerSDK.framework in Embed Frameworks */,
+				D25BF89B1E7FE046007FB138 /* CNLiveChatManager.framework in Embed Frameworks */,
+				D25BF89D1E7FE049007FB138 /* CNLiveMsgTools.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -223,12 +237,7 @@
 		810B65091E77B39D00133E15 /* LVCFullScreenPlayerController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCFullScreenPlayerController.m; sourceTree = "<group>"; };
 		8112D42F1E7927A5002E00F6 /* LVCPlayerLoadingView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCPlayerLoadingView.h; sourceTree = "<group>"; };
 		8112D4301E7927A5002E00F6 /* LVCPlayerLoadingView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCPlayerLoadingView.m; sourceTree = "<group>"; };
-		811BB6781E80F6F6005C6291 /* LVCChatView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCChatView.h; sourceTree = "<group>"; };
-		811BB6791E80F6F6005C6291 /* LVCChatView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCChatView.m; sourceTree = "<group>"; };
-		812E504F1E7699DC004F5FCD /* CNLiveMsgTools.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveMsgTools.framework; sourceTree = "<group>"; };
 		812E50501E7699DC004F5FCD /* CNLivePlayerSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLivePlayerSDK.framework; sourceTree = "<group>"; };
-		814FC9641E7FB62F00944D7D /* LVCInputView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCInputView.h; sourceTree = "<group>"; };
-		814FC9651E7FB62F00944D7D /* LVCInputView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCInputView.m; sourceTree = "<group>"; };
 		81FB5B3A1E7A6FFC00F98E1D /* SevenSwitch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SevenSwitch.h; sourceTree = "<group>"; };
 		81FB5B3B1E7A6FFC00F98E1D /* SevenSwitch.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SevenSwitch.m; sourceTree = "<group>"; };
 		D2029B811E6EAAA50027CD92 /* LiveVideoCloud.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = LiveVideoCloud.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -447,8 +456,8 @@
 		D217A2471E7B76C7003B44CB /* PresentView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PresentView.m; sourceTree = "<group>"; };
 		D217A2481E7B76C7003B44CB /* PresentViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PresentViewCell.h; sourceTree = "<group>"; };
 		D217A2491E7B76C7003B44CB /* PresentViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PresentViewCell.m; sourceTree = "<group>"; };
-		D217A24C1E7B77C7003B44CB /* ComboCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ComboCell.h; sourceTree = "<group>"; };
-		D217A24D1E7B77C7003B44CB /* ComboCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ComboCell.m; sourceTree = "<group>"; };
+		D217A24C1E7B77C7003B44CB /* ComboCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ComboCell.h; path = Present/ComboCell.h; sourceTree = "<group>"; };
+		D217A24D1E7B77C7003B44CB /* ComboCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ComboCell.m; path = Present/ComboCell.m; sourceTree = "<group>"; };
 		D22830EF1E778C0F00627701 /* LiveBaseView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LiveBaseView.h; sourceTree = "<group>"; };
 		D22830F01E778C0F00627701 /* LiveBaseView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LiveBaseView.m; sourceTree = "<group>"; };
 		D22830FA1E77C2D900627701 /* BottomToolView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BottomToolView.h; sourceTree = "<group>"; };
@@ -457,6 +466,16 @@
 		D22830FE1E77C69E00627701 /* GiftListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GiftListView.m; sourceTree = "<group>"; };
 		D22831071E77D8D500627701 /* GiftModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GiftModel.h; sourceTree = "<group>"; };
 		D22831081E77D8D500627701 /* GiftModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GiftModel.m; sourceTree = "<group>"; };
+		D236967C1E7F9E4100E4BF71 /* GiftPayButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GiftPayButton.h; sourceTree = "<group>"; };
+		D236967D1E7F9E4100E4BF71 /* GiftPayButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GiftPayButton.m; sourceTree = "<group>"; };
+		D23696821E7FC6A900E4BF71 /* chatListCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = chatListCell.h; sourceTree = "<group>"; };
+		D23696831E7FC6A900E4BF71 /* chatListCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = chatListCell.m; sourceTree = "<group>"; };
+		D23696891E7FC7C200E4BF71 /* CNBarrageManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNBarrageManager.h; sourceTree = "<group>"; };
+		D236968A1E7FC7C200E4BF71 /* CNBarrageManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNBarrageManager.m; sourceTree = "<group>"; };
+		D236968B1E7FC7C200E4BF71 /* CNBarrageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNBarrageView.h; sourceTree = "<group>"; };
+		D236968C1E7FC7C200E4BF71 /* CNBarrageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNBarrageView.m; sourceTree = "<group>"; };
+		D23696901E7FC83800E4BF71 /* chatMsgModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = chatMsgModel.h; sourceTree = "<group>"; };
+		D23696911E7FC83800E4BF71 /* chatMsgModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = chatMsgModel.m; sourceTree = "<group>"; };
 		D2552FFE1E7909AC00DF38A5 /* GiftAnimOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GiftAnimOperation.h; sourceTree = "<group>"; };
 		D2552FFF1E7909AC00DF38A5 /* GiftAnimOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GiftAnimOperation.m; sourceTree = "<group>"; };
 		D25530011E79115100DF38A5 /* AnimQueueManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AnimQueueManager.h; sourceTree = "<group>"; };
@@ -489,6 +508,18 @@
 		D25BF8781E7B8A82007FB138 /* SliderView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SliderView.h; sourceTree = "<group>"; };
 		D25BF8791E7B8A82007FB138 /* SliderView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SliderView.m; sourceTree = "<group>"; };
 		D25BF87C1E7B8C78007FB138 /* KSYGPUResource.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = KSYGPUResource.bundle; sourceTree = "<group>"; };
+		D25BF87E1E7BD266007FB138 /* LVCUGCLivePlayerController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLivePlayerController.h; sourceTree = "<group>"; };
+		D25BF87F1E7BD266007FB138 /* LVCUGCLivePlayerController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLivePlayerController.m; sourceTree = "<group>"; };
+		D25BF8811E7F775F007FB138 /* LVCUGCPlayerLoadingView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCPlayerLoadingView.h; sourceTree = "<group>"; };
+		D25BF8821E7F775F007FB138 /* LVCUGCPlayerLoadingView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCPlayerLoadingView.m; sourceTree = "<group>"; };
+		D25BF88F1E7F7F8F007FB138 /* UGCLoading.jpeg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = UGCLoading.jpeg; sourceTree = "<group>"; };
+		D25BF8911E7FBAEA007FB138 /* LVCUGCBackgroundView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCBackgroundView.h; sourceTree = "<group>"; };
+		D25BF8921E7FBAEA007FB138 /* LVCUGCBackgroundView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCBackgroundView.m; sourceTree = "<group>"; };
+		D25BF8961E7FE01B007FB138 /* CNLiveMsgTools.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveMsgTools.framework; sourceTree = "<group>"; };
+		D25BF8981E7FE033007FB138 /* CNLiveChatManager.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveChatManager.framework; sourceTree = "<group>"; };
+		D25BF89E1E80C4BD007FB138 /* UIImage+LVCVagueImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImage+LVCVagueImage.h"; sourceTree = "<group>"; };
+		D25BF89F1E80C4BD007FB138 /* UIImage+LVCVagueImage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImage+LVCVagueImage.m"; sourceTree = "<group>"; };
+		D25BF8A21E80C4FC007FB138 /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = System/Library/Frameworks/Accelerate.framework; sourceTree = SDKROOT; };
 		D2888D921E6EB8B4003A77C8 /* LVCTabBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCTabBar.h; sourceTree = "<group>"; };
 		D2888D931E6EB8B4003A77C8 /* LVCTabBar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCTabBar.m; sourceTree = "<group>"; };
 		D2888D9A1E6EBF1B003A77C8 /* LVCLiveViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCLiveViewController.h; sourceTree = "<group>"; };
@@ -506,9 +537,13 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				D25BF8A31E80C4FC007FB138 /* Accelerate.framework in Frameworks */,
 				D2575C7D1E76A4F300E3A8FC /* NHGiftAnimtionSDK.a in Frameworks */,
 				812E50531E7699DC004F5FCD /* CNLivePlayerSDK.framework in Frameworks */,
-				812E50551E7699E9004F5FCD /* CNLiveMsgTools.framework in Frameworks */,
+				D25BF89A1E7FE046007FB138 /* CNLiveChatManager.framework in Frameworks */,
+				D25BF8971E7FE01B007FB138 /* CNLiveMsgTools.framework in Frameworks */,
+				D25BF8991E7FE033007FB138 /* CNLiveChatManager.framework in Frameworks */,
+				D25BF89C1E7FE049007FB138 /* CNLiveMsgTools.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -572,24 +607,14 @@
 		812E504E1E7699B9004F5FCD /* CNLiveSDK */ = {
 			isa = PBXGroup;
 			children = (
+				D25BF8981E7FE033007FB138 /* CNLiveChatManager.framework */,
+				D25BF8961E7FE01B007FB138 /* CNLiveMsgTools.framework */,
 				D25BF87C1E7B8C78007FB138 /* KSYGPUResource.bundle */,
-				812E504F1E7699DC004F5FCD /* CNLiveMsgTools.framework */,
 				812E50501E7699DC004F5FCD /* CNLivePlayerSDK.framework */,
 			);
 			path = CNLiveSDK;
 			sourceTree = "<group>";
 		};
-		814FC9531E7F6B5D00944D7D /* ChatView */ = {
-			isa = PBXGroup;
-			children = (
-				814FC9641E7FB62F00944D7D /* LVCInputView.h */,
-				814FC9651E7FB62F00944D7D /* LVCInputView.m */,
-				811BB6781E80F6F6005C6291 /* LVCChatView.h */,
-				811BB6791E80F6F6005C6291 /* LVCChatView.m */,
-			);
-			path = ChatView;
-			sourceTree = "<group>";
-		};
 		81FB5B391E7A6FFC00F98E1D /* SevenSwitch */ = {
 			isa = PBXGroup;
 			children = (
@@ -606,6 +631,7 @@
 				D2029B9D1E6EAAA50027CD92 /* LiveVideoCloudTests */,
 				D2029BA81E6EAAA50027CD92 /* LiveVideoCloudUITests */,
 				D2029B821E6EAAA50027CD92 /* Products */,
+				D25BF8A11E80C4FC007FB138 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -627,7 +653,7 @@
 				D2029CDC1E6EAE2E0027CD92 /* UtilKits */,
 				D2029BD01E6EADE10027CD92 /* Classes */,
 				D2029CD11E6EADE70027CD92 /* HttpService */,
-				D2029CD71E6EAE140027CD92 /* Resource */,
+				D25BF88A1E7F7F77007FB138 /* Resource */,
 				D2029B901E6EAAA50027CD92 /* animation.xcassets */,
 				D2029CD61E6EADFB0027CD92 /* PrefixHeader.pch */,
 				D2029B841E6EAAA50027CD92 /* Supporting Files */,
@@ -1081,45 +1107,6 @@
 			path = HttpService;
 			sourceTree = "<group>";
 		};
-		D2029CD71E6EAE140027CD92 /* Resource */ = {
-			isa = PBXGroup;
-			children = (
-				D2029CD81E6EAE140027CD92 /* Fonts */,
-				D2029CD91E6EAE140027CD92 /* Images */,
-				D2029CDA1E6EAE140027CD92 /* Sound */,
-				D2029CDB1E6EAE140027CD92 /* Videos */,
-			);
-			path = Resource;
-			sourceTree = "<group>";
-		};
-		D2029CD81E6EAE140027CD92 /* Fonts */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = Fonts;
-			sourceTree = "<group>";
-		};
-		D2029CD91E6EAE140027CD92 /* Images */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = Images;
-			sourceTree = "<group>";
-		};
-		D2029CDA1E6EAE140027CD92 /* Sound */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = Sound;
-			sourceTree = "<group>";
-		};
-		D2029CDB1E6EAE140027CD92 /* Videos */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = Videos;
-			sourceTree = "<group>";
-		};
 		D2029CDC1E6EAE2E0027CD92 /* UtilKits */ = {
 			isa = PBXGroup;
 			children = (
@@ -1151,6 +1138,8 @@
 				D2029CE91E6EAE2E0027CD92 /* UILabel+labelFitSize.m */,
 				D2029CEA1E6EAE2E0027CD92 /* UIView+Extension.h */,
 				D2029CEB1E6EAE2E0027CD92 /* UIView+Extension.m */,
+				D25BF89E1E80C4BD007FB138 /* UIImage+LVCVagueImage.h */,
+				D25BF89F1E80C4BD007FB138 /* UIImage+LVCVagueImage.m */,
 			);
 			path = Category;
 			sourceTree = "<group>";
@@ -1221,8 +1210,6 @@
 				D217A2471E7B76C7003B44CB /* PresentView.m */,
 				D217A2481E7B76C7003B44CB /* PresentViewCell.h */,
 				D217A2491E7B76C7003B44CB /* PresentViewCell.m */,
-				D217A24C1E7B77C7003B44CB /* ComboCell.h */,
-				D217A24D1E7B77C7003B44CB /* ComboCell.m */,
 			);
 			path = Present;
 			sourceTree = "<group>";
@@ -1232,6 +1219,8 @@
 			children = (
 				D22830FD1E77C69E00627701 /* GiftListView.h */,
 				D22830FE1E77C69E00627701 /* GiftListView.m */,
+				D236967C1E7F9E4100E4BF71 /* GiftPayButton.h */,
+				D236967D1E7F9E4100E4BF71 /* GiftPayButton.m */,
 			);
 			path = GiftViews;
 			sourceTree = "<group>";
@@ -1239,6 +1228,8 @@
 		D22830F61E77C26C00627701 /* Chat */ = {
 			isa = PBXGroup;
 			children = (
+				D23696881E7FC7C200E4BF71 /* Barrage */,
+				D236968F1E7FC83800E4BF71 /* ChatMsgModel */,
 				D22830F71E77C27A00627701 /* ChatViews */,
 			);
 			path = Chat;
@@ -1247,6 +1238,8 @@
 		D22830F71E77C27A00627701 /* ChatViews */ = {
 			isa = PBXGroup;
 			children = (
+				D23696821E7FC6A900E4BF71 /* chatListCell.h */,
+				D23696831E7FC6A900E4BF71 /* chatListCell.m */,
 			);
 			path = ChatViews;
 			sourceTree = "<group>";
@@ -1276,6 +1269,26 @@
 			path = GiftModel;
 			sourceTree = "<group>";
 		};
+		D23696881E7FC7C200E4BF71 /* Barrage */ = {
+			isa = PBXGroup;
+			children = (
+				D23696891E7FC7C200E4BF71 /* CNBarrageManager.h */,
+				D236968A1E7FC7C200E4BF71 /* CNBarrageManager.m */,
+				D236968B1E7FC7C200E4BF71 /* CNBarrageView.h */,
+				D236968C1E7FC7C200E4BF71 /* CNBarrageView.m */,
+			);
+			path = Barrage;
+			sourceTree = "<group>";
+		};
+		D236968F1E7FC83800E4BF71 /* ChatMsgModel */ = {
+			isa = PBXGroup;
+			children = (
+				D23696901E7FC83800E4BF71 /* chatMsgModel.h */,
+				D23696911E7FC83800E4BF71 /* chatMsgModel.m */,
+			);
+			path = ChatMsgModel;
+			sourceTree = "<group>";
+		};
 		D2575C431E76846900E3A8FC /* InteractionSections */ = {
 			isa = PBXGroup;
 			children = (
@@ -1307,6 +1320,8 @@
 			isa = PBXGroup;
 			children = (
 				D217A2441E7B76C7003B44CB /* Present */,
+				D217A24C1E7B77C7003B44CB /* ComboCell.h */,
+				D217A24D1E7B77C7003B44CB /* ComboCell.m */,
 				D25530041E7911A800DF38A5 /* GiftAnimationAction.h */,
 				D25530051E7911A800DF38A5 /* GiftAnimationAction.m */,
 				D25530011E79115100DF38A5 /* AnimQueueManager.h */,
@@ -1360,6 +1375,54 @@
 			path = View;
 			sourceTree = "<group>";
 		};
+		D25BF88A1E7F7F77007FB138 /* Resource */ = {
+			isa = PBXGroup;
+			children = (
+				D25BF88C1E7F7F77007FB138 /* Images */,
+				D25BF88B1E7F7F77007FB138 /* Fonts */,
+				D25BF88D1E7F7F77007FB138 /* Sound */,
+				D25BF88E1E7F7F77007FB138 /* Videos */,
+			);
+			path = Resource;
+			sourceTree = "<group>";
+		};
+		D25BF88B1E7F7F77007FB138 /* Fonts */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = Fonts;
+			sourceTree = "<group>";
+		};
+		D25BF88C1E7F7F77007FB138 /* Images */ = {
+			isa = PBXGroup;
+			children = (
+				D25BF88F1E7F7F8F007FB138 /* UGCLoading.jpeg */,
+			);
+			path = Images;
+			sourceTree = "<group>";
+		};
+		D25BF88D1E7F7F77007FB138 /* Sound */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = Sound;
+			sourceTree = "<group>";
+		};
+		D25BF88E1E7F7F77007FB138 /* Videos */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = Videos;
+			sourceTree = "<group>";
+		};
+		D25BF8A11E80C4FC007FB138 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				D25BF8A21E80C4FC007FB138 /* Accelerate.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 		D2888D911E6EB897003A77C8 /* View */ = {
 			isa = PBXGroup;
 			children = (
@@ -1391,7 +1454,6 @@
 		D2888DA71E6EC014003A77C8 /* homeSections */ = {
 			isa = PBXGroup;
 			children = (
-				814FC9531E7F6B5D00944D7D /* ChatView */,
 				D2888DA81E6EC014003A77C8 /* Controller */,
 				D2888DA91E6EC014003A77C8 /* Model */,
 				D2888DAA1E6EC014003A77C8 /* View */,
@@ -1408,6 +1470,8 @@
 				810B64E21E779AFE00133E15 /* LVCLivePlayerController.m */,
 				810B65081E77B39D00133E15 /* LVCFullScreenPlayerController.h */,
 				810B65091E77B39D00133E15 /* LVCFullScreenPlayerController.m */,
+				D25BF87E1E7BD266007FB138 /* LVCUGCLivePlayerController.h */,
+				D25BF87F1E7BD266007FB138 /* LVCUGCLivePlayerController.m */,
 			);
 			path = Controller;
 			sourceTree = "<group>";
@@ -1426,6 +1490,10 @@
 				810B64DF1E779AE900133E15 /* LVCPlayer.m */,
 				8112D42F1E7927A5002E00F6 /* LVCPlayerLoadingView.h */,
 				8112D4301E7927A5002E00F6 /* LVCPlayerLoadingView.m */,
+				D25BF8811E7F775F007FB138 /* LVCUGCPlayerLoadingView.h */,
+				D25BF8821E7F775F007FB138 /* LVCUGCPlayerLoadingView.m */,
+				D25BF8911E7FBAEA007FB138 /* LVCUGCBackgroundView.h */,
+				D25BF8921E7FBAEA007FB138 /* LVCUGCBackgroundView.m */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -1575,6 +1643,7 @@
 				D2029C971E6EADE10027CD92 /* Info.plist in Resources */,
 				D2575C7F1E76A4F300E3A8FC /* NHPlaneViews.xib in Resources */,
 				D2575C7B1E76A4F300E3A8FC /* NHCarViews.xib in Resources */,
+				D25BF8901E7F7F8F007FB138 /* UGCLoading.jpeg in Resources */,
 				D2029CC91E6EADE10027CD92 /* SVProgressHUD.bundle in Resources */,
 				D2575C801E76A4F300E3A8FC /* resource.bundle in Resources */,
 				D2029B941E6EAAA50027CD92 /* LaunchScreen.storyboard in Resources */,
@@ -1608,8 +1677,8 @@
 			files = (
 				D2029CC31E6EADE10027CD92 /* UIImageView+HighlightedWebCache.m in Sources */,
 				D22830FF1E77C69E00627701 /* GiftListView.m in Sources */,
-				814FC9661E7FB62F00944D7D /* LVCInputView.m in Sources */,
 				D2029CC01E6EADE10027CD92 /* UIImage+GIF.m in Sources */,
+				D25BF8831E7F775F007FB138 /* LVCUGCPlayerLoadingView.m in Sources */,
 				D2029BCF1E6EADD70027CD92 /* ZXTabBarController.m in Sources */,
 				D2029D071E6EAE2E0027CD92 /* ZXConst.m in Sources */,
 				D2029CB81E6EADE10027CD92 /* SDImageCache.m in Sources */,
@@ -1617,14 +1686,15 @@
 				D2029CA71E6EADE10027CD92 /* MJRefreshAutoGifFooter.m in Sources */,
 				D2029CC11E6EADE10027CD92 /* UIImage+MultiFormat.m in Sources */,
 				D2029C861E6EADE10027CD92 /* Tools.m in Sources */,
+				D25BF8931E7FBAEA007FB138 /* LVCUGCBackgroundView.m in Sources */,
 				D2029CA01E6EADE10027CD92 /* NSObject+MJProperty.m in Sources */,
 				D2029CB51E6EADE10027CD92 /* SDiOSVersion.m in Sources */,
 				D2029C9C1E6EADE10027CD92 /* MJPropertyType.m in Sources */,
-				811BB67A1E80F6F6005C6291 /* LVCChatView.m in Sources */,
 				D22831091E77D8D500627701 /* GiftModel.m in Sources */,
 				D2029CCD1E6EADE10027CD92 /* SearchModel.m in Sources */,
 				810B65051E779B1F00133E15 /* NSLayoutConstraint+MASDebugAdditions.m in Sources */,
 				D2029CCB1E6EADE10027CD92 /* SVRadialGradientLayer.m in Sources */,
+				D23696841E7FC6A900E4BF71 /* chatListCell.m in Sources */,
 				D2029CAF1E6EADE10027CD92 /* MJRefreshStateHeader.m in Sources */,
 				D2029C941E6EADE10027CD92 /* UIRefreshControl+AFNetworking.m in Sources */,
 				D2029C911E6EADE10027CD92 /* UIButton+AFNetworking.m in Sources */,
@@ -1664,6 +1734,7 @@
 				D2575C4A1E7685DE00E3A8FC /* UIView+Bubbling.m in Sources */,
 				D2029CA61E6EADE10027CD92 /* MJRefreshHeader.m in Sources */,
 				D2029CC41E6EADE10027CD92 /* UIImageView+WebCache.m in Sources */,
+				D236967E1E7F9E4100E4BF71 /* GiftPayButton.m in Sources */,
 				D2029CC81E6EADE10027CD92 /* SVProgressAnimatedView.m in Sources */,
 				D2029C961E6EADE10027CD92 /* MBProgressHUD.m in Sources */,
 				810B65071E779B1F00133E15 /* ViewController+MASAdditions.m in Sources */,
@@ -1674,6 +1745,7 @@
 				D2029C981E6EADE10027CD92 /* MJExtensionConst.m in Sources */,
 				D2575C671E76A25400E3A8FC /* LVCInteractionController.m in Sources */,
 				D2029CAE1E6EADE10027CD92 /* MJRefreshNormalHeader.m in Sources */,
+				D23696921E7FC83800E4BF71 /* chatMsgModel.m in Sources */,
 				D2029C901E6EADE10027CD92 /* UIActivityIndicatorView+AFNetworking.m in Sources */,
 				D2029CC61E6EADE10027CD92 /* SSKeychain.m in Sources */,
 				D2029C8B1E6EADE10027CD92 /* AFURLResponseSerialization.m in Sources */,
@@ -1685,9 +1757,11 @@
 				D2029D041E6EAE2E0027CD92 /* UILabel+ContentSize.m in Sources */,
 				D25530031E79115100DF38A5 /* AnimQueueManager.m in Sources */,
 				D2029C871E6EADE10027CD92 /* AFHTTPSessionManager.m in Sources */,
+				D236968D1E7FC7C200E4BF71 /* CNBarrageManager.m in Sources */,
 				D2029B861E6EAAA50027CD92 /* main.m in Sources */,
 				D2029C8C1E6EADE10027CD92 /* AFURLSessionManager.m in Sources */,
 				D2029C9F1E6EADE10027CD92 /* NSObject+MJKeyValue.m in Sources */,
+				D25BF8A01E80C4BD007FB138 /* UIImage+LVCVagueImage.m in Sources */,
 				D2888DB11E6EC05F003A77C8 /* TempViewController.m in Sources */,
 				810B65021E779B1F00133E15 /* MASViewAttribute.m in Sources */,
 				D2029CAC1E6EADE10027CD92 /* MJRefreshBackStateFooter.m in Sources */,
@@ -1701,6 +1775,7 @@
 				D2029BCA1E6EADD70027CD92 /* BaseModel.m in Sources */,
 				D25BF87B1E7B8A82007FB138 /* SliderView.m in Sources */,
 				810B65041E779B1F00133E15 /* NSArray+MASAdditions.m in Sources */,
+				D25BF8801E7BD266007FB138 /* LVCUGCLivePlayerController.m in Sources */,
 				D2029D031E6EAE2E0027CD92 /* UIImage+ZXExtension.m in Sources */,
 				D2029D0A1E6EAE2E0027CD92 /* ZXServerUrl.m in Sources */,
 				D2029CCA1E6EADE10027CD92 /* SVProgressHUD.m in Sources */,
@@ -1715,6 +1790,7 @@
 				D2029BCD1E6EADD70027CD92 /* BaseViewController.m in Sources */,
 				810B64E01E779AE900133E15 /* LVCPlayer.m in Sources */,
 				810B64FF1E779B1F00133E15 /* MASConstraint.m in Sources */,
+				D236968E1E7FC7C200E4BF71 /* CNBarrageView.m in Sources */,
 				D25BF87A1E7B8A82007FB138 /* FilterFunctionView.m in Sources */,
 				D2029D001E6EAE2E0027CD92 /* NSNumber+ScaleHeight.m in Sources */,
 				D2888D9E1E6EBF1B003A77C8 /* LVCLiveViewController.m in Sources */,
@@ -1924,6 +2000,7 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				INFOPLIST_FILE = LiveVideoCloudTests/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.zhangxu.LiveVideoCloudTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1936,6 +2013,7 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				INFOPLIST_FILE = LiveVideoCloudTests/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.zhangxu.LiveVideoCloudTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1947,6 +2025,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				INFOPLIST_FILE = LiveVideoCloudUITests/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.zhangxu.LiveVideoCloudUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1958,6 +2037,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				INFOPLIST_FILE = LiveVideoCloudUITests/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.zhangxu.LiveVideoCloudUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+//
+//  CNLiveChatManager.h
+//  CNLiveChatManager
+//
+//  Created by cnliveJunBo on 17/2/27.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "CNLiveChatUserInfo.h"
+#import "CNLiveChatStatusDefine.h"
+#import "CNLiveChatMessage.h"
+
+@protocol CNLiveChatManagerDelegate <NSObject>
+
+@optional
+/**
+ 连接状态的的监听器
+ 
+ @param status 网络连接状态码
+ */
+- (void)onConnectionStatusChanged:(CNLiveConnectionStatus)status;
+
+
+/**
+ 加入聊天室成功的监听
+ @param chatroomId 聊天室ID
+ */
+- (void)onChatRoomJoined:(NSString *)chatroomId;
+
+
+/*!
+ 加入聊天室失败的监听
+ 
+ @param chatroomId 聊天室ID
+ @param errorCode  加入失败的错误码
+ 
+ @discussion 如果错误码是CNLive_KICKED_FROM_CHATROOM或CNLive_CHATROOM_NOT_EXIST，则不会自动重新加入聊天室，App需要按照自己的逻辑处理。
+ */
+- (void)onChatRoomJoinFailed:(NSString *)chatroomId
+                   errorCode:(CNLiveChatErrorCode)errorCode;
+
+/**
+ 接收消息监听
+
+ @param message 消息实体类型对象(包括消息内容,消息ID,会话类型,目标ID,发送者的用户信息)
+ */
+- (void)onReceived:(CNLiveChatMessage *)message;
+
+
+/**
+ 当前用户在其他设备上登录，此设备被踢下线。
+ */
+- (void)kickedByAnotherDevice;
+
+@end
+
+@interface CNLiveChatManager : NSObject
+
+/**
+ 聊天SDK代理,设置代理后,实现代理方法。
+ */
+@property (nonatomic, weak) id<CNLiveChatManagerDelegate> delegate;
+
+/**
+ 当前登录用户的用户信息
+ 
+ @discussion 用于与融云服务器建立连接之后，获取&设置当前用户的用户信息。
+ 用户ID不允许重新设置,只能设置昵称&头像。
+ */
+@property(nonatomic, strong) CNLiveChatUserInfo *currentUserInfo;
+
+/**
+ 获取SDK版本号
+ 
+ @return SDK版本号
+ */
++ (NSString *)getVersion;
+
+
+/**
+ 获取视讯聊天核心类单例
+ 
+ @return 视讯聊天核心类单例
+ 
+ @discussion 您可以通过此方法，获取视讯聊天的单例，访问对象中的属性和方法。
+ */
++ (instancetype)sharedCNLiveChatManager;
+
+
+/**
+ 初始化SDK方法
+
+ @param appKey 从视讯云平台获取到的appKey
+ @param appId  从视讯云平台获取到的appId
+ @warning      必传参数
+ @discussion   您在使用聊天SDK所有功能之前，您必须先调用此方法初始化SDK。
+               在App整个生命周期中，您只需要执行一次初始化。
+ */
+- (void)initWithAppKey:(NSString *)appKey appId:(NSString *)appId;
+
+
+/**
+ 连接到视讯云服务器
+
+ @param successBlock 连接建立成功的回调。
+ @param errorBlock   连接建立成功的回调,返回错误码。
+ 注:连接服务器成功后才能使用聊天功能(如:单聊、加入聊天室、聊天室内 聊天);
+ */
+- (void)connectServerSuccess:(void (^)())successBlock
+                       error:(void (^)(CNLiveChatConnectErrorCode errors))errorBlock;
+
+/**
+ 以用户信息登陆到视讯云服务器
+
+ @param userInfo     用户信息
+ @param successBlock 登陆成功的回调,返回登陆成功的用户ID。
+ @param errorBlock   登陆失败的回调,返回错误码。
+ 注:连接服务器成功后才能使用聊天功能(如:单聊、加入聊天室、聊天室内 聊天);
+ */
+- (void)loginServer:(CNLiveChatUserInfo *)userInfo
+                       success:(void (^)(NSString *userId))successBlock
+                         error:(void (^)(CNLiveChatConnectErrorCode errors))errorBlock;
+
+
+/**
+ 当前用户登出服务器
+ */
+- (void)logoutServer;
+
+
+/**
+ 断开与服务器的连接
+
+ @param isReceivePush 与服务器断开后,是否还接收远程推送
+ */
+- (void)disconnectServer:(BOOL)isReceivePush;
+
+
+/**
+ 加入已经存在的聊天室（如果不存在或超限会返回聊天室不存在错误23410 或 人数超限23411)
+
+ @param targetId     要加入的聊天室ID
+ @param messageCount 进入聊天室时获取历史消息的数量，-1<=messageCount<=50
+ -1表示不获取任何历史消息，0表示不特殊设置而使用SDK默认的设置（默认为获取10条），0<messageCount<=50为具体获取的消息数量,最大值为50。
+ @param successBlock 加入聊天室成功的回调,返回成功加入的聊天室ID。
+ @param errorBlock   加入聊天室失败的回调,返回错误码以及加入失败的聊天室ID。
+ */
+- (void)joinExistChatRoom:(NSString *)targetId
+          messageCount:(int)messageCount
+               success:(void (^)(NSString *targetId))successBlock
+                 error:(void (^)(CNLiveChatErrorCode errors, NSString *targetId))errorBlock;
+
+
+/**
+ 加入聊天室,若不存在自动创建聊天室
+
+ @param targetId     要加入的聊天室ID
+ @param messageCount 进入聊天室时获取历史消息的数量，-1<=messageCount<=50
+ -1表示不获取任何历史消息，0表示不特殊设置而使用SDK默认的设置（默认为获取10条），0<messageCount<=50为具体获取的消息数量,最大值为50。
+ @param successBlock 加入聊天室成功的回调,返回成功加入的聊天室ID
+ @param errorBlock   加入聊天室失败的回调,返回错误码以及加入失败的聊天室ID
+ */
+- (void)joinChatRoom:(NSString *)targetId
+        messageCount:(int)messageCount
+             success:(void (^)(NSString *targetId))successBlock
+               error:(void (^)(CNLiveChatErrorCode errors, NSString *targetId))errorBlock;
+
+
+/**
+ 退出聊天室
+
+ @param targetId     要退出的聊天室ID
+ @param successBlock 退出聊天室成功的回调,返回成功退出的聊天室ID
+ @param errorBlock   退出聊天室失败的回调,返回失败的错误码以及退出失败的聊天室的ID
+ */
+- (void)quitChatRoom:(NSString *)targetId
+         success:(void (^)(NSString *targetId))successBlock
+           error:(void (^)(CNLiveChatErrorCode errors, NSString *targetId))errorBlock;
+
+
+/**
+ 发送消息
+
+ @param message      消息内容
+ @param type         会话类型(私聊 / 聊天室)
+ @param targetId     会话目标ID(私聊:用户ID / 聊天室:聊天室ID)
+ @param successBlock 发送消息成功的回调,消息实体类型对象(包括消息内容,消息ID,会话类型,目标ID,发送者的用户信息)
+ @param errorBlock   发送消息失败的回调,返回错误码,消息ID,目标ID
+ */
+- (void)sendMessage:(NSString *)message
+               type:(CNLiveConversationType)type
+           targetId:(NSString *)targetId
+            success:(void (^)(CNLiveChatMessage *message))successBlock
+              error:(void (^)(CNLiveChatErrorCode errors, NSString *messageId, NSString *targetId))errorBlock;
+
+
+/**
+ 获取当前SDK的连接状态
+
+ @return 当前SDK的连接状态
+ */
+- (CNLiveConnectionStatus)getConnectionStatus;
+
+
+/**
+ 获取某个会话中指定数量的最新消息
+
+ @param conversationType 会话类型(私聊 / 聊天室)
+ @param targetId         会话目标ID(私聊:用户ID / 聊天室:聊天室ID)
+ @param count            所要获取的消息数量
+
+ @return 消息数组(CNLiveChatMessage类型)
+ @discussion
+ 此方法会获取该会话中指定数量的最新消息实体，返回的消息实体按照时间从新到旧排列。
+ 如果会话中的消息数量小于参数count的值，会将该会话中的所有消息返回。
+ */
+- (NSArray *)getLatestMessages:(CNLiveConversationType)conversationType
+                      targetId:(NSString *)targetId
+                         count:(int)count;
+
+
+@end
+//
+//  CNLiveChatMessage.h
+//  CNLiveChatManager
+//
+//  Created by cnliveJunBo on 17/3/3.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "CNLiveChatStatusDefine.h"
+#import "CNLiveChatUserInfo.h"
+
+@interface CNLiveChatMessage : NSObject
+
+/**
+ 会话类型(私聊 / 聊天室)
+ */
+@property (nonatomic, assign) CNLiveConversationType conversationType;
+
+/**
+ 目标ID(消息来自聊天室的ID / 接收者ID)
+ */
+@property (nonatomic, assign) NSString *targetId;
+
+/**
+ 消息ID(本地存储的消息的唯一值（数据库索引唯一值）)
+ */
+@property (nonatomic, assign) NSString *messageId;
+
+/**
+ 消息内容
+ */
+@property (nonatomic, strong) NSString *messageContent;
+
+/**
+ 发送者的用户信息(userId, name, portraitUri)
+ */
+@property (nonatomic, strong) CNLiveChatUserInfo *userInfo;
+
+/**
+ 消息的接收时间（Unix时间戳、毫秒）
+ */
+@property(nonatomic, assign) long long receivedTime;
+
+/**
+ 消息的发送时间（Unix时间戳、毫秒）
+ */
+@property(nonatomic, assign) long long sentTime;
+
+@end
+//
+//  CNLiveChatStatusDefine.h
+//  CNLiveChatManager
+//
+//  Created by cnliveJunBo on 17/3/1.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+#pragma mark - 错误码相关
+
+#pragma mark CNLiveChatConnectErrorCode - 建立连接返回的错误码
+/*!
+ 建立连接返回的错误码
+ 
+ @discussion
+ 开发者仅需要关注以下几种连接错误码，其余错误码SDK均会进行自动重连，开发者无须处理。
+ CNLive_CONN_ID_REJECT, CNLive_CONN_TOKEN_INCORRECT, CNLive_CONN_NOT_AUTHRORIZED,
+ CNLive_CONN_PACKAGE_NAME_INVALID, CNLive_CONN_APP_BLOCKED_OR_DELETED,
+ CNLive_CONN_USER_BLOCKED, CNLive_DISCONN_KICK, CNLive_CLIENT_NOT_INIT, CNLive_INVALID_PARAMETER, CNLive_INVALID_ARGUMENT
+ */
+typedef NS_ENUM(NSInteger, CNLiveChatConnectErrorCode) {
+    
+    /*!
+     连接已被释放
+     
+     @discussion 建立连接的临时错误码，SDK会做好自动重连，开发者无须处理。
+     */
+    CNLive_NET_CHANNEL_INVALID = 30001,
+    
+    /*!
+     连接不可用
+     
+     @discussion 建立连接的临时错误码，SDK会做好自动重连，开发者无须处理。
+     */
+    CNLive_NET_UNAVAILABLE = 30002,
+    
+    /*!
+     导航HTTP发送失败
+     
+     @discussion 建立连接的临时错误码，SDK会做好自动重连，开发者无须处理。
+     */
+    CNLive_NAVI_REQUEST_FAIL = 30004,
+    
+    /*!
+     导航HTTP请求失败
+     
+     @discussion 建立连接的临时错误码，SDK会做好自动重连，开发者无须处理。
+     */
+    CNLive_NAVI_RESPONSE_ERROR = 30007,
+    
+    /*!
+     导航HTTP返回数据格式错误
+     
+     @discussion 建立连接的临时错误码，SDK会做好自动重连，开发者无须处理。
+     */
+    CNLive_NODE_NOT_FOUND = 30008,
+    
+    /*!
+     创建Socket连接失败
+     
+     @discussion 建立连接的临时错误码，SDK会做好自动重连，开发者无须处理。
+     */
+    CNLive_SOCKET_NOT_CONNECTED = 30010,
+    
+    /*!
+     Socket断开
+     
+     @discussion 建立连接的临时错误码，SDK会做好自动重连，开发者无须处理。
+     */
+    CNLive_SOCKET_DISCONNECTED = 30011,
+    
+    /*!
+     PING失败
+     
+     @discussion 建立连接的临时错误码，SDK会做好自动重连，开发者无须处理。
+     */
+    CNLive_PING_SEND_FAIL = 30012,
+    
+    /*!
+     PING超时
+     
+     @discussion 建立连接的临时错误码，SDK会做好自动重连，开发者无须处理。
+     */
+    CNLive_PONG_RECV_FAIL = 30013,
+    
+    /*!
+     信令发送失败
+     
+     @discussion 建立连接的临时错误码，SDK会做好自动重连，开发者无须处理。
+     */
+    CNLive_MSG_SEND_FAIL = 30014,
+    
+    /*!
+     连接过于频繁
+     
+     @discussion 建立连接的临时错误码，SDK会做好自动重连，开发者无须处理。
+     */
+    CNLive_CONN_OVERFREQUENCY = 30015,
+    
+    /*!
+     连接ACK超时
+     
+     @discussion 建立连接的临时错误码，SDK会做好自动重连，开发者无须处理。
+     */
+    CNLive_CONN_ACK_TIMEOUT = 31000,
+    
+    /*!
+     信令版本错误
+     
+     @discussion 建立连接的临时错误码，SDK会做好自动重连，开发者无须处理。
+     */
+    CNLive_CONN_PROTO_VERSION_ERROR = 31001,
+    
+    /*!
+     AppKey错误
+     
+     @discussion 请检查您使用的AppKey是否正确。(*自行处理)
+     */
+    CNLive_CONN_ID_REJECT = 31002,
+    
+    /*!
+     服务器当前不可用（预留）
+     
+     @discussion 建立连接的临时错误码，SDK会做好自动重连，开发者无须处理。
+     */
+    CNLive_CONN_SERVER_UNAVAILABLE = 31003,
+    
+    /*!
+     Token无效
+     
+     @discussion Token无效一般有以下两种原因。(*自行处理)
+     一是token错误，请您检查客户端初始化使用的AppKey和您服务器获取token使用的AppKey是否一致；
+     二是token过期，是因为您在开发者后台设置了token过期时间，您需要请求您的服务器重新获取token并再次用新的token建立连接。
+     */
+    CNLive_CONN_TOKEN_INCORRECT = 31004,
+    
+    /*!
+     AppKey与Token不匹配
+     
+     @discussion
+     请检查您使用的AppKey与Token是否正确，是否匹配。一般有以下两种原因。(*自行处理)
+     一是token错误，请您检查客户端初始化使用的AppKey和您服务器获取token使用的AppKey是否一致；
+     二是token过期，是因为您在开发者后台设置了token过期时间，您需要请求您的服务器重新获取token并再次用新的token建立连接。
+     */
+    CNLive_CONN_NOT_AUTHRORIZED = 31005,
+    
+    /*!
+     连接重定向
+     
+     @discussion 建立连接的临时错误码，SDK会做好自动重连，开发者无须处理。
+     */
+    CNLive_CONN_REDIRECTED = 31006,
+    
+    /*!
+     BundleID不正确
+     
+     @discussion 请检查您App的BundleID是否正确。(*自行处理)
+     */
+    CNLive_CONN_PACKAGE_NAME_INVALID = 31007,
+    
+    /*!
+     AppKey被封禁或已删除
+     
+     @discussion 请检查您使用的AppKey是否正确。(*自行处理)
+     */
+    CNLive_CONN_APP_BLOCKED_OR_DELETED = 31008,
+    
+    /*!
+     用户被封禁
+     
+     @discussion 请检查您使用的Token是否正确，以及对应的UserId是否被封禁。(*自行处理)
+     */
+    CNLive_CONN_USER_BLOCKED = 31009,
+    
+    /*!
+     Token请求失败
+     
+     @discussion 请检查连接服务器方法的参数是否正确,特别是用户信息中的用户ID。也可能是无网络。(*自行处理)
+     */
+    CNLive_CONN_TOKEN_NULL = 31012,
+    
+    /*!
+     当前用户在其他设备上登陆，此设备被踢下线。(*自行处理)
+     */
+    CNLive_DISCONN_KICK = 31010,
+    
+    /*!
+     SDK没有初始化
+     
+     @discussion 在使用SDK任何功能之前，必须先Init。(*自行处理)
+     */
+    CNLive_CONN_CLIENT_NOT_INIT = 33001,
+    
+    /*!
+     开发者接口调用时传入的参数错误
+     
+     @discussion 请检查接口调用时传入的参数类型和值。(*自行处理)
+     */
+    CNLive_CONN_INVALID_PARAMETER = 33003,
+    
+    /*!
+     Connection已经存在
+     
+     @discussion
+     调用过connect之后，建议在token错误或者被踢下线或者用户logout的情况下才需要再次调用connect。SDK会自动重连，不需要应用多次调用connect来保证连接性。(*自行处理)
+     */
+    CNLive_CONNECTION_EXIST = 34001,
+    
+    /*!
+     Connection正在连接
+     
+     @discussion
+     Connection正在连接,此时不能再次做connect操作,稍后再做操作(*自行处理)
+     */
+    CNLive_CONNECTION_CONNING = 34002,
+    
+    /*!
+     开发者接口调用时传入的参数错误
+     
+     @discussion 请检查接口调用时传入的参数类型和值。(*自行处理)
+     */
+    CNLive_INVALID_ARGUMENT = -1000
+};
+
+#pragma mark CNLiveChatErrorCode - 具体业务错误码
+/*!
+ 具体业务错误码
+ */
+typedef NS_ENUM(NSInteger, CNLiveChatErrorCode) {
+    /*!
+     未知错误（预留）
+     */
+    CNLive_ERRORCODE_UNKNOWN = -1,
+    
+    /*!
+     token错误
+     */
+    CNLive_ERRORCODE_BY_TOKENERROR = 302,
+    
+    /*!
+     鉴权失败  此AppId无权加入此targetId的聊天室
+     */
+    CNLive_ERRORCODE_BY_AUTHENTICATIONERROR = 303,
+    
+    /*!
+    不合法的 targetId
+     */
+    CNLive_ERRORCODE_BY_TARGETIDERROR = 304,
+    
+    /*!
+     不合法的 会话类型 type
+     */
+    CNLive_ERRORCODE_BY_CONVERSATIONTYPEERROR = 305,
+    
+    /*!
+     已被对方加入黑名单
+     */
+    CNLive_REJECTED_BY_BLACKLIST = 405,
+    
+    /*!
+     超时
+     */
+    CNLive_ERRORCODE_TIMEOUT = 5004,
+    
+    /*!
+     发送消息频率过高，1秒钟最多只允许发送5条消息
+     */
+    CNLive_SEND_MSG_FREQUENCY_OVERRUN = 20604,
+    
+    /*!
+     不在该聊天室中
+     */
+    CNLive_NOT_IN_CHATROOM = 23406,
+    
+    /*!
+     在该聊天室中已被禁言
+     */
+    CNLive_FORBIDDEN_IN_CHATROOM = 23408,
+    
+    /*!
+     已被踢出聊天室
+     */
+    CNLive_KICKED_FROM_CHATROOM = 23409,
+    
+    /*!
+     聊天室不存在
+     */
+    CNLive_CHATROOM_NOT_EXIST = 23410,
+    
+    /*!
+     聊天室成员超限
+     */
+    CNLive_CHATROOM_IS_FULL = 23411,
+    
+    /*!
+     聊天室接口参数无效
+     */
+    CNLive_PARAMETER_INVALID_CHATROOM = 23412,
+    
+    /*!
+     聊天室云存储业务未开通
+     */
+    CNLive_ROAMING_SERVICE_UNAVAILABLE_CHATROOM = 23414,
+    
+    /*!
+     当前连接不可用（连接已经被释放）
+     */
+    CNLive_CHANNEL_INVALID = 30001,
+    
+    /*!
+     当前连接不可用
+     */
+    CNLive_NETWORK_UNAVAILABLE = 30002,
+    
+    /*!
+     消息响应超时
+     */
+    CNLive_MSG_RESPONSE_TIMEOUT = 30003,
+    
+    /*!
+     SDK没有初始化
+     
+     @discussion 在使用SDK任何功能之前，必须先Init。
+     */
+    CNLive_CLIENT_NOT_INIT = 33001,
+    
+    /*!
+     数据库错误
+     
+     @discussion 请检查您使用的Token和userId是否正确。
+     */
+    CNLive_DATABASE_ERROR = 33002,
+    
+    /*!
+     开发者接口调用时传入的参数错误
+     
+     @discussion 请检查接口调用时传入的参数类型和值。
+     */
+    CNLive_INVALID_PARAMETER = 33003,
+    
+    /*!
+     历史消息云存储业务未开通
+     */
+    CNLive_MSG_ROAMING_SERVICE_UNAVAILABLE = 33007,
+    
+    /*!
+     消息大小超限，消息体（序列化成json格式之后的内容）最大128k bytes。
+     */
+    CNLive_MSG_SIZE_OUT_OF_LIMIT = 30016
+};
+
+#pragma mark - 会话相关
+
+#pragma mark CNLiveConversationType - 会话类型
+/*!
+ 会话类型
+ */
+typedef NS_ENUM(NSUInteger, CNLiveConversationType) {
+    /*!
+     私聊
+     */
+    CNLive_ConversationType_PRIVATE = 1,
+    
+    /*!
+     聊天室
+     */
+    CNLive_ConversationType_CHATROOM = 4,
+};
+
+#pragma mark - 线上状态
+
+#pragma mark CNLiveConnectionStatus - 网络连接状态码
+/*!
+ 网络连接状态码
+ 
+ @discussion 开发者仅需要关注以下几种连接状态，其余状态SDK均会进行自动重连。
+ CNLive_ConnectionStatus_Connected, CNLive_ConnectionStatus_Connecting,
+ CNLive_ConnectionStatus_Unconnected,
+ CNLive_ConnectionStatus_SignUp, CNLive_ConnectionStatus_KICKED_OFFLINE_BY_OTHER_CLIENT,
+ CNLive_ConnectionStatus_TOKEN_INCORRECT
+ */
+typedef NS_ENUM(NSInteger, CNLiveConnectionStatus) {
+    /*!
+     未知状态
+     
+     @discussion 建立连接中出现异常的临时状态，SDK会做好自动重连，开发者无须处理。
+     */
+    CNLive_ConnectionStatus_UNKNOWN = -1,
+    
+    /*!
+     连接成功
+     */
+    CNLive_ConnectionStatus_Connected = 0,
+    
+    /*!
+     当前设备网络不可用
+     
+     @discussion 建立连接的临时状态，SDK会做好自动重连，开发者无须处理。
+     */
+    CNLive_ConnectionStatus_NETWORK_UNAVAILABLE = 1,
+    
+    /*!
+     当前设备切换到飞行模式
+     
+     @discussion 建立连接的临时状态，SDK会做好自动重连，开发者无须处理。
+     */
+    CNLive_ConnectionStatus_AIRPLANE_MODE = 2,
+    
+    /*!
+     当前设备切换到 2G（GPRS、EDGE）低速网络
+     
+     @discussion 建立连接的临时状态，SDK会做好自动重连，开发者无须处理。
+     */
+    CNLive_ConnectionStatus_Cellular_2G = 3,
+    
+    /*!
+     当前设备切换到 3G 或 4G 高速网络
+     
+     @discussion 建立连接的临时状态，SDK会做好自动重连，开发者无须处理。
+     */
+    CNLive_ConnectionStatus_Cellular_3G_4G = 4,
+    
+    /*!
+     当前设备切换到 WIFI 网络
+     
+     @discussion 建立连接的临时状态，SDK会做好自动重连，开发者无须处理。
+     */
+    CNLive_ConnectionStatus_WIFI = 5,
+    
+    /*!
+     当前用户在其他设备上登录，此设备被踢下线
+     */
+    CNLive_ConnectionStatus_KICKED_OFFLINE_BY_OTHER_CLIENT = 6,
+    
+    /*!
+     当前用户在 Web 端登录
+     
+     @discussion 建立连接的临时状态，SDK会做好自动重连，开发者无须处理。
+     */
+    CNLive_ConnectionStatus_LOGIN_ON_WEB = 7,
+    
+    /*!
+     服务器异常
+     
+     @discussion 建立连接的临时状态，SDK会做好自动重连，开发者无须处理。
+     */
+    CNLive_ConnectionStatus_SERVER_INVALID = 8,
+    
+    /*!
+     连接验证异常
+     
+     @discussion 建立连接的临时状态，SDK会做好自动重连，开发者无须处理。
+     */
+    CNLive_ConnectionStatus_VALIDATE_INVALID = 9,
+    
+    /*!
+     连接中
+     */
+    CNLive_ConnectionStatus_Connecting = 10,
+    
+    /*!
+     连接失败或未连接
+     */
+    CNLive_ConnectionStatus_Unconnected = 11,
+    
+    /*!
+     已注销
+     */
+    CNLive_ConnectionStatus_SignUp = 12,
+    
+    /*!
+     Token无效
+     
+     @discussion
+     Token无效一般有两种原因。一是token错误，请您检查客户端初始化使用的AppKey和您服务器获取token使用的AppKey是否一致；二是token过期，是因为您在开发者后台设置了token过期时间，您需要请求您的服务器重新获取token并再次用新的token建立连接。
+     */
+    CNLive_ConnectionStatus_TOKEN_INCORRECT = 31004,
+    
+    /*!
+     与服务器的连接已断开
+     
+     @discussion 建立连接的临时状态，SDK会做好自动重连，开发者无须处理。
+     */
+    CNLive_ConnectionStatus_DISCONN_EXCEPTION = 31011,
+    
+    /*!
+     与服务器的连接已断开
+     
+     @discussion 无法自动重连,需手动重新连接服务器connectServerSuccess:error:。
+     */
+    CNLive_ConnectionStatus_DISCONN_MANUALCONN = 32011
+};
+
+
+//
+//  CNLiveChatUserInfo.h
+//  CNLiveChatManager
+//
+//  Created by cnliveJunBo on 17/3/1.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface CNLiveChatUserInfo : NSObject
+
+/*!
+ 用户ID(一旦以一个用户ID连接到服务器,就不能再修改用户ID了,如果修改也会被忽略)
+ */
+@property(nonatomic, strong, readonly) NSString *userId;
+
+/*!
+ 用户名称
+ */
+@property(nonatomic, strong) NSString *name;
+
+/*!
+ 用户头像的URL
+ */
+@property(nonatomic, strong) NSString *portraitUri;
+
+/*!
+ 用户信息的初始化方法,
+ 
+ @param userId      用户ID
+ @param username    用户名称
+ @param portrait    用户头像的URL
+ @return            用户信息对象
+ */
+- (instancetype)initWithUserId:(NSString *)userId
+                          name:(NSString *)username
+                      portrait:(NSString *)portrait;
+
+@end
+framework module CNLiveChatManager {
+  umbrella header "CNLiveChatManager.h"
+
+  export *
+  module * { export * }
+}
@@ -17,9 +17,8 @@
 + (instancetype)sharedCNLiveMsgManager;
-- (void)setToolsInfoWithInfoId:(NSString *)infoId
-                      infoName:(NSString *)infoName
-                       infoUrl:(NSString *)infoUrl;
+- (void)setToolsInfoWithInfoName:(NSString *)infoName
+                         infoUrl:(NSString *)infoUrl;
 - (NSDictionary *)getToolsInfo;
@@ -72,8 +71,8 @@
 - (void)sendCarrier:(NSString *)carrier
                type:(NSInteger)type
            targetId:(NSString *)targetId
-            success:(void (^)(NSString *carrier, NSString *targetId, NSInteger type, NSString *infoId, NSString *infoName, NSString *infoUrl))successBlock
-              error:(void (^)(NSInteger errors, NSString *targetId, NSInteger type))errorBlock;
+            success:(void (^)(NSString *carrier, NSString *messageId, NSString *targetId, NSInteger type, NSString *infoId, NSString *infoName, NSString *infoUrl, long long goTime, long long comeTime))successBlock
+              error:(void (^)(NSInteger errors, NSString *messageId, NSString *targetId))errorBlock;
 - (NSInteger)getOnLineStatus;
@@ -31,12 +31,16 @@
 #pragma mark - buttonClick
 - (void)chatAction
 {
-    
+    if ([self.delegate respondsToSelector:@selector(bottomActionWithType:)]) {
+        [self.delegate bottomActionWithType:BtnClickTypeChat];
+    }
 }
 - (void)privateChatAction
 {
-    
+    if ([self.delegate respondsToSelector:@selector(bottomActionWithType:)]) {
+        [self.delegate bottomActionWithType:BtnClickTypePriChat];
+    }
 }
 - (void)giftAction
+//
+//  CNBarrageManager.h
+//  personalXmppChatDemo
+//
+//  Created by 张旭 on 2016/12/10.
+//  Copyright © 2016年 cnlive. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@class CNBarrageView;
+@class chatMsgModel;
+@interface CNBarrageManager : NSObject
+
+@property (nonatomic, copy) void(^generateBarrageBlock)(CNBarrageView *view);//生成弹幕View回调
+@property (nonatomic) BOOL isStopBarrage;//是否关闭了弹幕
+/**
+ 开始弹幕根据新消息数组
+ 
+ @param newBarrageArray 新消息数组
+ */
+- (void)startBarrageWithNewArray:(NSMutableArray <chatMsgModel *>*)newBarrageArray;
+
+/**
+ 停止弹幕
+ */
+- (void)stopBarrage;
+
+
+
+@end
+//
+//  CNBarrageManager.m
+//  personalXmppChatDemo
+//
+//  Created by 张旭 on 2016/12/10.
+//  Copyright © 2016年 cnlive. All rights reserved.
+//
+
+#import "CNBarrageManager.h"
+#import "CNBarrageView.h"
+#import "chatMsgModel.h"
+
+#define MAX_OVERLAP_COUNT 100
+
+@interface CNBarrageManager ()
+
+@property (nonatomic, strong) NSMutableArray *_Nullable allComments;//所有评论
+@property (nonatomic, strong) NSMutableArray *_Nullable tmpComments;//临时评论
+@property (nonatomic ,strong) NSMutableArray *_Nullable barrageQueue;//评论管理队列数组
+@property (nonatomic ,strong) NSMutableArray *_Nullable trajectoryArr;//弹幕轨迹数组
+
+@property BOOL isStarted;//标记是否开始弹幕
+@property BOOL isStopAnimation;//标记是否停止弹幕
+
+@end
+
+@implementation CNBarrageManager
+
+/**
+ 开始弹幕根据新消息数组
+ 
+ @param newBarrageArray 新消息数组
+ */
+- (void)startBarrageWithNewArray:(NSMutableArray <chatMsgModel *>*)newBarrageArray
+{
+    if (self.isStopAnimation && _isStopBarrage) {
+        return;
+    }
+    [self.allComments addObjectsFromArray:newBarrageArray];
+
+    [self startBarrage];
+}
+
+/**
+ 开始弹幕
+ */
+- (void)startBarrage
+{
+    if (self.tmpComments.count == 0) {
+        [self.tmpComments addObjectsFromArray:self.allComments];
+        [self.allComments removeAllObjects];
+    }
+    
+    self.isStarted = YES;
+    self.isStopAnimation = NO;
+    [self initBarrageCommentView];
+}
+
+/**
+ 停止弹幕
+ */
+- (void)stopBarrage
+{
+    self.isStopAnimation = YES;
+
+    [self.barrageQueue enumerateObjectsUsingBlock:^(id  _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+        CNBarrageView *view = obj;
+        [view stopAnimation];
+        view = nil;
+        self.tmpComments = nil;
+        self.allComments = nil;
+        self.trajectoryArr = nil;
+    }];
+    self.barrageQueue = nil;
+}
+
+/**
+ 初始化弹幕的评论View
+ */
+- (void)initBarrageCommentView
+{
+    if(self.isStopAnimation)return;
+    //初始化轨道位置随机
+    long count = self.tmpComments.count;
+    for (int i = 0; i < count; i ++) {
+        chatMsgModel *model = [self.tmpComments firstObject];
+        NSString *comment = model.content;
+        NSString *userName = model.name;
+        if (comment) {
+            [self.tmpComments removeObjectAtIndex:0];
+            //根据当前未发送弹幕数量生成轨迹
+            NSString *trajectory;
+            if (self.tmpComments.count > MAX_OVERLAP_COUNT)
+            {//数量较多轨迹可重叠
+                trajectory = [self trajectoryOverlap:YES];
+            }else
+            {//数量较少轨迹可能不重叠,但频率高会使轨迹数组已满,造成重叠
+                trajectory = [self trajectoryOverlap:NO];
+            }
+            [self createBarrageComment:comment userName:userName trajectory:trajectory isMine:model.isMine]; //trajectory:trajectory isMine:model.isMine];
+        }
+        else {
+            //当弹幕没有时跳出循环
+            break;
+        }
+    }
+}
+
+/**
+ 生成评论弹幕轨迹
+
+ @param isOverlap 是否重叠
+ @return 根据轨迹是否可重叠,生成对应的新轨迹
+ */
+- (NSString *)trajectoryOverlap:(BOOL)isOverlap
+{
+    NSString *trajectory = @"";
+    long arcIndex = arc4random() % MAX_BARRAGE_VERTICAL_COUNT;
+    CGFloat tra = arcIndex * BARRAGE_VERTICAL_HEIGHT + (arcIndex - 1) * BARRAGE_VERTICAL_MARGIN;
+//    NSLog(@"trajectory = %f ,%ld,%f,%ld,%f",tra,arcIndex,BARRAGE_VERTICAL_MARGIN,MAX_BARRAGE_VERTICAL_COUNT,BARRAGE_VERTICAL_MARGIN);
+    if (isOverlap) {
+    //生成可重叠的轨迹
+        trajectory = [NSString stringWithFormat:@"%f",tra];
+        [self.trajectoryArr addObject:trajectory];
+        return [NSString stringWithFormat:@"%f",tra];
+    }
+    //生成不重叠的轨迹
+    do {
+        arcIndex = arc4random() % MAX_BARRAGE_VERTICAL_COUNT;
+        tra = arcIndex * BARRAGE_VERTICAL_HEIGHT + (arcIndex - 1) * BARRAGE_VERTICAL_MARGIN;
+        trajectory = [NSString stringWithFormat:@"%f",tra];
+        if (self.trajectoryArr.count >= MAX_BARRAGE_VERTICAL_COUNT) break;
+        
+    } while ([self.trajectoryArr containsObject:trajectory]);
+    if (self.trajectoryArr.count >= MAX_BARRAGE_VERTICAL_COUNT)
+    {//当前轨迹数组已满,弹幕需要重叠显示
+        
+    }else
+    {//当前轨迹数组还没满,弹幕无需重叠
+        [self.trajectoryArr addObject:trajectory];
+    }
+    return trajectory;
+}
+
+/**
+ 下一条评论
+
+ @return 返回当前tmpComments的下一条评论数据
+ */
+- (NSString *)nextComment {
+    chatMsgModel *model = [self.tmpComments firstObject];
+    if (model.content) {
+        [self.tmpComments removeObjectAtIndex:0];
+    }
+    return model.content;
+}
+
+/**
+ 创建评论弹幕,根据评论内容和弹幕轨迹
+
+ @param comment 评论内容
+ @param userName 用户名字
+ @param trajectory 弹幕轨迹
+ @param isMine 是否是我发的弹幕
+ */
+- (void)createBarrageComment:(NSString *)comment userName:(NSString *)userName trajectory:(NSString *)trajectory isMine:(BOOL)isMine
+{
+    if (self.isStopAnimation) {
+        return;
+    }
+    //创建一个弹幕view
+    CNBarrageView *view = [[CNBarrageView alloc] initWithContent:comment userName:userName isMine:isMine];
+    
+    //设置运行轨迹
+    view.trajectory = [trajectory floatValue];
+    weakself
+    __weak CNBarrageView *weakBarrageView = view;
+    view.moveBlock = ^(CommentMoveState status){
+        strongself
+        if (self.isStopAnimation) {
+            return;
+        }
+        switch (status) {
+            case CommentMoveStateStart:
+            {
+                //弹幕开始,将view加入弹幕管理数组
+                [self.barrageQueue addObject:weakBarrageView];
+            }
+                break;
+            case CommentMoveStateEnter:
+            {
+                [self.trajectoryArr removeObject:trajectory];
+                //弹幕完全进入屏幕,判断接下来是否还有内容,如果有则在该弹幕轨迹队列中创建弹幕
+                NSString *comment = [self nextComment];
+                if (comment) {
+                    [self createBarrageComment:comment userName:userName trajectory:trajectory isMine:isMine];
+//                    [self createBarrageComment:comment trajectory:trajectory isMine:isMine];
+                }
+                else {
+                    //没有评论了
+                }
+            }
+                break;
+            case CommentMoveStateEnd:
+            {
+                //弹幕飞出屏幕后从弹幕管理队列中删除
+                if ([self.barrageQueue containsObject:weakBarrageView]) {
+                    [self.barrageQueue removeObject:weakBarrageView];
+                }
+            }
+                break;
+            default:
+                break;
+        }
+    };
+    //弹幕生成后,传到Controller进行页面展示
+    if (self.generateBarrageBlock) {
+        self.generateBarrageBlock(view);
+    }
+}
+
+#pragma mark - getter
+
+- (NSMutableArray *)allComments {
+    if (!_allComments) {
+        _allComments = [NSMutableArray array];
+    }
+    return _allComments;
+}
+
+- (NSMutableArray *)tmpComments {
+    if (!_tmpComments) {
+        _tmpComments = [NSMutableArray array];
+    }
+    return _tmpComments;
+}
+
+- (NSMutableArray *)barrageQueue {
+    if (!_barrageQueue) {
+        _barrageQueue = [NSMutableArray array];
+    }
+    return _barrageQueue;
+}
+
+- (NSMutableArray *)trajectoryArr {
+    if (!_trajectoryArr) {
+        _trajectoryArr = [NSMutableArray array];
+    }
+    return _trajectoryArr;
+}
+
+@end
+//
+//  CNBarrageView.h
+//  personalXmppChatDemo
+//
+//  Created by 张旭 on 2016/12/10.
+//  Copyright © 2016年 cnlive. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+#define BARRAGE_VERTICAL_HEIGHT 25.f  //每个弹幕View在垂直方向上的高度
+#define MAX_BARRAGE_VERTICAL_COUNT  (long)([UIScreen mainScreen].bounds.size.height * 1.0/BARRAGE_VERTICAL_HEIGHT)         //垂直方向上的弹幕最大数量
+#define BARRAGE_VERTICAL_MARGIN ([UIScreen mainScreen].bounds.size.height - BARRAGE_VERTICAL_HEIGHT * MAX_BARRAGE_VERTICAL_COUNT) * 1.0 / (MAX_BARRAGE_VERTICAL_COUNT - 1)                              //垂直方向上弹幕之间的间隙
+
+typedef NS_ENUM(NSInteger, CommentMoveState){//弹幕移动的状态
+    CommentMoveStateStart = 0,//将要进入屏幕
+    CommentMoveStateEnter    ,//完全进入
+    CommentMoveStateEnd       //完全移除屏幕
+};
+
+
+@interface CNBarrageView : UIView
+
+@property (nonatomic ,copy) void (^moveBlock) (CommentMoveState state);//弹幕移动的状态
+@property (nonatomic) CGFloat trajectory;//弹幕的移动轨迹
+
+/**
+ 初始化弹幕View根据评论内容,消息是否是自己发送
+
+ @param content 评论内容
+ @param userName 用户名字
+ @param isMine 是否是自己的评论弹幕
+ @return 弹幕View
+ */
+- (instancetype)initWithContent:(NSString *)content userName:(NSString *)userName isMine:(BOOL)isMine;
+
+/**
+ 开始移动动画
+ */
+- (void)startAnimation;
+
+/**
+ 停止移动动画
+ */
+- (void)stopAnimation;
+
+@end
+
+//
+//  CNBarrageView.m
+//  personalXmppChatDemo
+//
+//  Created by 张旭 on 2016/12/10.
+//  Copyright © 2016年 cnlive. All rights reserved.
+//
+
+#import "CNBarrageView.h"
+
+#define TotalDuration              5 //弹幕飘过总时间
+#define BARRAGE_Horizontal_Margin  5 //弹幕间水平间隙
+
+@interface CNBarrageView ()
+
+@property (nonatomic ,strong) UILabel * _Nullable commentLabel;//评论Label
+@property BOOL isDealloc;//标记资源是否已释放
+
+@end
+
+@implementation CNBarrageView
+
+/**
+ 销毁对象及动画
+ */
+- (void)dealloc
+{
+    [self stopAnimation];
+    self.moveBlock = nil;
+}
+
+/**
+ 初始化弹幕View根据评论内容,消息是否是自己发送
+ 
+ @param content 评论内容
+ @param userName 用户名字
+ @param isMine 是否是自己的评论弹幕
+ @return 弹幕View
+ */
+- (instancetype)initWithContent:(NSString *)content userName:(NSString *)userName isMine:(BOOL)isMine
+{
+    if (self = [super init])
+    {
+        content = [NSString stringWithFormat:@"%@:%@",userName,content];
+        NSDictionary *attributes = @{NSFontAttributeName:[UIFont systemFontOfSize:14]};
+        float width = [content sizeWithAttributes:attributes].width;
+//        float height = [content sizeWithAttributes:attributes].height;//16.707031
+        self.bounds = CGRectMake(0, 0, width + BARRAGE_Horizontal_Margin * 2, BARRAGE_VERTICAL_HEIGHT);
+        self.commentLabel.text = content;
+        self.commentLabel.frame = CGRectMake(BARRAGE_Horizontal_Margin, 0, width, BARRAGE_VERTICAL_HEIGHT);
+        if(isMine)
+        {
+            self.commentLabel.textColor = [UIColor redColor];
+        }else
+        {
+            self.commentLabel.textColor = [UIColor lightGrayColor];
+        }
+        
+    }
+    return self;
+}
+
+/**
+ 开始移动动画
+ */
+- (void)startAnimation
+{
+    CGFloat wholeWidth = self.width + SCREEN_WIDTH + 50;//总轨迹长度
+    CGFloat speed = wholeWidth / TotalDuration;//速度
+    CGFloat duration = (self.width + 50) / speed;//完全进入屏幕的时间
+    
+    if (self.moveBlock) {
+        //弹幕开始进入屏幕
+        self.moveBlock(CommentMoveStateStart);
+    }
+    
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(duration * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        //避免重复,若资源已释放 不再操作
+        if (self.isDealloc) {
+            return;
+        }
+        //duration时间后弹幕完全进入屏幕
+        if (self.moveBlock) {
+            self.moveBlock(CommentMoveStateEnter);
+        }
+    });
+    
+    weakself
+    //弹幕完全离开屏幕
+    [UIView animateWithDuration:TotalDuration delay:0 options:UIViewAnimationOptionCurveLinear animations:^{
+        strongself
+        self.left = - self.width;
+    } completion:^(BOOL finished) {
+        if (self.moveBlock) {
+            self.moveBlock(CommentMoveStateEnd);
+        }
+        [self removeFromSuperview];
+    }];
+    
+}
+
+/**
+ 停止移动动画
+ */
+- (void)stopAnimation
+{
+    self.isDealloc = YES;
+    [self.layer removeAllAnimations];
+    [self removeFromSuperview];
+}
+
+#pragma mark getter
+
+- (UILabel *)commentLabel
+{
+    if (!_commentLabel) {
+        _commentLabel = [[UILabel alloc] init];
+        _commentLabel.backgroundColor = [UIColor clearColor];
+        _commentLabel.font = [UIFont systemFontOfSize:14.f];
+        _commentLabel.textColor = [UIColor lightGrayColor];
+        [self addSubview:self.commentLabel];
+    }
+    return _commentLabel;
+}
+
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+
+@end
+//
+//  chatMsgModel.h
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/20.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "BaseModel.h"
+
+@interface chatMsgModel : BaseModel
+
+@property (nonatomic ,copy  ) NSString * _Nullable icon;//头像
+@property (nonatomic ,copy  ) NSString * _Nullable name;//姓名
+@property (nonatomic ,copy  ) NSString * _Nullable content;//内容
+
+@property (nonatomic ,assign) CGFloat   cellWidth;//内容宽度
+@property (nonatomic ,assign) CGFloat   cellHeight;//内容高度
+
+@property (nonatomic) BOOL isMine;//消息是否是自己发送
+
+@end
+//
+//  chatMsgModel.m
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/20.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "chatMsgModel.h"
+
+#define ChatCellMargin 10
+
+@implementation chatMsgModel
+
+- (CGFloat)cellHeight
+{
+    //如果计算过高度,直接返回
+    if (_cellHeight) return _cellHeight;
+    
+    //头像
+    _cellHeight = 40;
+    //文字
+    CGFloat textMaxW = self.cellWidth - 2 * ChatCellMargin;
+    CGSize textMaxSize = CGSizeMake(textMaxW, MAXFLOAT);
+    CGSize textSize = [self.content boundingRectWithSize:textMaxSize options:NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:16]} context:nil].size;
+    
+    //底部空隙
+    _cellHeight += textSize.height + ChatCellMargin;
+    //    NSLog(@"cellHeight = %f",_cellHeight);
+    return _cellHeight;
+}
+@end
+//
+//  chatListCell.h
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/20.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "BaseTableViewCell.h"
+@class chatMsgModel;
+@interface chatListCell : BaseTableViewCell
+
+- (void)loadUIWithModel:(chatMsgModel *)model;
+
+@end
+//
+//  chatListCell.m
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/20.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "chatListCell.h"
+#import "chatMsgModel.h"
+@interface chatListCell ()
+
+@property (nonatomic ,strong) UIImageView * _Nullable iconImageView;//头像图片
+@property (nonatomic ,strong) UILabel     * _Nullable nameLabel;//名字
+@property (nonatomic ,strong) UILabel     * _Nullable contentLabel;//内容
+@property (nonatomic ,strong) UIImageView * _Nullable lineImageView;//分割线
+
+@property (nonatomic ,strong) chatMsgModel * _Nullable model;
+
+@end
+
+@implementation chatListCell
+
+- (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.cellWidth = self.width;
+    _model = model;
+    
+    [self bindView];//更新cell高度后再初始化UI
+    [self.iconImageView sd_setImageWithURL:[NSURL URLWithString:model.icon] placeholderImage:nil];
+    //    self.iconImageView.backgroundColor = [UIColor greenColor];
+    self.nameLabel.text = [NSString stringWithFormat:@"%@:",model.name];
+    CGSize labelSize = [self.nameLabel labelSize];
+    self.nameLabel.frame = CGRectMake(self.iconImageView.right + 10, self.iconImageView.top, labelSize.width, labelSize.height);
+    self.nameLabel.centerY = self.iconImageView.centerY;
+    self.contentLabel.text = model.content;
+    CGSize contentLabelSize = [self.contentLabel labelSizeWithWidth:self.width - 2 * self.iconImageView.left];
+    self.contentLabel.frame = CGRectMake(self.iconImageView.left, self.iconImageView.bottom + 10, contentLabelSize.width, contentLabelSize.height);
+    
+    self.lineImageView.frame = CGRectMake(self.iconImageView.left, self.contentLabel.bottom + 5, self.width - self.iconImageView.left * 2, 1);
+}
+
+- (void)bindView
+{
+    self.iconImageView.frame = CGRectMake(10, 10, 30, 30);
+    self.nameLabel.frame = CGRectMake(self.iconImageView.right + 10, self.iconImageView.top, self.width - self.iconImageView.right - 20, 25);
+    self.nameLabel.centerY = self.iconImageView.centerY;
+    self.contentLabel.frame = CGRectMake(self.iconImageView.left, self.iconImageView.bottom + 10, self.width - 2 * self.iconImageView.left, 25);
+}
+
+#pragma mark - getter
+- (UILabel * _Nullable)nameLabel
+{
+    if (!_nameLabel)
+    {
+        _nameLabel = [[UILabel alloc] init];
+        _nameLabel.textAlignment = NSTextAlignmentLeft;
+        _nameLabel.textColor = [UIColor redColor];
+        _nameLabel.font = [UIFont systemFontOfSize:15.f];
+        [self addSubview:_nameLabel];
+    }
+    return _nameLabel;
+}
+
+- (UILabel * _Nullable)contentLabel
+{
+    if (!_contentLabel)
+    {
+        _contentLabel = [[UILabel alloc] init];
+        _contentLabel.textAlignment = NSTextAlignmentLeft;
+        _contentLabel.textColor = [UIColor lightGrayColor];
+        _contentLabel.numberOfLines = 0;
+        _contentLabel.font = [UIFont systemFontOfSize:12.f];
+        [self addSubview:_contentLabel];
+    }
+    return _contentLabel;
+}
+
+- (UIImageView * _Nullable)iconImageView
+{
+    if (!_iconImageView)
+    {
+        _iconImageView = [[UIImageView alloc] init];
+        _iconImageView.layer.masksToBounds = YES;
+        _iconImageView.layer.cornerRadius = 15.f;
+        [self addSubview:_iconImageView];
+    }
+    return _iconImageView;
+}
+
+- (UIImageView * _Nullable)lineImageView
+{
+    if (!_lineImageView)
+    {
+        _lineImageView = [[UIImageView alloc] init];
+        _lineImageView.image = [UIImage imageNamed:@"分割线（聊天复用）"];
+        [self addSubview:_lineImageView];
+    }
+    return _lineImageView;
+}
+
+
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+
+@end
@@ -57,20 +57,21 @@
  @param model modelobj
  */
 - (void)addAnimationWithModel:(GiftModel *)model animContentView:(UIView *)animContentView{
-
+    
+    GiftAnimOperation *op = [GiftAnimOperation addGiftAnimOperationWithGiftModel:model animContentView:animContentView];
     switch (model.giftStyle) {
         case GiftStylePorsch:
         {
-             GiftAnimOperation *op = [GiftAnimOperation addGiftAnimOperationWithGiftModel:model animContentView:animContentView];
             [self.expenAnimationQueue addOperation:op];
         }
             break;
-//        case GiftStyleFighter:
-//            [self.expenAnimationQueue addOperation:op];
-//            break;
+        case GiftStyleFighter:
+        {
+            [self.expenAnimationQueue addOperation:op];
+        }
+            break;
         case GiftStylePlane:
         {
-             GiftAnimOperation *op = [GiftAnimOperation addGiftAnimOperationWithGiftModel:model animContentView:animContentView];
             [self.expenAnimationQueue addOperation:op];
         }
             break;
@@ -11,8 +11,8 @@
 #import "NHCarViews.h"
 #import "NHPlaneViews.h"
 #import "GiftAnimationAction.h"
-//#import "NHFighterView.h"
-//#import "NHFighterView+animDelegagte.h"
+#import "NHFighterView.h"
+#import "NHFighterView+animDelegagte.h"
 @interface GiftAnimOperation ()
 {
@@ -21,7 +21,7 @@
 }
 @property (nonatomic, strong)NHCarViews *giftCarView;  //跑车动画
-//@property (nonatomic, strong)NHFighterView *giftFighterView;  //歼灭机动画
+@property (nonatomic, strong)NHFighterView *giftFighterView;  //歼灭机动画
 @property (nonatomic, strong)NHPlaneViews *giftPlaneView;  //客机动画
 @property (nonatomic, strong)GiftModel *model;  //model
 @property (nonatomic,strong) UIView *animContentView;   //需要显示动画的view
@@ -72,9 +72,9 @@
         case GiftStylePorsch:
             [self porschAnimation];
             break;
-//        case GiftStyleFighter:
-//            [self fighterAnimation];
-//            break;
+        case GiftStyleFighter:
+            [self fighterAnimation];
+            break;
         case GiftStylePlane:
             [self planeAnimation];
             break;
@@ -105,24 +105,25 @@
     });
 }
-//- (void)fighterAnimation
-//{
-//    weakself
-//    dispatch_async(dispatch_get_main_queue(), ^{
-//        strongself
-//        
-//        [self.giftFighterView addAnimationsMoveToPoint:CGPointMake(SCREEN_WIDTH, 60) endPoint:CGPointMake( -500, 600)];
-//        [self.animContentView addSubview:self.giftFighterView];
-//        [self.giftFighterView startFighterAnimationWithCompletion:^{
-//            [self willChangeValueForKey:@"isFinished"];
-//            
-//            _finished = YES;
-//            
-//            [self didChangeValueForKey:@"isFinished"];
-//        }];
-//        
-//    });
-//}
+- (void)fighterAnimation
+{
+    weakself
+    dispatch_async(dispatch_get_main_queue(), ^{
+        strongself
+        
+        [self.giftFighterView addAnimationsMoveToPoint:CGPointMake(SCREEN_WIDTH, 60) endPoint:CGPointMake( -500, 600)];
+        [self.animContentView addSubview:self.giftFighterView];
+        
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(12 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            [self willChangeValueForKey:@"isFinished"];
+            
+            _finished = YES;
+            
+            [self didChangeValueForKey:@"isFinished"];
+
+        });
+    });
+}
 - (void)planeAnimation
 {
@@ -169,12 +170,12 @@
  @return 连击view
  */
-//- (NHFighterView *)giftFighterView{
-//    if (_giftFighterView == nil) {
-//        _giftFighterView = [NHFighterView loadFighterViewWithPoint:CGPointMake(10, 100)];
-//    }
-//    return _giftFighterView;
-//}
+- (NHFighterView *)giftFighterView{
+    if (_giftFighterView == nil) {
+        _giftFighterView = [NHFighterView loadFighterViewWithPoint:CGPointMake(10, 100)];
+    }
+    return _giftFighterView;
+}
 /**
  客机动画
@@ -23,11 +23,6 @@ typedef void(^giftAnimationCompletion)();
 - (void)startPorschAnimationWithCompletion:(giftAnimationCompletion)Completion;
 /**
- 歼灭机动画
- */
-//- (void)startFighterAnimationWithCompletion:(giftAnimationCompletion)Completion;
-
-/**
  客机动画
  */
 - (void)startPlaneAnimationWithCompletion:(giftAnimationCompletion)Completion;
@@ -11,45 +11,6 @@
 @implementation GiftAnimationAction
 /**
- 连击横屏动画
- */
-- (void)startComboAnimationWithCompletion:(giftAnimationCompletion)Completion{
-    _giftAnimationCompletion = Completion;
-    [self animationWithDuration:4
-                        YValues:@[@(0 - self.width), @(115), @(110), @(110), @(0 - self.width)]
-                       keyTimes:@[@0.0, @0.2, @0.3, @0.8, @1.0]
-                timingFunctions:@[
-                                  [CAMediaTimingFunction functionWithName:                    kCAMediaTimingFunctionEaseOut],
-                                  [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionDefault],
-                                  [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionDefault],
-                                  [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseIn]
-                                  ]
-                        addView:self];
-}
-
-/**
- 位移动画具体实现
- 
- @param duration 动画持续时间
- @param YValues 动画帧数组
- @param keyTimes 动画帧时间
- @param timingFunctions 动画方式数组
- @param addView 需要添加的view
- */
-- (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)startPorschAnimationWithCompletion:(giftAnimationCompletion)Completion
@@ -58,14 +19,6 @@
 }
 /**
- 歼灭机动画
- */
-//- (void)startFighterAnimationWithCompletion:(giftAnimationCompletion)Completion
-//{
-//    _giftAnimationCompletion = Completion;
-//}
-
-/**
  客机动画
  */
 - (void)startPlaneAnimationWithCompletion:(giftAnimationCompletion)Completion
@@ -11,7 +11,7 @@
 typedef NS_ENUM(NSInteger, GiftStyle) {//礼物类型
     GiftStyleCombo          = 1,//普通可连击礼物
     GiftStylePorsch            ,//豪华跑车礼物
-//    GiftStyleFighter           ,//豪华歼灭机礼物
+    GiftStyleFighter           ,//豪华歼灭机礼物
     GiftStylePlane             ,//豪华客机礼物
 };
@@ -7,6 +7,7 @@
 //
 #import "NHFighterView+animDelegagte.h"
+#import "GiftAnimationAction.h"
 @implementation NHFighterView (animDelegagte)
@@ -17,7 +18,8 @@
 - (void)animationDidStop:(CAAnimation *)anim finished:(BOOL)flag
 {
-    _giftAnimationCompletion(-1);
+//    _giftAnimationCompletion();
+    
     NSLog(@"did stop");
 }
@@ -7,9 +7,8 @@
 //
 #import <UIKit/UIKit.h>
-#import "GiftAnimationAction.h"
-@interface NHFighterView :GiftAnimationAction
+@interface NHFighterView :UIView
 /**
  *  需要几个控制点就设置几个:
@@ -10,13 +10,20 @@
 #import "GiftModel.h"
 #import "LiveBaseView.h"
 #import "AnimQueueManager.h"
+#import "GiftPayButton.h"
 #define MAX_LINE_COUNT 4
 #define MAX_ROW_COUNT  2
+#define GiftPayViewHeight 50
+
 @interface GiftListView ()
 @property (nonatomic ,strong) NSArray <GiftModel *>* _Nullable  giftArray;
+@property (nonatomic ,strong) NSArray <NSString *>* _Nullable   images;
+@property (nonatomic ,strong) NSArray <NSString *>* _Nullable   giftNames;
+@property (nonatomic ,strong) NSArray <NSString *>* _Nullable   prices;
+@property (nonatomic ,strong) NSArray <NSString *>* _Nullable   types;
 @property (nonatomic ,weak  ) LiveBaseView *         _Nullable  liveBaseView;
 @property (nonatomic, strong) AnimQueueManager *                animQueueManager;
 @property (nonatomic ,strong) GiftModel *            _Nullable  model;
@@ -28,17 +35,22 @@
 - (instancetype)initWithFrame:(CGRect)frame liveBaseView:(LiveBaseView *_Nullable)liveBaseView
 {
     if (self = [super initWithFrame:frame]) {
+        
+        _images = [NSArray arrayWithObjects:@"porsch_small80",@"fighter_small80",@"plane_small80",@"love_gift",@"beer",@"chicken",@"cucumber",@"flower",@"hug",@"mouth",@"ring",@"rose",@"sticks",nil];
+        _giftNames = [NSArray arrayWithObjects:@"跑车",@"歼灭机",@"飞机",@"大大的爱心",@"啤酒",@"小鸡",@"小黄瓜",@"鲜花",@"抱抱",@"亲吻",@"戒指",@"玫瑰花",@"荧光棒",nil];
+        _prices = [NSArray arrayWithObjects:@"300000000",@"300000000",@"300000",@"30",@"30",@"3",@"3",@"1",@"3",@"1",@"3",@"30",@"300", nil];
+        _types = [NSArray arrayWithObjects:@2,@3,@4,@1,@1,@1,@1,@1,@1,@1,@1,@1,@1, nil];
+        
         self.liveBaseView = liveBaseView;
         self.animQueueManager = [AnimQueueManager sharedAnimQueueManager];
-        UIScrollView *scrollView = [[UIScrollView alloc] initWithFrame:CGRectMake(0, 0, self.width, self.height - 30)];
-        scrollView.contentSize = CGSizeMake(self.width *(self.giftArray.count/(MAX_ROW_COUNT*MAX_LINE_COUNT) + 1), self.height - 30);
+        UIScrollView *scrollView = [[UIScrollView alloc] initWithFrame:CGRectMake(0, 0, self.width, self.height - GiftPayViewHeight)];
+        scrollView.contentSize = CGSizeMake(self.width *(self.giftArray.count/(MAX_ROW_COUNT*MAX_LINE_COUNT) + 1), self.height - GiftPayViewHeight);
         scrollView.pagingEnabled = YES;
         scrollView.bounces = NO;
         scrollView.showsVerticalScrollIndicator = NO;
         scrollView.showsHorizontalScrollIndicator = NO;
         [self addSubview:scrollView];
-        scrollView.backgroundColor = ZXRandomColor;
         int line = 0;
         int row = 0;
@@ -56,40 +68,65 @@
             }
             row = i % MAX_LINE_COUNT;
             CGFloat giftWidth = self.width / MAX_LINE_COUNT * 1.0;
-            CGFloat giftHeight = (self.height - 30) / MAX_ROW_COUNT * 1.0;
+            CGFloat giftHeight = (self.height - GiftPayViewHeight) / MAX_ROW_COUNT * 1.0;
             giftX = row * giftWidth + page * scrollView.width;
             giftY = line * giftHeight;
             UIView *giftView = [self giftViewWithFrame:CGRectMake(giftX, giftY, giftWidth, giftHeight) model:self.giftArray[i]];
+            giftView.backgroundColor = [UIColor clearColor];
             //礼物图片
             UIImageView *picImg = [[UIImageView alloc] initWithImage:[UIImage imageNamed:self.giftArray[i].giftImageName]];
             picImg.centerX = giftView.width * 0.5;
             picImg.centerY = giftView.height * 0.5;
             [giftView addSubview:picImg];
-
             [scrollView addSubview:giftView];
             UITapGestureRecognizer *gesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(gestureClick:)];
             giftView.tag = i + 10;
             [giftView addGestureRecognizer:gesture];
         }
+        UIImageView *giftBottomView = [[UIImageView alloc] initWithFrame:CGRectMake(0, self.height - GiftPayViewHeight, self.width, GiftPayViewHeight)];
+        giftBottomView.image = [UIImage imageNamed:@"背景400x30"];
+        giftBottomView.alpha = 0.4;
+        [self addSubview:giftBottomView];
+
+        GiftPayButton *payBtn = [[GiftPayButton alloc] initWithFrame:CGRectMake(10, self.height - GiftPayViewHeight, 80, GiftPayViewHeight)];
+        [payBtn addTarget:self action:@selector(payClick) forControlEvents:UIControlEventTouchUpInside];
+        [self addSubview:payBtn];
+        
+        UIButton *sendBtn = [[UIButton alloc] initWithFrame:CGRectMake(self.width - 70, self.height - GiftPayViewHeight + (GiftPayViewHeight - 30)*0.5, 60, 30)];
+        [sendBtn addTarget:self action:@selector(sendClick) forControlEvents:UIControlEventTouchUpInside];
+        [sendBtn setTitle:@"发送" forState:UIControlStateNormal];
+        [sendBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal
+         ];
+        [sendBtn setBackgroundColor:[UIColor orangeColor]];
+        sendBtn.layer.cornerRadius = sendBtn.height * 0.5;
+        sendBtn.layer.masksToBounds = YES;
+        [self addSubview:sendBtn];
     }
     return self;
 }
+- (void)sendClick
+{
+    NSLog(@"sendClick");
+}
+
+- (void)payClick
+{
+    NSLog(@"payClick");
+}
+
 - (UIView *)giftViewWithFrame:(CGRect)frame model:(GiftModel *)model
 {
     _model = model;
     UIView *giftView = [[UIView alloc] initWithFrame:frame];
     if (model.giftStyle == GiftStyleCombo)
-    {
+    {//右上角连击标识
         UIImageView *imageView = [[UIImageView alloc] initWithFrame:CGRectMake(giftView.width - 17, 3, 15, 15)];
-        imageView.backgroundColor = ZXRandomColor;
-        [giftView addSubview:imageView];//右上角连击标识
-    }else
-    {
-        
+        imageView.image = [UIImage imageNamed:@"continuous"];
+        [giftView addSubview:imageView];
     }
     //礼物价格lbl
     UILabel *priceLbl = [[UILabel alloc] initWithFrame:CGRectMake(0, giftView.height - 15, 40, 14)];
@@ -101,7 +138,7 @@
     priceLbl.centerX = giftView.width * 0.5 - 4;
     [giftView addSubview:priceLbl];
     //礼物价格图标
-    UIImageView *image = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"littleHeart2"]];
+    UIImageView *image = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"diamond"]];
     image.left = priceLbl.right + 3;
     image.centerY = priceLbl.centerY;
     [giftView addSubview:image];
@@ -125,41 +162,53 @@
     }
 }
+- (NSString *)giftNameWithImageName:(NSString *)imageName
+{
+    NSString *giftName = @"";
+
+    if ([_images containsObject:imageName]) {
+        NSInteger index = [_images indexOfObject:imageName];
+        giftName = [_giftNames objectAtIndex:index];
+    }
+    
+    return giftName;
+}
+
 #pragma mark - getter
 - (NSArray *)giftArray
 {
     if (!_giftArray)
     {
-        NSArray *images = [NSArray arrayWithObjects:@"love",@"love",@"love",@"love",@"love",@"love",@"love",@"love",@"love",@"love",nil];
-        NSArray *types = [NSArray arrayWithObjects:@2,@3,@1,@1,@1,@1,@1,@1,@1,@1, nil];
-        NSArray *senders = [NSArray arrayWithObjects:@"张三",@"李四",@"王五",@"宋刘",@"老七",@"老八",@"老九",@"老十",@"老师",@"小十七", nil];
-        NSArray *prices = [NSArray arrayWithObjects:@"300000000",@"3000",@"300000",@"30",@"3",@"3",@"1",@"3",@"1",@"3", nil];
-        
+        NSArray *senders = [NSArray arrayWithObjects:@"张三",@"龙的传人",@"李四",@"王五",@"宋刘",@"老七",@"老八",@"老九",@"老十",@"老师",@"小十七",@"小十八",@"小十九", nil];
         NSMutableArray *tempArr = [NSMutableArray array];
-        for (int i = 0; i < images.count; i ++) {
+        for (int i = 0; i < _images.count; i ++) {
-            int type = [types[i] intValue];
+            int type = [_types[i] intValue];
             if (type == 1) {
                 //combo
-                GiftModel *model1 = [GiftModel modelWithSender:senders[i] giftName:@"大大的爱心" icon:@"love" giftImageName:images[i]];
+                GiftModel *model1 = [GiftModel modelWithSender:senders[i] giftName:[self giftNameWithImageName:_images[i]] icon:@"love" giftImageName:_images[i]];
                 model1.giftStyle = GiftStyleCombo;
-                model1.price = prices[i];
+                model1.price = _prices[i];
                 [tempArr addObject:model1];
             }else
             {//expen
-                GiftModel *model = [GiftModel modelWithSender:senders[i] giftName:@"豪华礼物" icon:@"love" giftImageName:@"love"];
+                GiftModel *model = [GiftModel modelWithSender:senders[i] giftName:[self giftNameWithImageName:_images[i]] icon:@"love" giftImageName:@""];
                 if (type == 2) {
                     model.giftStyle = GiftStylePorsch;
-                    model.giftName = @"跑车";
+                    model.giftImageName = @"porsch_small80";
                 }
                 if (type == 3) {
+                    model.giftStyle = GiftStyleFighter;
+                    model.giftImageName = @"fighter_small80";
+                }
+                if (type == 4) {
                     model.giftStyle = GiftStylePlane;
-                    model.giftName = @"客机";
+                    model.giftImageName = @"plane_small80";
                 }
-                model.price = prices[i];
+                model.price = _prices[i];
                 [tempArr addObject:model];
             }
         }
+//
+//  GiftPayButton.h
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/20.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface GiftPayButton : UIButton
+
+@end
+//
+//  GiftPayButton.m
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/20.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "GiftPayButton.h"
+
+@implementation GiftPayButton
+
+- (void)layoutSubviews
+{
+    [super layoutSubviews];
+    
+    [self setTitle:@"充值 10" forState:UIControlStateNormal];
+    self.titleLabel.textAlignment = NSTextAlignmentLeft;
+    self.titleLabel.font = [UIFont systemFontOfSize:kContentFont];
+    [self setTitleColor:[UIColor yellowColor] forState:UIControlStateNormal];
+    [self setImage:[UIImage imageNamed:@"diamond"] forState:UIControlStateNormal];
+    [self setImage:[UIImage imageNamed:@"diamond"] forState:UIControlStateHighlighted];
+    
+    self.titleLabel.left = 0;
+    self.titleLabel.top = 0;
+    self.titleLabel.width = self.width - 20;
+    self.titleLabel.height = self.height;
+    
+    self.imageView.height = 10;
+    self.imageView.width = 13;
+    self.imageView.left = self.width - 25;
+    self.imageView.centerY = self.titleLabel.centerY;
+}
+
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+
+@end
@@ -2,8 +2,8 @@
 //  PresentModelAble.h
 //  PresentDemo
 //
-//  Created by 阮思平 on 16/10/2.
-//  Copyright © 2016年 阮思平. All rights reserved.
+//  Created by 张旭 on 2017/3/17.
+//  Copyright © 2017年 张旭. All rights reserved.
 //
 #import <Foundation/Foundation.h>
@@ -2,8 +2,8 @@
 //  PresentView.h
 //  PresentDemo
 //
-//  Created by 阮思平 on 16/10/2.
-//  Copyright © 2016年 阮思平. All rights reserved.
+//  Created by 张旭 on 2017/3/17.
+//  Copyright © 2017年 张旭. All rights reserved.
 //
 #import <UIKit/UIKit.h>
@@ -2,8 +2,8 @@
 //  PresentView.m
 //  PresentDemo
 //
-//  Created by 阮思平 on 16/10/2.
-//  Copyright © 2016年 阮思平. All rights reserved.
+//  Created by 张旭 on 2017/3/17.
+//  Copyright © 2017年 张旭. All rights reserved.
 //
 #import "PresentView.h"
@@ -17,7 +17,7 @@
  */
 @property (strong, nonatomic) NSMutableArray *dataCaches;
 /**
- *  不带连城动画的消息缓存数组
+ *  不带连乘动画的消息缓存数组
  */
 @property (strong, nonatomic)NSMutableArray *nonshakeDataCaches;
 /**
@@ -2,8 +2,8 @@
 //  PresentViewCell.h
 //  PresentDemo
 //
-//  Created by 阮思平 on 16/10/2.
-//  Copyright © 2016年 阮思平. All rights reserved.
+//  Created by 张旭 on 2017/3/17.
+//  Copyright © 2017年 张旭. All rights reserved.
 //
 #import <UIKit/UIKit.h>
@@ -71,7 +71,7 @@ typedef NS_ENUM(NSUInteger, AnimationState) {
  连乘动画
  @discussion  当礼物模型中拥有礼物个数时，才调用此接口
- @param       model 礼物模型
+ @param       models 礼物模型
  */
 - (void)shakeAnimationWithModels:(NSArray<id<PresentModelAble>> *)models;
 /**
@@ -2,8 +2,8 @@
 //  PresentViewCell.m
 //  PresentDemo
 //
-//  Created by 阮思平 on 16/10/2.
-//  Copyright © 2016年 阮思平. All rights reserved.
+//  Created by 张旭 on 2017/3/17.
+//  Copyright © 2017年 张旭. All rights reserved.
 //
 #import "PresentViewCell.h"
@@ -65,7 +65,7 @@ static LVCAnimationManager * __singleton__;
  */
 - (void)bubblingWithCenterPoint:(CGPoint)centerPoint toView:(UIView *_Nonnull)toView speed:(CGFloat)speed
 {
-    CGFloat defSpeed = 2;
+    CGFloat defSpeed = 1;
     if (speed != 0) {
         defSpeed = speed;
     }
@@ -13,6 +13,11 @@
 #import "GiftModel.h"
 #import "PresentView.h"
 #import "ComboCell.h"
+#import "LVCAnimationManager.h"
+#import "chatListCell.h"
+#import "chatMsgModel.h"
+
+#define BottomToolHeight 60
 typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
     PopTypeGift          = 1,//礼物弹窗
@@ -20,7 +25,7 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
     PopTypePriMessage        //私信弹窗
 };
-@interface LiveBaseView ()<bottomBtnDeledate,PresentViewDelegate,UIScrollViewDelegate>
+@interface LiveBaseView ()<bottomBtnDeledate,PresentViewDelegate,UIScrollViewDelegate,UITableViewDelegate,UITableViewDataSource>
 @property (nonatomic ,strong           ) UIScrollView *  _Nullable scrollView;
 @property (nonatomic ,strong ,readwrite) UIView *        _Nullable animationBaseView;//展示层View
@@ -28,8 +33,10 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
 @property (nonatomic ,strong           ) UIButton *      _Nullable closeBtn;
 @property (nonatomic ,strong           ) UIView *        _Nullable giftPopView;
 @property (nonatomic ,strong ,readwrite) PresentView *   _Nullable presentView;//连击View
-
 @property (nonatomic ,assign           ) PopType   popType;
+@property (nonatomic ,strong) UITableView * _Nullable             chatTableView;
+@property (nonatomic ,strong) NSMutableArray * _Nullable chatMsgArray;//聊天消息数组
+
 @end
 @implementation LiveBaseView
@@ -44,6 +51,15 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
         [self.animationBaseView addSubview:self.presentView];
         [self addSubview:self.closeBtn];
         [self addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapGestureClick:)]];
+        [[LVCAnimationManager shareManager] bubblingWithCenterPoint:CGPointMake(SCREEN_WIDTH - 50, SCREEN_HEIGHT - 50) toView:self.animationBaseView speed:1];
+//        ChatView *chatView = [[ChatView alloc] initWithFrame:CGRectMake(0, SCREEN_HEIGHT - 150, 200, 100)];
+//        chatView.backgroundColor = ZXRandomColor;
+//        [self addSubview:chatView];
+        [self.animationBaseView addSubview:self.chatTableView];
+        self.chatTableView.backgroundColor = ZXRandomColor;
+        chatMsgModel *model = [[chatMsgModel alloc] init];
+        model.name = @"张旭";
+        [self.chatMsgArray addObject:model];
     }
     return self;
 }
@@ -51,11 +67,11 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
 #pragma mark - bottomBtnDelegate
 - (void)bottomActionWithType:(BtnClickType)btnType
 {
-    [self hiddenView:YES];
     switch (btnType) {
         case BtnClickTypeChat:
         {
             self.popType = PopTypeChat;
+            
         }
             break;
         case BtnClickTypePriChat:
@@ -66,12 +82,19 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
         case BtnClickTypeGift:
         {
             self.popType = PopTypeGift;
-            
-            GiftListView *giftListView = [[GiftListView alloc] initWithFrame:CGRectMake(0, SCREEN_HEIGHT - 230, SCREEN_WIDTH, 230) liveBaseView:self];
-            giftListView.backgroundColor = [UIColor lightGrayColor];
+            [self hiddenView:YES];
+            GiftListView *giftListView = [[GiftListView alloc] initWithFrame:CGRectMake(0, SCREEN_HEIGHT - 250, SCREEN_WIDTH, 250) liveBaseView:self];
             [self addSubview:giftListView];
             self.giftPopView = giftListView;
-
+            
+            UIImageView *giftBg = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, giftListView.width, giftListView.height)];
+            giftBg.image = [UIImage imageNamed:@"背景400x300"];
+            giftBg.centerX = giftListView.width * 0.5;
+            giftBg.centerY = giftListView.height * 0.5;
+            giftBg.alpha = 0.4;
+            [giftListView addSubview:giftBg];
+            
+            
         }
             break;
         default:
@@ -83,6 +106,7 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
 {
     self.bottomToolView.hidden = isHidden;
     self.closeBtn.hidden = isHidden;
+    self.chatTableView.hidden = isHidden;
 }
 - (void)clearCurrentPopView
@@ -114,6 +138,27 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
     }
 }
+#pragma mark - 聊天消息列表
+#pragma mark - UITableViewDataSource
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+    return self.chatMsgArray.count;
+}
+
+-(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    chatListCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([chatListCell class]) forIndexPath:indexPath];
+    [cell loadUIWithModel:self.chatMsgArray[indexPath.row]];
+    return cell;
+}
+
+#pragma mark - UITableViewDelegate
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    return [self.chatMsgArray[indexPath.row] cellHeight];
+}
+
 #pragma mark - PresentViewDelegate
 - (PresentViewCell *)presentView:(PresentView *)presentView cellOfRow:(NSInteger)row
@@ -135,13 +180,13 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
 - (void)presentView:(PresentView *)presentView animationCompleted:(NSInteger)shakeNumber model:(id<PresentModelAble>)model
 {
-//    self.number = 5;
     NSLog(@"%@礼物的连送动画执行完成", model.giftName);
 }
 #pragma mark - buttonClick
 - (void)tapGestureClick:(UITapGestureRecognizer *)gesture
 {
+    [[LVCAnimationManager shareManager] bubblingWithCenterPoint:CGPointMake(SCREEN_WIDTH - 50, SCREEN_HEIGHT - 50) toView:self.animationBaseView];
     [self clearCurrentPopView];
 }
@@ -206,7 +251,7 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
 {
     if (!_bottomToolView)
     {
-        _bottomToolView = [[BottomToolView alloc] initWithFrame:CGRectMake(0, SCREEN_HEIGHT - 60, SCREEN_WIDTH, 60)];
+        _bottomToolView = [[BottomToolView alloc] initWithFrame:CGRectMake(0, SCREEN_HEIGHT - BottomToolHeight, SCREEN_WIDTH, BottomToolHeight)];
         _bottomToolView.delegate = self;
         _bottomToolView.backgroundColor = [UIColor lightGrayColor];
         _bottomToolView.alpha = 0.7;
@@ -214,6 +259,31 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
     return _bottomToolView;
 }
+- (UITableView *)chatTableView
+{
+    if (!_chatTableView) {
+        UITableView *tableView = [[UITableView alloc]initWithFrame:CGRectMake(10, SCREEN_HEIGHT - 150 - BottomToolHeight - 10, 300, 150)];
+        tableView.delegate = self;
+        tableView.dataSource = self;
+        tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
+        [tableView registerClass:[chatListCell class] forCellReuseIdentifier:NSStringFromClass([chatListCell class])];
+        tableView.showsVerticalScrollIndicator = NO;
+        tableView.showsHorizontalScrollIndicator = NO;
+        tableView.backgroundColor = [UIColor clearColor];
+        tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
+        _chatTableView = tableView;
+    }
+    return _chatTableView;
+}
+
+- (NSMutableArray *)chatMsgArray
+{
+    if (!_chatMsgArray) {
+        _chatMsgArray = [NSMutableArray array];
+    }
+    return _chatMsgArray;
+}
+
 - (UIButton *)closeBtn
 {
     if (!_closeBtn)
@@ -10,6 +10,7 @@
 #import "LVCLivePlayerController.h"
 #import "LVCInteractionController.h"
 #import "LVCLivePlayerController.h"
+#import "LVCUGCLivePlayerController.h"
 @interface HomeViewController ()
@@ -43,6 +44,12 @@
     [liveBtn addTarget:self action:@selector(liveAction) forControlEvents:UIControlEventTouchUpInside];
     [self.view addSubview:liveBtn];
+    UIButton *UGCLiveBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+    UGCLiveBtn.frame = CGRectMake(0, 200, self.view.width, 40);
+    [UGCLiveBtn setTitle:@"UGC直播" forState:UIControlStateNormal];
+    [UGCLiveBtn addTarget:self action:@selector(UGCLiveAction) forControlEvents:UIControlEventTouchUpInside];
+    [self.view addSubview:UGCLiveBtn];
+    
     [[UIApplication sharedApplication].keyWindow addSubview:self.interactionBtn];
 }
@@ -53,6 +60,12 @@
     [self.navigationController pushViewController:liveVC animated:YES];
 }
+- (void)UGCLiveAction
+{
+    LVCUGCLivePlayerController *UGCLiveVC = [[LVCUGCLivePlayerController alloc] init];
+    [self.navigationController pushViewController:UGCLiveVC animated:YES];
+}
+
 - (void)interactionAction
 {
     LVCInteractionController *intVC = [[LVCInteractionController alloc] init];
+//
+//  LVCUGCLivePlayerController.h
+//  LiveVideoCloud
+//
+//  Created by cnliveJunBo on 17/3/17.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface LVCUGCLivePlayerController : UIViewController
+
+@end
+//
+//  LVCUGCLivePlayerController.m
+//  LiveVideoCloud
+//
+//  Created by cnliveJunBo on 17/3/17.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "LVCUGCLivePlayerController.h"
+#import <CNLivePlayerSDK/CNLiveWebcastManager.h>
+#import "LVCUGCPlayerLoadingView.h"
+#import "LVCUGCBackgroundView.h"
+
+#define KAppId @"60_irn9edco29"
+#define KAppKey @"69fe70bda67e059286ad509d9f5377f815955645b52f94"
+
+@interface LVCUGCLivePlayerController ()
+
+@property (nonatomic, strong) CNLiveMoviePlayerController *player;// 播放器
+
+@property (nonatomic, strong) LVCUGCBackgroundView *bgView; // 背景视图
+
+@property (nonatomic, strong) LVCUGCPlayerLoadingView *loadingView; // 加载视图
+
+@end
+
+@implementation LVCUGCLivePlayerController
+
+- (void)viewWillAppear:(BOOL)animated {
+    
+    [super viewWillAppear:animated];
+    
+    self.navigationController.navigationBar.hidden = YES;
+}
+
+- (void)viewWillDisappear:(BOOL)animated {
+    
+    [super viewWillDisappear:animated];
+    
+    self.navigationController.navigationBar.hidden = NO;
+}
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    
+    self.view.backgroundColor = [UIColor whiteColor];
+    
+    [self.view addSubview:self.loadingView];
+    
+    //添加播放器通知
+    [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 - 移除通知
+- (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];
+}
+
+#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");
+    }
+}
+
+//视频播放状态改变
+- (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 - getter
+- (LVCUGCPlayerLoadingView *)loadingView {
+    if (!_loadingView) {
+        _loadingView = [[LVCUGCPlayerLoadingView alloc] initWithFrame:self.view.bounds bgImageURLStr:@""];
+    }
+    return _loadingView;
+}
+
+#pragma mark - 内存警告 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+@end
+//
+//  LVCUGCBackgroundView.h
+//  LiveVideoCloud
+//
+//  Created by cnliveJunBo on 17/3/20.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface LVCUGCBackgroundView : UIView
+
+@property (nonatomic, assign) int anchorStatus;     //设置主播状态
+
+@end
+//
+//  LVCUGCBackgroundView.m
+//  LiveVideoCloud
+//
+//  Created by cnliveJunBo on 17/3/20.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "LVCUGCBackgroundView.h"
+
+@implementation LVCUGCBackgroundView
+
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+
+@end
+//
+//  LVCUGCPlayerLoadingView.h
+//  LiveVideoCloud
+//
+//  Created by cnliveJunBo on 17/3/20.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface LVCUGCPlayerLoadingView : UIView
+
+- (instancetype)initWithFrame:(CGRect)frame bgImageURLStr:(NSString *)bgImageURLStr;
+
+@end
+//
+//  LVCUGCPlayerLoadingView.m
+//  LiveVideoCloud
+//
+//  Created by cnliveJunBo on 17/3/20.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "LVCUGCPlayerLoadingView.h"
+#import "UIImage+LVCVagueImage.h"
+
+@interface LVCUGCPlayerLoadingView() {
+    
+    NSString *_bgImageURLStr;
+}
+
+@property (nonatomic, strong) UIImageView *bgImageView;
+
+@end
+
+@implementation LVCUGCPlayerLoadingView
+
+- (instancetype)initWithFrame:(CGRect)frame bgImageURLStr:(NSString *)bgImageURLStr
+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        _bgImageURLStr = bgImageURLStr;
+        [self addSubview:self.bgImageView];
+    }
+    return self;
+}
+
+- (UIImageView *)bgImageView {
+    if (!_bgImageView) {
+        
+        NSString *path = [[NSBundle mainBundle] pathForResource:@"UGCLoading" ofType:@"jpeg"];
+        UIImage *image = [UIImage imageWithContentsOfFile:path];
+        UIImage *blurImage = [UIImage boxblurImage:image withBlurNumber:0.6];
+        _bgImageView = [[UIImageView alloc] initWithImage:blurImage];
+        _bgImageView.frame = CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
+        _bgImageView.contentMode = UIViewContentModeScaleAspectFill;
+        _bgImageView.clipsToBounds = YES;
+    }
+    return _bgImageView;
+}
+
+@end
+//
+//  UIImage+LVCVagueImage.h
+//  LiveVideoCloud
+//
+//  Created by cnliveJunBo on 17/3/21.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface UIImage (LVCVagueImage)
+
++ (UIImage *)boxblurImage:(UIImage *)image withBlurNumber:(CGFloat)blur;
+
+@end
+//
+//  UIImage+LVCVagueImage.m
+//  LiveVideoCloud
+//
+//  Created by cnliveJunBo on 17/3/21.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "UIImage+LVCVagueImage.h"
+#import <Accelerate/Accelerate.h>
+
+@implementation UIImage (LVCVagueImage)
+
++ (UIImage *)boxblurImage:(UIImage *)image withBlurNumber:(CGFloat)blur
+{
+    if (blur < 0.f || blur > 1.f) {
+        blur = 0.5f;
+    }
+    int boxSize = (int)(blur * 40);
+    boxSize = boxSize - (boxSize % 2) + 1;
+    CGImageRef img = image.CGImage;
+    vImage_Buffer inBuffer, outBuffer;
+    vImage_Error error;
+    void *pixelBuffer;
+    //从CGImage中获取数据
+    CGDataProviderRef inProvider = CGImageGetDataProvider(img);
+    CFDataRef inBitmapData = CGDataProviderCopyData(inProvider);
+    //设置从CGImage获取对象的属性
+    inBuffer.width = CGImageGetWidth(img);
+    inBuffer.height = CGImageGetHeight(img);
+    inBuffer.rowBytes = CGImageGetBytesPerRow(img);
+    inBuffer.data = (void*)CFDataGetBytePtr(inBitmapData);
+    pixelBuffer = malloc(CGImageGetBytesPerRow(img) * CGImageGetHeight(img));
+    if(pixelBuffer == NULL)
+        NSLog(@"No pixelbuffer");
+    outBuffer.data = pixelBuffer;
+    outBuffer.width = CGImageGetWidth(img);
+    outBuffer.height = CGImageGetHeight(img);
+    outBuffer.rowBytes = CGImageGetBytesPerRow(img);
+    error = vImageBoxConvolve_ARGB8888(&inBuffer, &outBuffer, NULL, 0, 0, boxSize, boxSize, NULL, kvImageEdgeExtend);
+    if (error) {
+        NSLog(@"error from convolution %ld", error);
+    }
+    CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
+    CGContextRef ctx = CGBitmapContextCreate( outBuffer.data, outBuffer.width, outBuffer.height, 8, outBuffer.rowBytes, colorSpace, kCGImageAlphaNoneSkipLast);
+    CGImageRef imageRef = CGBitmapContextCreateImage (ctx);
+    UIImage *returnImage = [UIImage imageWithCGImage:imageRef];
+    //clean up CGContextRelease(ctx);
+    CGColorSpaceRelease(colorSpace);
+    free(pixelBuffer);
+    CFRelease(inBitmapData);
+    CGColorSpaceRelease(colorSpace);
+    CGImageRelease(imageRef);
+    return returnImage;
+}
+
+@end
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "beer.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "chicken.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "continuous.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "cucumber.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "diamond.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "fighter_small80.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "flower.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "hug.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "love_gift.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "mouth.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "plane_small80.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "porsch_small80.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ring.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "rose.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "sticks.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "背景100x100.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "背景150x100.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "背景200x50.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "背景400x30.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "背景400x300.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file