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

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

Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud
# Conflicts: # LiveVideoCloud/LiveVideoCloud.xcodeproj/project.pbxproj # LiveVideoCloud/LiveVideoCloud/Info
王军波
2 parents d97d20ac 36700c28
Showing 74 changed files with 2449 additions and 377 deletions
LiveVideoCloud/LiveVideoCloud.xcodeproj/project.pbxproj
LiveVideoCloud/LiveVideoCloud/AppCustoms/Main/ZXTabBarController.m
LiveVideoCloud/LiveVideoCloud/Base.lproj/Main.storyboard
LiveVideoCloud/LiveVideoCloud/Classes/SDK/SevenSwitch/SevenSwitch.h
LiveVideoCloud/LiveVideoCloud/Classes/SDK/SevenSwitch/SevenSwitch.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/AnimQueueManager.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/AnimQueueManager.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftAnimOperation.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftAnimOperation.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftAnimationAction.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftAnimationAction.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftComboView.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftComboView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftModel/GiftModel.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftResource/NHCarViews.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftResource/NHCarViews.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftResource/NHFighterView+animDelegagte.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftResource/NHFighterView+animDelegagte.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftResource/NHFighterView.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftResource/NHPlaneViews.h
@@ -19,12 +19,14 @@
 		810B65051E779B1F00133E15 /* NSLayoutConstraint+MASDebugAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 810B64F81E779B1F00133E15 /* NSLayoutConstraint+MASDebugAdditions.m */; };
 		810B65061E779B1F00133E15 /* View+MASAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 810B64FA1E779B1F00133E15 /* View+MASAdditions.m */; };
 		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 */; };
 		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, ); }; };
+		81FB5B3C1E7A6FFC00F98E1D /* SevenSwitch.m in Sources */ = {isa = PBXBuildFile; fileRef = 81FB5B3B1E7A6FFC00F98E1D /* SevenSwitch.m */; };
 		D2029B861E6EAAA50027CD92 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = D2029B851E6EAAA50027CD92 /* main.m */; };
-		D2029B8F1E6EAAA50027CD92 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D2029B8D1E6EAAA50027CD92 /* Main.storyboard */; };
 		D2029B911E6EAAA50027CD92 /* animation.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D2029B901E6EAAA50027CD92 /* animation.xcassets */; };
 		D2029B941E6EAAA50027CD92 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D2029B921E6EAAA50027CD92 /* LaunchScreen.storyboard */; };
 		D2029B9F1E6EAAA50027CD92 /* LiveVideoCloudTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D2029B9E1E6EAAA50027CD92 /* LiveVideoCloudTests.m */; };
@@ -127,10 +129,14 @@
 		D22830FF1E77C69E00627701 /* GiftListView.m in Sources */ = {isa = PBXBuildFile; fileRef = D22830FE1E77C69E00627701 /* GiftListView.m */; };
 		D22831021E77D83C00627701 /* GiftModelView.m in Sources */ = {isa = PBXBuildFile; fileRef = D22831011E77D83C00627701 /* GiftModelView.m */; };
 		D22831091E77D8D500627701 /* GiftModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D22831081E77D8D500627701 /* GiftModel.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 */; };
+		D25530091E791A7100DF38A5 /* GiftComboView.m in Sources */ = {isa = PBXBuildFile; fileRef = D25530081E791A7100DF38A5 /* GiftComboView.m */; };
+		D255300C1E793F8200DF38A5 /* NHFighterView+animDelegagte.m in Sources */ = {isa = PBXBuildFile; fileRef = D255300B1E793F8200DF38A5 /* NHFighterView+animDelegagte.m */; };
 		D2575C461E76857100E3A8FC /* LVCAnimationManager.m in Sources */ = {isa = PBXBuildFile; fileRef = D2575C451E76857100E3A8FC /* LVCAnimationManager.m */; };
 		D2575C4A1E7685DE00E3A8FC /* UIView+Bubbling.m in Sources */ = {isa = PBXBuildFile; fileRef = D2575C481E7685DE00E3A8FC /* UIView+Bubbling.m */; };
 		D2575C671E76A25400E3A8FC /* LVCInteractionController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2575C661E76A25400E3A8FC /* LVCInteractionController.m */; };
-		D2575C6B1E76A45400E3A8FC /* LVCGiftManager.m in Sources */ = {isa = PBXBuildFile; fileRef = D2575C6A1E76A45400E3A8FC /* LVCGiftManager.m */; };
 		D2575C7A1E76A4F300E3A8FC /* NHCarViews.m in Sources */ = {isa = PBXBuildFile; fileRef = D2575C6F1E76A4F300E3A8FC /* NHCarViews.m */; };
 		D2575C7B1E76A4F300E3A8FC /* NHCarViews.xib in Resources */ = {isa = PBXBuildFile; fileRef = D2575C701E76A4F300E3A8FC /* NHCarViews.xib */; };
 		D2575C7C1E76A4F300E3A8FC /* NHFighterView.nib in Resources */ = {isa = PBXBuildFile; fileRef = D2575C721E76A4F300E3A8FC /* NHFighterView.nib */; };
@@ -210,11 +216,17 @@
 		810B64FB1E779B1F00133E15 /* View+MASShorthandAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "View+MASShorthandAdditions.h"; sourceTree = "<group>"; };
 		810B64FC1E779B1F00133E15 /* ViewController+MASAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "ViewController+MASAdditions.h"; sourceTree = "<group>"; };
 		810B64FD1E779B1F00133E15 /* ViewController+MASAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "ViewController+MASAdditions.m"; sourceTree = "<group>"; };
+		810B65081E77B39D00133E15 /* LVCFullScreenPlayerController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCFullScreenPlayerController.h; sourceTree = "<group>"; };
+		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>"; };
 		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>"; };
+		812E50511E7699DC004F5FCD /* KSYGPUResource.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = KSYGPUResource.bundle; 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; };
 		D2029B851E6EAAA50027CD92 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
-		D2029B8E1E6EAAA50027CD92 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		D2029B901E6EAAA50027CD92 /* animation.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = animation.xcassets; sourceTree = "<group>"; };
 		D2029B931E6EAAA50027CD92 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		D2029B951E6EAAA50027CD92 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -434,14 +446,22 @@
 		D22831011E77D83C00627701 /* GiftModelView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GiftModelView.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>"; };
-		D2575C441E76857100E3A8FC /* LVCAnimationManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCAnimationManager.h; sourceTree = "<group>"; };
-		D2575C451E76857100E3A8FC /* LVCAnimationManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCAnimationManager.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>"; };
+		D25530021E79115100DF38A5 /* AnimQueueManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AnimQueueManager.m; sourceTree = "<group>"; };
+		D25530041E7911A800DF38A5 /* GiftAnimationAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GiftAnimationAction.h; sourceTree = "<group>"; };
+		D25530051E7911A800DF38A5 /* GiftAnimationAction.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GiftAnimationAction.m; sourceTree = "<group>"; };
+		D25530071E791A7100DF38A5 /* GiftComboView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GiftComboView.h; sourceTree = "<group>"; };
+		D25530081E791A7100DF38A5 /* GiftComboView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GiftComboView.m; sourceTree = "<group>"; };
+		D255300A1E793F8200DF38A5 /* NHFighterView+animDelegagte.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NHFighterView+animDelegagte.h"; sourceTree = "<group>"; };
+		D255300B1E793F8200DF38A5 /* NHFighterView+animDelegagte.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NHFighterView+animDelegagte.m"; sourceTree = "<group>"; };
+		D2575C441E76857100E3A8FC /* LVCAnimationManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LVCAnimationManager.h; path = ../LVCAnimationManager.h; sourceTree = "<group>"; };
+		D2575C451E76857100E3A8FC /* LVCAnimationManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = LVCAnimationManager.m; path = ../LVCAnimationManager.m; sourceTree = "<group>"; };
 		D2575C481E7685DE00E3A8FC /* UIView+Bubbling.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+Bubbling.m"; sourceTree = "<group>"; };
 		D2575C491E7685DE00E3A8FC /* UIView+Bubbling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+Bubbling.h"; sourceTree = "<group>"; };
 		D2575C651E76A25400E3A8FC /* LVCInteractionController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCInteractionController.h; sourceTree = "<group>"; };
 		D2575C661E76A25400E3A8FC /* LVCInteractionController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCInteractionController.m; sourceTree = "<group>"; };
-		D2575C691E76A45400E3A8FC /* LVCGiftManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCGiftManager.h; sourceTree = "<group>"; };
-		D2575C6A1E76A45400E3A8FC /* LVCGiftManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCGiftManager.m; sourceTree = "<group>"; };
 		D2575C6D1E76A4F300E3A8FC /* NHCarView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NHCarView.h; sourceTree = "<group>"; };
 		D2575C6E1E76A4F300E3A8FC /* NHCarViews.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NHCarViews.h; sourceTree = "<group>"; };
 		D2575C6F1E76A4F300E3A8FC /* NHCarViews.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NHCarViews.m; sourceTree = "<group>"; };
@@ -550,6 +570,15 @@
 			path = CNLiveSDK;
 			sourceTree = "<group>";
 		};
+		81FB5B391E7A6FFC00F98E1D /* SevenSwitch */ = {
+			isa = PBXGroup;
+			children = (
+				81FB5B3A1E7A6FFC00F98E1D /* SevenSwitch.h */,
+				81FB5B3B1E7A6FFC00F98E1D /* SevenSwitch.m */,
+			);
+			path = SevenSwitch;
+			sourceTree = "<group>";
+		};
 		D2029B781E6EAAA50027CD92 = {
 			isa = PBXGroup;
 			children = (
@@ -590,7 +619,6 @@
 			isa = PBXGroup;
 			children = (
 				D2029B921E6EAAA50027CD92 /* LaunchScreen.storyboard */,
-				D2029B8D1E6EAAA50027CD92 /* Main.storyboard */,
 				D2029B851E6EAAA50027CD92 /* main.m */,
 				D2029B951E6EAAA50027CD92 /* Info.plist */,
 			);
@@ -675,6 +703,7 @@
 		D2029BD41E6EADE10027CD92 /* SDK */ = {
 			isa = PBXGroup;
 			children = (
+				81FB5B391E7A6FFC00F98E1D /* SevenSwitch */,
 				810B64E41E779B1F00133E15 /* Masonry */,
 				D2029BD51E6EADE10027CD92 /* AFNetworking */,
 				D2029BF81E6EADE10027CD92 /* MBProgressHUD */,
@@ -1227,8 +1256,6 @@
 				D2575C661E76A25400E3A8FC /* LVCInteractionController.m */,
 				D2575C681E76A42B00E3A8FC /* Gift */,
 				D2575C471E7685C500E3A8FC /* heartAnimation */,
-				D2575C441E76857100E3A8FC /* LVCAnimationManager.h */,
-				D2575C451E76857100E3A8FC /* LVCAnimationManager.m */,
 			);
 			path = InteractionSections;
 			sourceTree = "<group>";
@@ -1238,6 +1265,8 @@
 			children = (
 				D2575C491E7685DE00E3A8FC /* UIView+Bubbling.h */,
 				D2575C481E7685DE00E3A8FC /* UIView+Bubbling.m */,
+				D2575C441E76857100E3A8FC /* LVCAnimationManager.h */,
+				D2575C451E76857100E3A8FC /* LVCAnimationManager.m */,
 			);
 			path = heartAnimation;
 			sourceTree = "<group>";
@@ -1245,8 +1274,14 @@
 		D2575C681E76A42B00E3A8FC /* Gift */ = {
 			isa = PBXGroup;
 			children = (
-				D2575C691E76A45400E3A8FC /* LVCGiftManager.h */,
-				D2575C6A1E76A45400E3A8FC /* LVCGiftManager.m */,
+				D25530071E791A7100DF38A5 /* GiftComboView.h */,
+				D25530081E791A7100DF38A5 /* GiftComboView.m */,
+				D25530041E7911A800DF38A5 /* GiftAnimationAction.h */,
+				D25530051E7911A800DF38A5 /* GiftAnimationAction.m */,
+				D25530011E79115100DF38A5 /* AnimQueueManager.h */,
+				D25530021E79115100DF38A5 /* AnimQueueManager.m */,
+				D2552FFE1E7909AC00DF38A5 /* GiftAnimOperation.h */,
+				D2552FFF1E7909AC00DF38A5 /* GiftAnimOperation.m */,
 				D22830F51E77C24900627701 /* GiftViews */,
 				D2575C6C1E76A4F300E3A8FC /* GiftResource */,
 				D22831061E77D8D500627701 /* GiftModel */,
@@ -1257,6 +1292,8 @@
 		D2575C6C1E76A4F300E3A8FC /* GiftResource */ = {
 			isa = PBXGroup;
 			children = (
+				D255300A1E793F8200DF38A5 /* NHFighterView+animDelegagte.h */,
+				D255300B1E793F8200DF38A5 /* NHFighterView+animDelegagte.m */,
 				D2575C6D1E76A4F300E3A8FC /* NHCarView.h */,
 				D2575C6E1E76A4F300E3A8FC /* NHCarViews.h */,
 				D2575C6F1E76A4F300E3A8FC /* NHCarViews.m */,
@@ -1337,6 +1374,8 @@
 				D2888DB31E6EC154003A77C8 /* HomeViewController.m */,
 				810B64E11E779AFE00133E15 /* LVCLivePlayerController.h */,
 				810B64E21E779AFE00133E15 /* LVCLivePlayerController.m */,
+				810B65081E77B39D00133E15 /* LVCFullScreenPlayerController.h */,
+				810B65091E77B39D00133E15 /* LVCFullScreenPlayerController.m */,
 			);
 			path = Controller;
 			sourceTree = "<group>";
@@ -1353,6 +1392,8 @@
 			children = (
 				810B64DE1E779AE900133E15 /* LVCPlayer.h */,
 				810B64DF1E779AE900133E15 /* LVCPlayer.m */,
+				8112D42F1E7927A5002E00F6 /* LVCPlayerLoadingView.h */,
+				8112D4301E7927A5002E00F6 /* LVCPlayerLoadingView.m */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -1510,6 +1551,7 @@
 				D2575C7C1E76A4F300E3A8FC /* NHFighterView.nib in Resources */,
 				D25BF87D1E7B8C78007FB138 /* KSYGPUResource.bundle in Resources */,
 				D2029B8F1E6EAAA50027CD92 /* Main.storyboard in Resources */,
+				812E50541E7699DC004F5FCD /* KSYGPUResource.bundle in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1534,6 +1576,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				D25530091E791A7100DF38A5 /* GiftComboView.m in Sources */,
 				D2029CC31E6EADE10027CD92 /* UIImageView+HighlightedWebCache.m in Sources */,
 				D22830FF1E77C69E00627701 /* GiftListView.m in Sources */,
 				D2029CC01E6EADE10027CD92 /* UIImage+GIF.m in Sources */,
@@ -1585,6 +1628,7 @@
 				D2029CA21E6EADE10027CD92 /* MJRefreshAutoFooter.m in Sources */,
 				D2029CC71E6EADE10027CD92 /* SVIndefiniteAnimatedView.m in Sources */,
 				D2029CA31E6EADE10027CD92 /* MJRefreshBackFooter.m in Sources */,
+				D255300C1E793F8200DF38A5 /* NHFighterView+animDelegagte.m in Sources */,
 				D2575C4A1E7685DE00E3A8FC /* UIView+Bubbling.m in Sources */,
 				D22831021E77D83C00627701 /* GiftModelView.m in Sources */,
 				D2029CA61E6EADE10027CD92 /* MJRefreshHeader.m in Sources */,
@@ -1608,6 +1652,7 @@
 				D2575C461E76857100E3A8FC /* LVCAnimationManager.m in Sources */,
 				D2029C8A1E6EADE10027CD92 /* AFURLRequestSerialization.m in Sources */,
 				D2029D041E6EAE2E0027CD92 /* UILabel+ContentSize.m in Sources */,
+				D25530031E79115100DF38A5 /* AnimQueueManager.m in Sources */,
 				D2029C871E6EADE10027CD92 /* AFHTTPSessionManager.m in Sources */,
 				D2029B861E6EAAA50027CD92 /* main.m in Sources */,
 				D2029C8C1E6EADE10027CD92 /* AFURLSessionManager.m in Sources */,
@@ -1632,6 +1677,7 @@
 				D2029C891E6EADE10027CD92 /* AFSecurityPolicy.m in Sources */,
 				D22830F11E778C0F00627701 /* LiveBaseView.m in Sources */,
 				D2029CBA1E6EADE10027CD92 /* SDWebImageDecoder.m in Sources */,
+				8112D4311E7927A5002E00F6 /* LVCPlayerLoadingView.m in Sources */,
 				D2029D081E6EAE2E0027CD92 /* ZXDeviceInfo.m in Sources */,
 				D2029CC21E6EADE10027CD92 /* UIImage+WebP.m in Sources */,
 				D2029BCD1E6EADD70027CD92 /* BaseViewController.m in Sources */,
@@ -1641,11 +1687,13 @@
 				D2029D001E6EAE2E0027CD92 /* NSNumber+ScaleHeight.m in Sources */,
 				D2888D9E1E6EBF1B003A77C8 /* LVCLiveViewController.m in Sources */,
 				D2029C951E6EADE10027CD92 /* UIWebView+AFNetworking.m in Sources */,
-				D2575C6B1E76A45400E3A8FC /* LVCGiftManager.m in Sources */,
+				810B650A1E77B39D00133E15 /* LVCFullScreenPlayerController.m in Sources */,
 				D2029CBD1E6EADE10027CD92 /* SDWebImageManager.m in Sources */,
 				D2029CB41E6EADE10027CD92 /* UIView+MJExtension.m in Sources */,
+				81FB5B3C1E7A6FFC00F98E1D /* SevenSwitch.m in Sources */,
 				D2029CA91E6EADE10027CD92 /* MJRefreshAutoStateFooter.m in Sources */,
 				D2029D061E6EAE2E0027CD92 /* UIView+Extension.m in Sources */,
+				D25530001E7909AC00DF38A5 /* GiftAnimOperation.m in Sources */,
 				D2029C9D1E6EADE10027CD92 /* NSObject+MJClass.m in Sources */,
 				D2029CCF1E6EADE10027CD92 /* SearchHttp.m in Sources */,
 				810B65001E779B1F00133E15 /* MASConstraintMaker.m in Sources */,
@@ -1654,6 +1702,7 @@
 				D2029BCC1E6EADD70027CD92 /* BaseView.m in Sources */,
 				D2888D941E6EB8B4003A77C8 /* LVCTabBar.m in Sources */,
 				D2888DB41E6EC154003A77C8 /* HomeViewController.m in Sources */,
+				D25530061E7911A800DF38A5 /* GiftAnimationAction.m in Sources */,
 				D2029CD41E6EADE70027CD92 /* HttpService.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1690,14 +1739,6 @@
 /* End PBXTargetDependency section */
  
 /* Begin PBXVariantGroup section */
-		D2029B8D1E6EAAA50027CD92 /* Main.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				D2029B8E1E6EAAA50027CD92 /* Base */,
-			);
-			name = Main.storyboard;
-			sourceTree = "<group>";
-		};
 		D2029B921E6EAAA50027CD92 /* LaunchScreen.storyboard */ = {
 			isa = PBXVariantGroup;
 			children = (
@@ -1803,6 +1844,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1816,7 +1858,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftResource",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.zhangxu.LiveVideoCloud;
+				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.video;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -1825,6 +1867,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1838,7 +1881,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftResource",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.zhangxu.LiveVideoCloud;
+				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.video;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
@@ -90,7 +90,6 @@
  
 }
  
-
 -(BOOL)shouldAutorotate{
     return NO;
 }
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11134" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11106"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <scenes>
-        <!--View Controller-->
-        <scene sceneID="tne-QT-ifu">
-            <objects>
-                <viewController id="BYZ-38-t0r" customClass="ViewController" customModuleProvider="" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
-                        <viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                    </view>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
-            </objects>
-        </scene>
-    </scenes>
-</document>
+//
+//  SevenSwitch
+//
+//  Created by Benjamin Vogelzang on 6/10/13.
+//  Copyright (c) 2013 Ben Vogelzang. All rights reserved.
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in
+//  all copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+//  THE SOFTWARE.
+
+#import <UIKit/UIKit.h>
+
+@protocol SevenSwitchDelegate <NSObject>
+
+- (void)sevenSwitchChanged:(BOOL)change;
+
+@end
+
+@interface SevenSwitch : UIControl
+
+@property (nonatomic, weak) id<SevenSwitchDelegate> delegate;
+
+/*
+ * Set (without animation) whether the switch is on or off
+ */
+@property (nonatomic, assign) BOOL on;
+
+
+/*
+ *	Sets the background color when the switch is off.
+ *  Defaults to clear color.
+ */
+@property (nonatomic, strong) UIColor *inactiveColor;
+
+/*
+ *	Sets the background color that shows when the switch off and actively being touched.
+ *  Defaults to light gray.
+ */
+@property (nonatomic, strong) UIColor *activeColor;
+
+/*
+ *	Sets the background color that shows when the switch is on.
+ *  Defaults to green.
+ */
+@property (nonatomic, strong) UIColor *onColor;
+
+/*
+ *	Sets the border color that shows when the switch is off. Defaults to light gray.
+ */
+@property (nonatomic, strong) UIColor *borderColor;
+
+/*
+ *	Sets the knob color. Defaults to white.
+ */
+@property (nonatomic, strong) UIColor *knobColor;
+
+@property (nonatomic, strong) UIImage *knobOnImage;
+@property (nonatomic, strong) UIImage *knobOffImage;
+@property (nonatomic, strong) UIColor *knobOnColor;
+@property (nonatomic, strong) UIColor *knobOffColor;
+
+/*
+ *	Sets the shadow color of the knob. Defaults to gray.
+ */
+@property (nonatomic, strong) UIColor *shadowColor;
+
+
+/*
+ *	Sets whether or not the switch edges are rounded.
+ *  Set to NO to get a stylish square switch.
+ *  Defaults to YES.
+ */
+@property (nonatomic, assign) BOOL isRounded;
+
+@property (nonatomic, assign) CGFloat cornerRadius;
+
+
+/*
+ *	Sets the image that shows when the switch is on.
+ *  The image is centered in the area not covered by the knob.
+ *  Make sure to size your images appropriately.
+ */
+@property (nonatomic, strong) UIImage *onImage;
+
+/*
+ *	Sets the image that shows when the switch is off.
+ *  The image is centered in the area not covered by the knob.
+ *  Make sure to size your images appropriately.
+ */
+@property (nonatomic, strong) UIImage *offImage;
+
+
+/*
+ * Set whether the switch is on or off. Optionally animate the change
+ */
+- (void)setOn:(BOOL)on animated:(BOOL)animated;
+
+/*
+ *	Detects whether the switch is on or off
+ *
+ *	@return	BOOL YES if switch is on. NO if switch is off
+ */
+- (BOOL)isOn;
+
+@end
+//
+//  SevenSwitch
+//
+//  Created by Benjamin Vogelzang on 6/10/13.
+//  Copyright (c) 2013 Ben Vogelzang. All rights reserved.
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in
+//  all copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+//  THE SOFTWARE.
+
+#import "SevenSwitch.h"
+#import <QuartzCore/QuartzCore.h>
+
+@interface SevenSwitch ()  {
+    UIView *background;
+    UIImageView *knob;
+    UIImageView *onImageView;
+    UIImageView *offImageView;
+    double startTime;
+    BOOL isAnimating;
+}
+
+- (void)showOn:(BOOL)animated;
+- (void)showOff:(BOOL)animated;
+- (void)setup;
+
+@end
+
+
+@implementation SevenSwitch
+
+@synthesize inactiveColor, activeColor, onColor, borderColor, knobColor, shadowColor;
+@synthesize onImage, offImage;
+@synthesize isRounded;
+@synthesize on;
+
+
+#pragma mark init Methods
+
+- (id)init {
+    self = [super initWithFrame:CGRectMake(0, 0, 50, 30)];
+    if (self) {
+        [self setup];
+    }
+    return self;
+}
+
+- (id)initWithCoder:(NSCoder *)aDecoder {
+    self = [super initWithCoder:aDecoder];
+    if (self) {
+        [self setup];
+    }
+    return self;
+}
+
+- (id)initWithFrame:(CGRect)frame
+{
+    // use the default values if CGRectZero frame is set
+    CGRect initialFrame;
+    if (CGRectIsEmpty(frame)) {
+        initialFrame = CGRectMake(0, 0, 50, 30);
+    }
+    else {
+        initialFrame = frame;
+    }
+    self = [super initWithFrame:initialFrame];
+    if (self) {
+        [self setup];
+    }
+    return self;
+}
+
+
+/**
+ *	Setup the individual elements of the switch and set default values
+ */
+- (void)setup {
+    
+    // default values
+    self.on = NO;
+    self.isRounded = YES;
+    self.inactiveColor = [UIColor clearColor];
+    self.activeColor = [UIColor colorWithRed:0.89f green:0.89f blue:0.89f alpha:1.00f];
+    self.onColor = [UIColor colorWithRed:0.30f green:0.85f blue:0.39f alpha:1.00f];
+    self.borderColor = [UIColor colorWithRed:0.89f green:0.89f blue:0.91f alpha:1.00f];
+    self.knobColor = [UIColor whiteColor];
+    self.shadowColor = [UIColor grayColor];
+    self.cornerRadius = 2;
+    
+    // background
+    background = [[UIView alloc] initWithFrame:CGRectMake(0, 0, self.frame.size.width, self.frame.size.height)];
+    background.backgroundColor = [UIColor clearColor];
+    background.layer.cornerRadius = self.frame.size.height * 0.5;
+//    background.layer.borderColor = self.borderColor.CGColor;
+//    background.layer.borderWidth = 1.0;
+    background.userInteractionEnabled = NO;
+    [self addSubview:background];
+    
+    // images
+    onImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, self.frame.size.width - self.frame.size.height, self.frame.size.height)];
+    onImageView.alpha = 0;
+    onImageView.contentMode = UIViewContentModeCenter;
+    [self addSubview:onImageView];
+    
+    offImageView = [[UIImageView alloc] initWithFrame:CGRectMake(self.frame.size.height, 0, self.frame.size.width - self.frame.size.height, self.frame.size.height)];
+    offImageView.alpha = 1.0;
+    offImageView.contentMode = UIViewContentModeCenter;
+    [self addSubview:offImageView];
+    
+    // knob
+    knob = [[UIImageView alloc] initWithFrame:CGRectMake(1, 1, self.frame.size.height - 2, self.frame.size.height - 2)];
+    knob.backgroundColor = self.knobColor;
+    knob.layer.cornerRadius = (self.frame.size.height * 0.5) - 1;
+    knob.layer.shadowColor = self.shadowColor.CGColor;
+    knob.layer.shadowRadius = 2.0;
+    knob.layer.shadowOpacity = 0.5;
+    knob.layer.shadowOffset = CGSizeMake(0, 3);
+    knob.layer.masksToBounds = NO;
+    knob.userInteractionEnabled = NO;
+    [self addSubview:knob];
+    
+    isAnimating = NO;
+}
+
+
+#pragma mark Touch Tracking
+
+- (BOOL)beginTrackingWithTouch:(UITouch *)touch withEvent:(UIEvent *)event {
+    [super beginTrackingWithTouch:touch withEvent:event];
+
+    // start timer to detect tap later in endTrackingWithTouch:withEvent:
+    startTime = [[NSDate date] timeIntervalSince1970];
+
+    // make the knob larger and animate to the correct color
+    CGFloat activeKnobWidth = self.bounds.size.height - 2 + 5;
+    isAnimating = YES;
+    [UIView animateWithDuration:0.3 delay:0.0 options:UIViewAnimationOptionCurveEaseOut|UIViewAnimationOptionBeginFromCurrentState animations:^{
+        if (self.on) {
+            knob.frame = CGRectMake(self.bounds.size.width - (activeKnobWidth + 1), knob.frame.origin.y, activeKnobWidth, knob.frame.size.height);
+            background.backgroundColor = self.onColor;
+            knob.image = self.knobOnImage;
+            knob.backgroundColor = self.knobOnColor;
+        }
+        else {
+            knob.frame = CGRectMake(knob.frame.origin.x, knob.frame.origin.y, activeKnobWidth, knob.frame.size.height);
+            background.backgroundColor = self.activeColor;
+            knob.image = self.knobOffImage;
+            knob.backgroundColor = self.knobOffColor;
+        }
+    } completion:^(BOOL finished) {
+        isAnimating = NO;
+    }];
+
+    return YES;
+}
+
+- (BOOL)continueTrackingWithTouch:(UITouch *)touch withEvent:(UIEvent *)event {
+    [super continueTrackingWithTouch:touch withEvent:event];
+
+    // Get touch location
+    CGPoint lastPoint = [touch locationInView:self];
+
+    // update the switch to the correct visuals depending on if
+    // they moved their touch to the right or left side of the switch
+    if (lastPoint.x > self.bounds.size.width * 0.5)
+        [self showOn:YES];
+    else
+        [self showOff:YES];
+
+    return YES;
+}
+
+- (void)endTrackingWithTouch:(UITouch *)touch withEvent:(UIEvent *)event {
+    [super endTrackingWithTouch:touch withEvent:event];
+
+    // capture time to see if this was a tap action
+    double endTime = [[NSDate date] timeIntervalSince1970];
+    double difference = endTime - startTime;
+    BOOL previousValue = self.on;
+    
+    // determine if the user tapped the switch or has held it for longer
+    if (difference <= 0.2) {
+        CGFloat normalKnobWidth = self.bounds.size.height - 2;
+        knob.frame = CGRectMake(knob.frame.origin.x, knob.frame.origin.y, normalKnobWidth, knob.frame.size.height);
+        knob.image = self.knobOffImage;
+        knob.backgroundColor = self.knobOffColor;
+        
+        [self setOn:!self.on animated:YES];
+    }
+    else {
+        // Get touch location
+        CGPoint lastPoint = [touch locationInView:self];
+        
+        // update the switch to the correct value depending on if
+        // their touch finished on the right or left side of the switch
+        if (lastPoint.x > self.bounds.size.width * 0.5)
+            [self setOn:YES animated:YES];
+        else
+            [self setOn:NO animated:YES];
+    }
+    
+    if (previousValue != self.on)
+        [self sendActionsForControlEvents:UIControlEventValueChanged];
+}
+
+- (void)cancelTrackingWithEvent:(UIEvent *)event {
+    [super cancelTrackingWithEvent:event];
+
+    // just animate back to the original value
+    if (self.on)
+        [self showOn:YES];
+    else
+        [self showOff:YES];
+}
+
+
+- (void)layoutSubviews {
+    [super layoutSubviews];
+    
+    if (!isAnimating) {
+        CGRect frame = self.frame;
+        
+        // background
+        background.frame = CGRectMake(0, 0, frame.size.width, frame.size.height);
+        background.layer.cornerRadius = self.isRounded ? frame.size.height * 0.5 : self.cornerRadius;
+        
+        // images
+        onImageView.frame = CGRectMake(0, 0, frame.size.width - frame.size.height, frame.size.height);
+        offImageView.frame = CGRectMake(frame.size.height, 0, frame.size.width - frame.size.height, frame.size.height);
+        
+        // knob
+        CGFloat normalKnobWidth = frame.size.height - 2;
+        if (self.on)
+        {
+            knob.frame = CGRectMake(frame.size.width - (normalKnobWidth + 1), 1, frame.size.height - 2, normalKnobWidth);
+            knob.image = self.knobOnImage;
+            knob.backgroundColor = self.knobOnColor;
+        }
+        else
+        {
+            knob.frame = CGRectMake(1, 1, normalKnobWidth, normalKnobWidth);
+            knob.image = self.knobOffImage;
+            knob.backgroundColor = self.knobOffColor;
+        }
+        
+        knob.layer.cornerRadius = self.isRounded ? (frame.size.height * 0.5) - 1 : 2;
+    }
+}
+
+
+#pragma mark Setters
+
+/*
+ *	Sets the background color when the switch is off. 
+ *  Defaults to clear color.
+ */
+- (void)setInactiveColor:(UIColor *)color {
+    inactiveColor = color;
+    if (!self.on && !self.isTracking)
+        background.backgroundColor = color;
+}
+
+/*
+ *	Sets the background color that shows when the switch is on. 
+ *  Defaults to green.
+ */
+- (void)setOnColor:(UIColor *)color {
+    onColor = color;
+    if (self.on && !self.isTracking) {
+        background.backgroundColor = color;
+//        background.layer.borderColor = color.CGColor;
+    }
+}
+
+/*
+ *	Sets the border color that shows when the switch is off. Defaults to light gray.
+ */
+- (void)setBorderColor:(UIColor *)color {
+    borderColor = color;
+//    if (!self.on)
+//        background.layer.borderColor = color.CGColor;
+}
+
+/*
+ *	Sets the knob color. Defaults to white.
+ */
+- (void)setKnobColor:(UIColor *)color {
+    knobColor = color;
+    knob.backgroundColor = color;
+}
+
+/*
+ *	Sets the shadow color of the knob. Defaults to gray.
+ */
+- (void)setShadowColor:(UIColor *)color {
+    shadowColor = color;
+    knob.layer.shadowColor = color.CGColor;
+}
+
+
+/*
+ *	Sets the image that shows when the switch is on.
+ *  The image is centered in the area not covered by the knob.
+ *  Make sure to size your images appropriately.
+ */
+- (void)setOnImage:(UIImage *)image {
+    onImage = image;
+    onImageView.image = image;
+}
+
+/*
+ *	Sets the image that shows when the switch is off.
+ *  The image is centered in the area not covered by the knob.
+ *  Make sure to size your images appropriately.
+ */
+- (void)setOffImage:(UIImage *)image {
+    offImage = image;
+    offImageView.image = image;
+}
+
+
+/*
+ *	Sets whether or not the switch edges are rounded. 
+ *  Set to NO to get a stylish square switch.
+ *  Defaults to YES.
+ */
+- (void)setIsRounded:(BOOL)rounded {
+    isRounded = rounded;
+    
+    if (rounded) {
+        background.layer.cornerRadius = self.frame.size.height * 0.5;
+        knob.layer.cornerRadius = (self.frame.size.height * 0.5) - 1;
+    }
+    else {
+        background.layer.cornerRadius = self.cornerRadius;
+        knob.layer.cornerRadius = 2;
+    }
+}
+
+
+/*
+ * Set (without animation) whether the switch is on or off
+ */
+- (void)setOn:(BOOL)isOn {
+    [self setOn:isOn animated:NO];
+}
+
+
+/*
+ * Set the state of the switch to on or off, optionally animating the transition.
+ */
+- (void)setOn:(BOOL)isOn animated:(BOOL)animated {
+    on = isOn;
+    
+    if ([self.delegate respondsToSelector:@selector(sevenSwitchChanged:)]) {
+        [self.delegate sevenSwitchChanged:isOn];
+    }
+    
+    if (isOn) {
+        [self showOn:animated];
+    }
+    else {
+        [self showOff:animated];
+    }
+}
+
+
+#pragma mark Getters
+
+/*
+ *	Detects whether the switch is on or off
+ *
+ *	@return	BOOL YES if switch is on. NO if switch is off
+ */
+- (BOOL)isOn {
+    return self.on;
+}
+
+
+#pragma mark State Changes
+
+
+/*
+ * update the looks of the switch to be in the on position
+ * optionally make it animated
+ */
+- (void)showOn:(BOOL)animated {
+    CGFloat normalKnobWidth = self.bounds.size.height - 2;
+    CGFloat activeKnobWidth = normalKnobWidth + 5;
+    if (animated) {
+        isAnimating = YES;
+        [UIView animateWithDuration:0.3 delay:0.0 options:UIViewAnimationOptionCurveEaseOut|UIViewAnimationOptionBeginFromCurrentState animations:^{
+            if (self.tracking)
+            {
+                knob.frame = CGRectMake(self.bounds.size.width - (activeKnobWidth + 1), knob.frame.origin.y, activeKnobWidth, knob.frame.size.height);
+            }
+            else
+            {
+                knob.frame = CGRectMake(self.bounds.size.width - (normalKnobWidth + 1), knob.frame.origin.y, normalKnobWidth, knob.frame.size.height);
+            }
+            knob.image = self.knobOnImage;
+            knob.backgroundColor = self.knobOnColor;
+            background.backgroundColor = self.onColor;
+//            background.layer.borderColor = self.onColor.CGColor;
+            onImageView.alpha = 1.0;
+            offImageView.alpha = 0;
+        } completion:^(BOOL finished) {
+            isAnimating = NO;
+        }];
+    }
+    else {
+        if (self.tracking)
+        {
+            knob.frame = CGRectMake(self.bounds.size.width - (activeKnobWidth + 1), knob.frame.origin.y, activeKnobWidth, knob.frame.size.height);
+        }
+        else
+        {
+            knob.frame = CGRectMake(self.bounds.size.width - (normalKnobWidth + 1), knob.frame.origin.y, normalKnobWidth, knob.frame.size.height);
+        }
+        knob.image = self.knobOnImage;
+        knob.backgroundColor = self.knobOnColor;
+        background.backgroundColor = self.onColor;
+//        background.layer.borderColor = self.onColor.CGColor;
+        onImageView.alpha = 1.0;
+        offImageView.alpha = 0;
+    }
+}
+
+
+/*
+ * update the looks of the switch to be in the off position
+ * optionally make it animated
+ */
+- (void)showOff:(BOOL)animated {
+    CGFloat normalKnobWidth = self.bounds.size.height - 2;
+    CGFloat activeKnobWidth = normalKnobWidth + 5;
+    if (animated) {
+        isAnimating = YES;
+        [UIView animateWithDuration:0.3 delay:0.0 options:UIViewAnimationOptionCurveEaseOut|UIViewAnimationOptionBeginFromCurrentState animations:^{
+            if (self.tracking) {
+                knob.frame = CGRectMake(1, knob.frame.origin.y, activeKnobWidth, knob.frame.size.height);
+                background.backgroundColor = self.activeColor;
+            }
+            else {
+                knob.frame = CGRectMake(1, knob.frame.origin.y, normalKnobWidth, knob.frame.size.height);
+                background.backgroundColor = self.inactiveColor;
+            }
+            knob.image = self.knobOffImage;
+            knob.backgroundColor = self.knobOffColor;
+//            background.layer.borderColor = self.borderColor.CGColor;
+            onImageView.alpha = 0;
+            offImageView.alpha = 1.0;
+        } completion:^(BOOL finished) {
+            isAnimating = NO;
+        }];
+    }
+    else {
+        if (self.tracking) {
+            knob.frame = CGRectMake(1, knob.frame.origin.y, activeKnobWidth, knob.frame.size.height);
+            background.backgroundColor = self.activeColor;
+        }
+        else {
+            knob.frame = CGRectMake(1, knob.frame.origin.y, normalKnobWidth, knob.frame.size.height);
+            background.backgroundColor = self.inactiveColor;
+        }
+        knob.image = self.knobOffImage;
+        knob.backgroundColor = self.knobOffColor;
+//        background.layer.borderColor = self.borderColor.CGColor;
+        onImageView.alpha = 0;
+        offImageView.alpha = 1.0;
+    }
+}
+
+@end
+//
+//  AnimQueueManager.h
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/15.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@class GiftModel;
+@interface AnimQueueManager : NSObject
+
+@property (nonatomic, assign)NSInteger maxTop;   //初始位置（需要根据显示设置最低位置在哪里）
+//@property (nonatomic, strong)NSMutableArray *arGiftArray;   //横幅的数量，用于轨道计算（现在结构是一维数组，因为轨道中的弹道只有1个，如果是多个的话需要变为二维数组）
+
+/**
+ 初始化管理类
+ @return 当前manager
+ */
++ (instancetype)sharedAnimQueueManager;
+
+/**
+ 根据实际model添加飞机横幅动画(火箭、飞机横幅动画为一个队列)
+ 
+ @param animContentView 需要把动画view添加到的view
+ @param model modelobj
+ */
+- (void)addAnimationWithModel:(GiftModel *)model animContentView:(UIView *)animContentView;
+
+@end
+//
+//  AnimQueueManager.m
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/15.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "AnimQueueManager.h"
+#import "GiftAnimOperation.h"
+#import "GiftModel.h"
+
+@interface AnimQueueManager ()
+
+@property (nonatomic, assign)NSInteger maxOperationCount;   //并发数
+@property (nonatomic,strong) NSOperationQueue *comboAnimationQueue;  //连击动画队列
+@property (nonatomic,strong) NSOperationQueue *expenAnimationQueue;  //豪华礼物动画队列
+
+@end
+
+@implementation AnimQueueManager
+
+/**
+ 初始化管理类
+ @return 当前manager
+ */
++ (instancetype)sharedAnimQueueManager{
+    
+    static AnimQueueManager *manager;
+    
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        manager = [[AnimQueueManager alloc] init];
+        manager.maxOperationCount = 2;
+//        manager.arGiftArray = [NSMutableArray arrayWithObjects:@200,@240,@280, nil];
+    });
+    return manager;
+}
+
+/**
+ 连击动画队列
+ 
+ @return 队列obj
+ */
+- (NSOperationQueue *)comboAnimationQueue{
+    if (_comboAnimationQueue == nil) {
+        _comboAnimationQueue = [[NSOperationQueue alloc] init];
+        _comboAnimationQueue.maxConcurrentOperationCount = 3;
+    }
+    return _comboAnimationQueue;
+}
+
+/**
+ 豪华动画队列
+ 
+ @return 队列obj
+ */
+- (NSOperationQueue *)expenAnimationQueue{
+    if (_expenAnimationQueue == nil) {
+        _expenAnimationQueue = [[NSOperationQueue alloc] init];
+        _expenAnimationQueue.maxConcurrentOperationCount = 1;
+    }
+    return _expenAnimationQueue;
+}
+
+/**
+ 根据实际model添加动画
+ 
+ @param model modelobj
+ */
+- (void)addAnimationWithModel:(GiftModel *)model animContentView:(UIView *)animContentView{
+
+    GiftAnimOperation *op = [GiftAnimOperation addGiftAnimOperationWithGiftModel:model animContentView:animContentView maxTop:self.maxTop];
+    NSInteger index = self.comboAnimationQueue.operationCount;
+    NSLog(@"index:%zd",index);
+    switch (model.giftStyle) {
+        case GiftStylePorsch:
+            [self.expenAnimationQueue addOperation:op];
+            break;
+//        case GiftStyleFighter:
+//            [self.expenAnimationQueue addOperation:op];
+//            break;
+        case GiftStylePlane:
+            [self.expenAnimationQueue addOperation:op];
+            break;
+        case GiftStyleCombo:
+        {
+            [self.comboAnimationQueue addOperation:op];
+//            int i = rand()%4;
+//            op.name = i >0 ? @"张三_love" : @"李四_flower";//name imagename
+//            self.comboAnimationQueue.suspended;
+        }
+            
+            break;
+        default:
+            break;
+    }
+}
+
+@end
+//
+//  GiftAnimOperation.h
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/15.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+@class GiftModel;
+
+@interface GiftAnimOperation : NSOperation
+
++ (GiftAnimOperation *)addGiftAnimOperationWithGiftModel:(GiftModel *)model animContentView:(UIView *)animContentView maxTop:(NSInteger)maxTop;
+
+@end
+//
+//  GiftAnimOperation.m
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/15.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "GiftAnimOperation.h"
+#import "GiftModel.h"
+#import "GiftComboView.h"
+#import "NHCarViews.h"
+#import "NHPlaneViews.h"
+#import "GiftAnimationAction.h"
+//#import "NHFighterView.h"
+//#import "NHFighterView+animDelegagte.h"
+
+@interface GiftAnimOperation ()
+{
+    BOOL _finished;  //用于设置队列是否完成
+    BOOL _executing; //队列任务开始执行
+}
+
+@property (nonatomic, strong)GiftComboView *giftComboView;  //连击动画
+@property (nonatomic, strong)NHCarViews *giftCarView;  //跑车动画
+//@property (nonatomic, strong)NHFighterView *giftFighterView;  //歼灭机动画
+@property (nonatomic, strong)NHPlaneViews *giftPlaneView;  //客机动画
+
+@property (nonatomic, strong)GiftModel *model;  //model
+@property (nonatomic,strong) UIView *animContentView;   //需要显示动画的view
+@property (nonatomic, assign)NSInteger maxTop;   //初始位置（需要根据显示设置最低位置在哪里）
+@property (nonatomic ,strong) NSArray * _Nullable             defaultTrajory;//默认轨迹数组
+@property (nonatomic ,strong) NSMutableArray * _Nullable       emptyTrajory;//当前空轨迹数组
+
+@end
+
+@implementation GiftAnimOperation
+
++ (GiftAnimOperation *)addGiftAnimOperationWithGiftModel:(GiftModel *)model animContentView:(UIView *)animContentView maxTop:(NSInteger)maxTop{
+    
+    GiftAnimOperation *giftAnimOperation = [[GiftAnimOperation alloc]initWithGiftModel:model animContentView:animContentView maxTop:maxTop];
+    return giftAnimOperation;
+}
+
+/**
+ 初始化
+ 
+ @param model 礼物model
+ @param animContentView 需要把动画view添加到的view
+ @return obj
+ */
+- (instancetype)initWithGiftModel:(GiftModel *)model animContentView:(UIView *)animContentView maxTop:(NSInteger)maxTop{
+    self = [super init];
+    if (self) {
+        self.model = model;
+        self.animContentView = animContentView;
+        self.maxTop = maxTop;
+    }
+    return self;
+}
+
+/**
+ 开始方法(KVO控制队列任务状态)
+ */
+- (void)start{
+    //这里动画队列任务不存在Cancelled状态所以不需要判断，直接开始执行
+    [self willChangeValueForKey:@"isExecuting"];
+    _executing = YES;
+    [self main];
+    [self didChangeValueForKey:@"isExecuting"];
+}
+
+/**
+ 自定义Operation提供了start main接口。
+ */
+- (void)main{
+    
+    switch (_model.giftStyle) {
+        case GiftStylePorsch:
+            [self porschAnimation];
+            break;
+//        case GiftStyleFighter:
+//            [self fighterAnimation];
+//            break;
+        case GiftStylePlane:
+            [self planeAnimation];
+            break;
+        case GiftStyleCombo:
+            [self comboViewAnimation];
+            break;
+        default:
+            break;
+    }
+}
+
+- (void)porschAnimation
+{
+    weakself
+    dispatch_async(dispatch_get_main_queue(), ^{
+        strongself
+
+        [self.giftCarView addAnimationsMoveToPoint:CGPointMake(0, 100) endPoint:CGPointMake(self.animContentView.bounds.size.width +166, 500)];
+        [self.animContentView addSubview:self.giftCarView];
+        
+        [self.giftCarView startPorschAnimationWithCompletion:^{
+            
+            [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];
+//        [self.giftFighterView startFighterAnimationWithCompletion:^{
+//            [self willChangeValueForKey:@"isFinished"];
+//            
+//            _finished = YES;
+//            
+//            [self didChangeValueForKey:@"isFinished"];
+//        }];
+//        
+//    });
+//}
+
+- (void)planeAnimation
+{
+    weakself
+    dispatch_async(dispatch_get_main_queue(), ^{
+        strongself
+        
+        [self.giftPlaneView addAnimationsMoveToPoint:CGPointMake(SCREEN_WIDTH, 100) endPoint:CGPointMake(-500, 410)];
+        [self.animContentView addSubview:self.giftPlaneView];
+        [self.giftPlaneView startPlaneAnimationWithCompletion:^{
+            
+            [self willChangeValueForKey:@"isFinished"];
+            
+            _finished = YES;
+            
+            [self didChangeValueForKey:@"isFinished"];
+        }];
+        
+    });
+}
+
+static long currentCompleteIndex = 0;
+/**
+ 连击动画
+ */
+- (void)comboViewAnimation{
+    
+    __weak GiftAnimOperation *weakSelf = self;
+//    currentCompleteIndex ++;
+    
+//    if (self.emptyTrajory.count == 0)//index = 0
+//    {
+//        currentCompleteIndex = 0;
+//        
+//    }else if (self.emptyTrajory.count < 3)//从emptyArr取空的index并赋值 index
+//    {
+//        
+//        
+//    }else// = 3已满 index = 0
+//    {
+//        currentCompleteIndex = 0;
+//    }
+//    self.name = @"111";
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [weakSelf.animContentView addSubview:weakSelf.giftComboView];
+
+        weakSelf.giftComboView.top = [self.defaultTrajory[currentCompleteIndex] integerValue];
+        
+        NSLog(@"top:%zd,index%ld",[self.defaultTrajory[currentCompleteIndex] integerValue],currentCompleteIndex);
+        currentCompleteIndex ++;
+        if (currentCompleteIndex == 3)
+        {
+            currentCompleteIndex = 0;
+        }
+//        if ([self.name isEqualToString:@"李四_flower"]) {
+////            currentCompleteIndex = 0;
+//            self.
+//        }
+        [weakSelf.giftComboView startComboAnimationWithCompletion:^{
+            NSLog(@"complet top:%zd,index%zd",[self.defaultTrajory[currentCompleteIndex] integerValue],currentCompleteIndex);
+            //empty存当前顺序
+//            [self.emptyTrajory replaceObjectAtIndex:<#(NSUInteger)#> withObject:<#(nonnull id)#>];
+            [weakSelf.giftComboView removeFromSuperview];
+            
+            [weakSelf willChangeValueForKey:@"isFinished"];
+            
+            _finished = YES;
+            
+            [weakSelf didChangeValueForKey:@"isFinished"];
+        }];
+    });
+}
+
+/**
+ 连击动画
+ 
+ @return 连击view
+ */
+- (GiftComboView *)giftComboView{
+    if (_giftComboView == nil) {
+        _giftComboView = [GiftComboView comboView];
+    }
+    return _giftComboView;
+}
+
+/**
+ 跑车动画
+ 
+ @return 连击view
+ */
+- (NHCarViews *)giftCarView{
+    if (_giftCarView == nil) {
+        _giftCarView = [NHCarViews loadCarViewWithPoint:CGPointZero];
+        //数组中放CGRect数据，CGRect的x和y分别作为控制点的x和y，CGRect的width和height作为结束点的x和y
+        //方法如下：数组内的每个元素代码一个控制点和结束点
+        NSMutableArray *pointArrs = [[NSMutableArray alloc] init];
+        CGFloat width = SCREEN_WIDTH / 2;
+        [pointArrs addObject:NSStringFromCGRect(CGRectMake(width, 300, width, 300))];
+        [pointArrs addObject:NSStringFromCGRect(CGRectMake(width, 300, width, 300))];
+        _giftCarView.curveControlAndEndPoints = pointArrs;
+    }
+    return _giftCarView;
+}
+
+/**
+ 歼灭机动画
+ 
+ @return 连击view
+ */
+//- (NHFighterView *)giftFighterView{
+//    if (_giftFighterView == nil) {
+//        _giftFighterView = [NHFighterView loadFighterViewWithPoint:CGPointMake(10, 100)];
+//    }
+//    return _giftFighterView;
+//}
+
+/**
+ 客机动画
+ 
+ @return 连击view
+ */
+- (NHPlaneViews *)giftPlaneView{
+    if (_giftPlaneView == nil) {
+        _giftPlaneView = [NHPlaneViews loadPlaneViewWithPoint:CGPointMake(SCREEN_WIDTH + 232, 0)];
+    }
+    return _giftPlaneView;
+}
+
+- (NSArray *)defaultTrajory
+{
+    if (!_defaultTrajory)
+    {
+        _defaultTrajory = [[NSArray alloc] initWithObjects:@200,@240,@280, nil];
+    }
+    return _defaultTrajory;
+}
+
+- (NSMutableArray *)emptyTrajory
+{
+    if (!_emptyTrajory)
+    {
+        _emptyTrajory = [[NSMutableArray alloc] init];
+    }
+    return _emptyTrajory;
+}
+
+// 提示：To be deprecated; use and override 'asynchronous' below
+//之前用的isConcurrent
+/**
+ 覆写异步执行
+ 
+ @return YES
+ */
+- (BOOL)isAsynchronous{
+    return YES;
+}
+
+/**
+ 覆写任务是否完成控制
+ 
+ @return 完成状态 _finished
+ */
+- (BOOL) isFinished{
+    return _finished;
+}
+
+/**
+ 覆写任务是否完成开始执行
+ 
+ @return 执行状态 _executing
+ */
+- (BOOL) isExecuting{
+    return _executing;
+}
+
+
+
+@end
+//
+//  GiftAnimationAction.h
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/15.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+/**
+ 动画完成回调
+ */
+typedef void(^giftAnimationCompletion)();
+
+@interface GiftAnimationAction : UIView<CAAnimationDelegate>{
+    giftAnimationCompletion _giftAnimationCompletion;   //动画完成回调
+}
+
+/**
+ 连击动画
+ */
+- (void)startComboAnimationWithCompletion:(giftAnimationCompletion)Completion;
+
+/**
+ 跑车动画
+ */
+- (void)startPorschAnimationWithCompletion:(giftAnimationCompletion)Completion;
+
+/**
+ 歼灭机动画
+ */
+//- (void)startFighterAnimationWithCompletion:(giftAnimationCompletion)Completion;
+
+/**
+ 客机动画
+ */
+- (void)startPlaneAnimationWithCompletion:(giftAnimationCompletion)Completion;
+@end
+//
+//  GiftAnimationAction.m
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/15.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "GiftAnimationAction.h"
+
+@implementation GiftAnimationAction
+
+/**
+ 连击横屏动画
+ */
+- (void)startComboAnimationWithCompletion:(giftAnimationCompletion)Completion{
+    _giftAnimationCompletion = Completion;
+    NSLog(@"self.width:%f",self.width);
+    [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
+{
+    _giftAnimationCompletion = Completion;
+}
+
+/**
+ 歼灭机动画
+ */
+//- (void)startFighterAnimationWithCompletion:(giftAnimationCompletion)Completion
+//{
+//    _giftAnimationCompletion = Completion;
+//}
+
+/**
+ 客机动画
+ */
+- (void)startPlaneAnimationWithCompletion:(giftAnimationCompletion)Completion
+{
+    _giftAnimationCompletion = Completion;
+}
+
+/**
+ 动画回调代理，用于判断是否完成
+ 
+ @param anim 动画对象
+ @param flag 是否完成标记
+ */
+- (void)animationDidStop:(CAAnimation *)anim finished:(BOOL)flag{
+    _giftAnimationCompletion();
+}
+
+
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+
+@end
+//
+//  GiftComboView.h
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/15.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "GiftAnimationAction.h"
+
+@class GiftModel;
+@interface GiftComboView : GiftAnimationAction
+
+/**
+ 动画开始
+ 
+ @param model 对应的动画解析model
+ @param animationCompletion 动画完成回调（用于控制队列）
+ */
+- (void)startAnimationWithModel:(GiftModel *)model withAnimationCompletion:			(giftAnimationCompletion)animationCompletion;
+
++ (instancetype)comboView;
+
+@end
+//
+//  GiftComboView.m
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/15.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "GiftComboView.h"
+#import "GiftModel.h"
+
+@interface GiftComboView (){
+    GiftModel *_model;//礼物model
+}
+
+@end
+
+@implementation GiftComboView
+
+/**
+ 动画开始
+ 
+ @param model 对应的动画解析model
+ @param animationCompletion 动画完成回调（用于控制队列）
+ */
+- (void)startAnimationWithModel:(GiftModel *)model withAnimationCompletion:			(giftAnimationCompletion)animationCompletion
+{
+    _giftAnimationCompletion = animationCompletion;
+    _model = model;
+    
+    [self startComboAnimationWithCompletion:animationCompletion];
+}
+
+
+/**
+ 初始化连击View
+
+ @return 初始化连击ComboView
+ */
++ (instancetype)comboView
+{
+    GiftComboView *comboView = [[GiftComboView alloc] initWithFrame:CGRectMake(0, 0, 180, 30)];
+    comboView.backgroundColor = [UIColor blueColor];
+    
+    return comboView;
+}
+
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+
+@end
@@ -8,15 +8,28 @@
  
 #import "BaseModel.h"
  
-typedef NS_ENUM(NSInteger, GiftModelType) {//礼物类型
-    GiftModelTypeCommon          = 1,//普通礼物
-    GiftModelTypeSpecial             //特殊(豪华)礼物
+typedef NS_ENUM(NSInteger, GiftStyle) {//礼物类型
+    GiftStyleCombo          = 1,//普通可连击礼物
+    GiftStylePorsch            ,//豪华跑车礼物
+//    GiftStyleFighter           ,//豪华歼灭机礼物
+    GiftStylePlane             ,//豪华客机礼物
 };
  
 @interface GiftModel : BaseModel
  
-@property (nonatomic ,copy) NSString * _Nullable     image;
-@property (nonatomic      ) GiftModelType            type;
-@property (nonatomic ,copy) NSString * _Nullable     price;
+@property (nonatomic ,copy  ) NSString *            _Nullable image;
+@property (nonatomic ,copy  ) NSString *            _Nullable price;
+
+@property (nonatomic        ) NSInteger                       index;//索引
+@property (nonatomic        ) GiftStyle                       giftStyle;//动画类型
+@property (nonatomic, copy  ) NSString  *           _Nullable giftname;//礼物名字
+@property (nonatomic, strong) NSArray *             _Nullable giftIconArray;//礼物图片数组
+@property (nonatomic, copy  ) NSString  *           _Nullable giftNum;//礼物数量
+@property (nonatomic, copy  ) NSString  *           _Nullable giftRusername;//接受礼物的人
+@property (nonatomic, copy  ) NSString  *           _Nullable giftRuserId;//接受礼物的人id
+@property (nonatomic, copy  ) NSString  *           _Nullable giftGusername;//送礼物的人
+@property (nonatomic, copy  ) NSString  *           _Nullable giftGuserId;//送礼物的id
+
+//@property (nonatomic, strong) NSString  *_Nullable pushId;//跳转id
  
 @end
@@ -7,8 +7,9 @@
 //
  
 #import <UIKit/UIKit.h>
+#import "GiftAnimationAction.h"
  
-@interface NHCarViews : UIView
+@interface NHCarViews : GiftAnimationAction
 /**
  *  需要几个控制点就设置几个:
  *  数组内的每个元素代码一个控制点和结束点
@@ -138,6 +138,7 @@
     [self.layer removeAllAnimations];
     [self removeFromSuperview];
  
+    _giftAnimationCompletion(-1);
     NSLog(@"删除动画");
 //    [self.animations removeObjectAtIndex:0];
  
+//
+//  NHFighterView+animDelegagte.h
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/15.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "NHFighterView.h"
+
+@interface NHFighterView (animDelegagte)
+
+@end
+//
+//  NHFighterView+animDelegagte.m
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/15.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "NHFighterView+animDelegagte.h"
+
+@implementation NHFighterView (animDelegagte)
+
+- (void)animationDidStart:(CAAnimation *)anim
+{
+    NSLog(@"did start");
+}
+
+- (void)animationDidStop:(CAAnimation *)anim finished:(BOOL)flag
+{
+    _giftAnimationCompletion(-1);
+    NSLog(@"did stop");
+}
+
+@end
@@ -7,8 +7,9 @@
 //
  
 #import <UIKit/UIKit.h>
+#import "GiftAnimationAction.h"
  
-@interface NHFighterView : UIView
+@interface NHFighterView :GiftAnimationAction
  
 /**
  *  需要几个控制点就设置几个:
@@ -7,8 +7,9 @@
 //
  
 #import <UIKit/UIKit.h>
+#import "GiftAnimationAction.h"
  
-@interface NHPlaneViews : UIView
+@interface NHPlaneViews : GiftAnimationAction
  
  
 /**
@@ -80,6 +80,7 @@
 -(void)animationDidStop:(CAAnimation *)anim finished:(BOOL)flag{
     [self.layer removeAllAnimations];
     [self removeFromSuperview];
+    _giftAnimationCompletion(-1);
 }
  
  
@@ -7,7 +7,9 @@
 //
  
 #import "BaseView.h"
+@class LiveBaseView;
  
 @interface GiftListView : BaseView
  
+- (instancetype _Nonnull)initWithFrame:(CGRect)frame liveBaseView:(LiveBaseView *_Nullable)liveBaseView;
 @end
@@ -8,6 +8,8 @@
  
 #import "GiftListView.h"
 #import "GiftModel.h"
+#import "LiveBaseView.h"
+#import "AnimQueueManager.h"
  
 #define MAX_LINE_COUNT 4
 #define MAX_ROW_COUNT  2
@@ -15,24 +17,29 @@
 @interface GiftListView ()
  
 @property (nonatomic ,strong) NSArray <GiftModel *>* _Nullable            giftArray;
+@property (nonatomic ,weak) LiveBaseView * _Nullable             liveBaseView;
+@property (nonatomic, strong) AnimQueueManager *animQueueManager;
+@property (nonatomic ,strong) GiftModel * _Nullable             model;
  
 @end
  
 @implementation GiftListView
  
-- (instancetype)initWithFrame:(CGRect)frame
+- (instancetype)initWithFrame:(CGRect)frame liveBaseView:(LiveBaseView *_Nullable)liveBaseView
 {
     if (self = [super initWithFrame:frame]) {
+        self.liveBaseView = liveBaseView;
+        self.animQueueManager = [AnimQueueManager sharedAnimQueueManager];
+        self.animQueueManager.maxTop = 200;
  
-        
-        UIScrollView *scrollView = [[UIScrollView alloc] initWithFrame:self.bounds];
-        scrollView.contentSize = CGSizeMake(self.width *(self.giftArray.count/(MAX_ROW_COUNT*MAX_LINE_COUNT) + 1), self.height);
+        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);
         scrollView.pagingEnabled = YES;
         scrollView.bounces = NO;
         scrollView.showsVerticalScrollIndicator = NO;
         scrollView.showsHorizontalScrollIndicator = NO;
-        scrollView.backgroundColor = [UIColor blueColor];
         [self addSubview:scrollView];
+        scrollView.backgroundColor = ZXRandomColor;
  
         int line = 0;
         int row = 0;
@@ -50,12 +57,11 @@
             }
             row = i % MAX_LINE_COUNT;
             CGFloat giftWidth = self.width / MAX_LINE_COUNT * 1.0;
-            CGFloat giftHeight = self.height / MAX_ROW_COUNT * 1.0;
+            CGFloat giftHeight = (self.height - 30) / 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 = ZXRandomColor;
  
             UIImageView *picImg = [[UIImageView alloc] initWithImage:[UIImage imageNamed:self.giftArray[i].image]];
             picImg.centerX = giftView.width * 0.5;
@@ -63,6 +69,10 @@
             [giftView addSubview:picImg];
  
             [scrollView addSubview:giftView];
+            
+            UITapGestureRecognizer *gesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(gestureClick:)];
+            giftView.tag = i + 10;
+            [giftView addGestureRecognizer:gesture];
         }
     }
     return self;
@@ -70,40 +80,84 @@
  
 - (UIView *)giftViewWithFrame:(CGRect)frame model:(GiftModel *)model
 {
+    _model = model;
     UIView *giftView = [[UIView alloc] initWithFrame:frame];
-    switch (model.type) {
-        case GiftModelTypeCommon:
-        {
-            UIImageView *imageView = [[UIImageView alloc] initWithFrame:CGRectMake(giftView.width - 17, 3, 15, 15)];
-            imageView.backgroundColor = ZXRandomColor;
-            [giftView addSubview:imageView];
-        }
-            break;
-        case GiftModelTypeSpecial:
-        {
-            
-        }
-            break;
-        default:
-            break;
+    if (model.giftStyle == GiftStyleCombo)
+    {
+        UIImageView *imageView = [[UIImageView alloc] initWithFrame:CGRectMake(giftView.width - 17, 3, 15, 15)];
+        imageView.backgroundColor = ZXRandomColor;
+        [giftView addSubview:imageView];
+    }else
+    {
+        
     }
+    UILabel *priceLbl = [[UILabel alloc] initWithFrame:CGRectMake(0, giftView.height - 15, 40, 14)];
+    priceLbl.font = [UIFont systemFontOfSize:kDetailContentFont];
+    priceLbl.textColor = [UIColor greenColor];
+    priceLbl.text = model.price;
+    priceLbl.width = [priceLbl labelSize].width;
+    priceLbl.height = [priceLbl labelSize].height;
+    priceLbl.centerX = giftView.width * 0.5 - 4;
+    [giftView addSubview:priceLbl];
+    
+    UIImageView *image = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"littleHeart2"]];
+    image.left = priceLbl.right + 3;
+    image.centerY = priceLbl.centerY;
+    [giftView addSubview:image];
  
-    UIButton *coin = [[UIButton alloc] initWithFrame:CGRectMake(0, giftView.height - 13, 15, 10)];
-    coin.centerX = giftView.width * 0.5;
-    coin.backgroundColor = ZXRandomColor;
-    [giftView addSubview:coin];
     return giftView;
 }
  
+#pragma mark - 选择礼物点击
+- (void)gestureClick:(UITapGestureRecognizer *)gesture
+{
+    NSInteger tag = gesture.view.tag - 10;
+    NSLog(@"%zd",tag);
+    //右上角添加✔️,再次点击去掉✔️
+    [self.animQueueManager addAnimationWithModel:self.giftArray[tag] animContentView:self.liveBaseView];
+}
+
+#pragma mark - getter
+
 - (NSArray *)giftArray
 {
     if (!_giftArray)
     {
-        GiftModel *model = [[GiftModel alloc] init];
-        model.image = @"love";
-        model.type = GiftModelTypeCommon;
-        model.price = @"3";
-        _giftArray = [[NSArray alloc] initWithObjects:model,model,model,model,model,model,model,model,model,model, nil];
+        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 *prices = [NSArray arrayWithObjects:@"300000000",@"3000",@"300000",@"30",@"3",@"3",@"1",@"3",@"1",@"3", nil];
+        
+        NSMutableArray *tempArr = [NSMutableArray array];
+        for (int i = 0; i < images.count; i ++) {
+            GiftModel *model = [GiftModel new];
+            model.giftname = @"鲜花";
+            model.giftIconArray = @[[UIImage imageNamed:@"love"]];
+            model.giftNum = @"5";
+            model.giftRusername = @"啊啊啊啊啊啊啊啊啊啊啊啊";
+            model.giftRuserId = @"10000";
+            model.giftGusername = @"按时大多数阿萨德 爱傻傻的爱的";
+            model.giftGuserId = @"20000";
+            model.image = images[i];
+            int type = [types[i] intValue];
+            if (type == 1) {
+                model.giftStyle = GiftStyleCombo;
+            }else if (type == 2)
+            {
+                model.giftStyle = GiftStylePorsch;
+            }
+//            else if (type == 3)
+//            {
+//                model.giftStyle = GiftStyleFighter;
+//            }
+            else if (type == 3)
+            {
+                model.giftStyle = GiftStylePlane;
+            }
+
+            model.price = prices[i];
+            [tempArr addObject:model];
+        }
+        _giftArray = [[NSArray alloc] initWithArray:tempArr];
     }
     return _giftArray;
 }
-//
-//  LVCGiftManager.h
-//  LiveVideoCloud
-//
-//  Created by 张旭 on 2017/3/13.
-//  Copyright © 2017年 cnlive. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-typedef NS_ENUM(NSInteger, GiftType) {//礼物类型
-    GiftTypePorsch           = 1,//跑车
-    GiftTypeFighter             ,//歼灭机
-    GiftTypePlane               ,//客机
-};
-
-@interface LVCGiftManager : NSObject
-
-+ (void)giftType:(GiftType)giftType toView:(UIView *_Nonnull)toView;
-
-@end
-
-//
-//  LVCGiftManager.m
-//  LiveVideoCloud
-//
-//  Created by 张旭 on 2017/3/13.
-//  Copyright © 2017年 cnlive. All rights reserved.
-//
-
-#import "LVCGiftManager.h"
-#import "NHCarViews.h"
-#import "NHFighterView.h"
-#import "NHPlaneViews.h"
-
-@implementation LVCGiftManager
-
-+ (void)giftType:(GiftType)giftType toView:(UIView *_Nonnull)toView
-{
-    
-    switch (giftType) {
-        case GiftTypePorsch:
-        {
-            NHCarViews *car = [NHCarViews loadCarViewWithPoint:CGPointZero];
-            //数组中放CGRect数据，CGRect的x和y分别作为控制点的x和y，CGRect的width和height作为结束点的x和y
-            //方法如下：数组内的每个元素代码一个控制点和结束点
-            NSMutableArray *pointArrs = [[NSMutableArray alloc] init];
-            CGFloat width = SCREEN_WIDTH / 2;
-            [pointArrs addObject:NSStringFromCGRect(CGRectMake(width, 300, width, 300))];
-            [pointArrs addObject:NSStringFromCGRect(CGRectMake(width, 300, width, 300))];
-            car.curveControlAndEndPoints = pointArrs;
-            [car addAnimationsMoveToPoint:CGPointMake(0, 100) endPoint:CGPointMake(toView.bounds.size.width +166, 500)];
-            [toView addSubview:car];
-        }
-            break;
-        case GiftTypeFighter:
-        {
-            NHFighterView *fighter = [NHFighterView loadFighterViewWithPoint:CGPointMake(10, 100)];
-            [fighter addAnimationsMoveToPoint:CGPointMake(SCREEN_WIDTH, 60) endPoint:CGPointMake( -500, 600)];
-            [toView addSubview:fighter];
-        }
-            break;
-        case GiftTypePlane:
-        {
-            NHPlaneViews *plane = [NHPlaneViews loadPlaneViewWithPoint:CGPointMake(SCREEN_WIDTH + 232, 0)];
-//            NSMutableArray *pointArrs = [[NSMutableArray alloc] init];
-//            [pointArrs addObject:NSStringFromCGRect(CGRectMake(290, 250, 290, 250))];
-//            [pointArrs addObject:NSStringFromCGRect(CGRectMake(290, 250, 290, 250))];
-//            plane.curveControlAndEndPoints = pointArrs;
-            [plane addAnimationsMoveToPoint:CGPointMake(SCREEN_WIDTH, 100) endPoint:CGPointMake(-500, 410)];
-            [toView addSubview:plane];
-        }
-            break;
-            
-        default:
-            break;
-    }
-    
-    
-    }
-
-@end
@@ -33,7 +33,8 @@
     if (!_liveBaseView)
     {
         _liveBaseView = [[LiveBaseView alloc] initWithFrame:SCREEN_RECT];
-        _liveBaseView.backgroundColor = [UIColor greenColor];
+        _liveBaseView.viewController = self;
+        _liveBaseView.backgroundColor = [UIColor clearColor];
     }
     return _liveBaseView;
 }
@@ -10,4 +10,6 @@
  
 @interface LiveBaseView : BaseView 
  
+@property (nonatomic ,strong) UIViewController * _Nullable             viewController;
+
 @end
@@ -8,10 +8,9 @@
 //
  
 #import "LiveBaseView.h"
-#import "LVCGiftManager.h"
 #import "BottomToolView.h"
 #import "GiftListView.h"
-
+#import "GiftModel.h"
 @interface LiveBaseView ()<bottomBtnDeledate>
  
 @property (nonatomic ,strong) UIScrollView *  _Nullable scrollView;
@@ -19,10 +18,6 @@
 @property (nonatomic ,strong) UIButton *      _Nullable closeBtn;
 @property (nonatomic ,strong) UIView *        _Nullable currentPopView;
  
-@property (nonatomic ,strong) UIButton *      _Nullable porschBtn;
-@property (nonatomic ,strong) UIButton *      _Nullable fightBtn;
-@property (nonatomic ,strong) UIButton *      _Nullable planeBtn;
-
 @end
  
 @implementation LiveBaseView
@@ -34,11 +29,7 @@
         [self addSubview:self.scrollView];
         [self.scrollView addSubview:self.bottomToolView];
         [self addSubview:self.closeBtn];
-        [self addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapGestureClick)]];
-        
-//        [self addSubview:self.porschBtn];
-//        [self addSubview:self.fightBtn];
-//        [self addSubview:self.planeBtn];
+        [self addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapGestureClick:)]];
     }
     return self;
 }
@@ -60,14 +51,11 @@
             break;
         case BtnClickTypeGift:
         {
-            GiftListView *giftListView = [[GiftListView alloc] initWithFrame:CGRectMake(0, SCREEN_HEIGHT - 200, SCREEN_WIDTH, 200)];
-            giftListView.backgroundColor = [UIColor redColor];
+            GiftListView *giftListView = [[GiftListView alloc] initWithFrame:CGRectMake(0, SCREEN_HEIGHT - 230, SCREEN_WIDTH, 230) liveBaseView:self];
+            giftListView.backgroundColor = [UIColor lightGrayColor];
             [self addSubview:giftListView];
             self.currentPopView = giftListView;
-            
-            
-            
-            
+
         }
             break;
         default:
@@ -93,30 +81,20 @@
 }
  
 #pragma mark - buttonClick
-- (void)tapGestureClick
+- (void)tapGestureClick:(UITapGestureRecognizer *)gesture
 {
     [self clearCurrentPopView];
 }
  
-
-- (void)porschAction
-{
-    [LVCGiftManager giftType:GiftTypePorsch toView:self];
-}
-
-- (void)fightAction
-{
-    [LVCGiftManager giftType:GiftTypeFighter toView:self];
-}
-
-- (void)planeAction
+- (void)closeAction
 {
-    [LVCGiftManager giftType:GiftTypePlane toView:self];
+    [self.viewController.navigationController popViewControllerAnimated:YES];
 }
  
-- (void)closeAction
+#pragma mark - setter
+-(void)setViewController:(UIViewController *)viewController
 {
-    
+    _viewController = viewController;
 }
  
 #pragma mark - getter
@@ -162,48 +140,6 @@
     return _closeBtn;
 }
  
-- (UIButton *)porschBtn
-{
-    if (!_porschBtn)
-    {
-        UIButton *porschBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        porschBtn.frame = CGRectMake(SCREEN_WIDTH - 80, 400, 80, 30);
-        [porschBtn setTitle:@"保时捷" forState:UIControlStateNormal];
-        [porschBtn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
-        [porschBtn addTarget:self action:@selector(porschAction) forControlEvents:UIControlEventTouchUpInside];
-        _porschBtn = porschBtn;
-    }
-    return _porschBtn;
-}
-
-- (UIButton *)fightBtn
-{
-    if (!_fightBtn)
-    {
-        UIButton *fightBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        fightBtn.frame = CGRectMake(SCREEN_WIDTH - 80, 450, 80, 30);
-        [fightBtn setTitle:@"歼灭机" forState:UIControlStateNormal];
-        [fightBtn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
-        [fightBtn addTarget:self action:@selector(fightAction) forControlEvents:UIControlEventTouchUpInside];
-        _fightBtn = fightBtn;
-    }
-    return _fightBtn;
-}
-
-- (UIButton *)planeBtn
-{
-    if (!_planeBtn)
-    {
-        UIButton *planeBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        planeBtn.frame = CGRectMake(SCREEN_WIDTH - 80, 500, 80, 30);
-        [planeBtn setTitle:@"客机" forState:UIControlStateNormal];
-        [planeBtn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
-        [planeBtn addTarget:self action:@selector(planeAction) forControlEvents:UIControlEventTouchUpInside];
-        _planeBtn = planeBtn;
-    }
-    return _planeBtn;
-}
-
 /*
 // Only override drawRect: if you perform custom drawing.
 // An empty implementation adversely affects performance during animation.
@@ -9,6 +9,7 @@
 #import "HomeViewController.h"
 #import "LVCLivePlayerController.h"
 #import "LVCInteractionController.h"
+#import "LVCLivePlayerController.h"
  
 @interface HomeViewController ()
  
+//
+//  LVCFullScreenPlayerController.h
+//  LiveVideoCloud
+//
+//  Created by iOS on 17/3/14.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "BaseViewController.h"
+
+@interface LVCFullScreenPlayerController : UIViewController
+
+@end
+//
+//  LVCFullScreenPlayerController.m
+//  LiveVideoCloud
+//
+//  Created by iOS on 17/3/14.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "LVCFullScreenPlayerController.h"
+
+@interface LVCFullScreenPlayerController ()
+
+@end
+
+@implementation LVCFullScreenPlayerController
+
+- (UIInterfaceOrientationMask)supportedInterfaceOrientations {
+    return UIInterfaceOrientationMaskLandscape;
+}
+
+- (BOOL)shouldAutorotate {
+    return YES;
+}
+
+- (void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+    
+    [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleLightContent];
+    [[UIApplication sharedApplication] setStatusBarHidden:NO withAnimation:UIStatusBarAnimationFade];
+}
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    self.view.backgroundColor = [UIColor blackColor];
+
+}
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+/*
+#pragma mark - Navigation
+
+// In a storyboard-based application, you will often want to do a little preparation before navigation
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    // Get the new view controller using [segue destinationViewController].
+    // Pass the selected object to the new view controller.
+}
+*/
+
+@end
@@ -8,28 +8,50 @@
  
 #import "LVCLivePlayerController.h"
 #import "LVCPlayer.h"
+#import "LVCFullScreenPlayerController.h"
+
+#define WIDTH_SCREEN  [UIScreen mainScreen].bounds.size.width
+#define HEIGHT_SCREEN  [UIScreen mainScreen].bounds.size.height
  
 @interface LVCLivePlayerController ()<LVCPlayerDelegate>
 {
-    BOOL isHiddenStatusBar;//记录状态的隐藏显示
-    CGRect     playerFrame;
+    BOOL isHiddenStatusBar;             //记录状态的隐藏显示
+    CGRect     playerFrame;             //
+    NSInteger _originalDirection;       //记录原始方向
  
  
 }
 @property (nonatomic, strong) LVCPlayer *player;
+@property (nonatomic, strong) LVCFullScreenPlayerController *fullVC;
  
 @end
  
 @implementation LVCLivePlayerController
  
+- (void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+    [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleLightContent];
+}
+
+- (void)viewWillDisappear:(BOOL)animated
+{
+    [super viewWillDisappear:animated];
+    [[UIApplication sharedApplication] setStatusBarHidden: NO withAnimation:UIStatusBarAnimationNone];
+    [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleDefault];
+}
+
 - (void)viewDidLoad {
     [super viewDidLoad];
  
+    self.view.backgroundColor = [UIColor whiteColor];
+    
+    playerFrame = CGRectMake(0, 0,WIDTH_SCREEN, WIDTH_SCREEN*9/16);
+    _originalDirection = 0;
+    
+    //注册通知
     [self addObservers];
  
-    playerFrame = CGRectMake(0, 0, [UIScreen mainScreen].bounds.size.width, ([UIScreen mainScreen].bounds.size.width)* 9 / 16);
-
-    self.view.backgroundColor = [UIColor whiteColor];
     [self.view addSubview:self.player];
  
     [self makeConstraints];
@@ -42,93 +64,84 @@
                                                  name:UIDeviceOrientationDidChangeNotification
                                                object:nil];
  
+
 }
  
 #pragma mark -
 #pragma mark - Notification
-- (void)onDeviceOrientationChange:(NSNotification *)notification{
-   
-    if (_player==nil||_player.superview==nil){
-        return;
-    }
+- (void)onDeviceOrientationChange:(NSNotification *)notification
+{
+    if (_player == nil|| _player.superview == nil) return;
  
-    UIDeviceOrientation orientation = [UIDevice currentDevice].orientation;
-    UIInterfaceOrientation interfaceOrientation = (UIInterfaceOrientation)orientation;
-    switch (interfaceOrientation) {
-        case UIInterfaceOrientationPortraitUpsideDown:{
-            _player.isFullScreen = NO;
-        }
-            break;
-        case UIInterfaceOrientationPortrait:{
-            [self toOrientation:UIInterfaceOrientationPortrait];
+    UIDeviceOrientation orientation = [[UIDevice currentDevice] orientation];
+    
+    switch (orientation) {
+        case UIDeviceOrientationPortrait:
+        {
+            if (_originalDirection == 1) {
+                [self toHalfScreenWithrotationAngle:M_PI_2];
+            } else if (_originalDirection == 2){
+                [self toHalfScreenWithrotationAngle:-M_PI_2];
+            }
+            _originalDirection = 0;
             _player.isFullScreen = NO;
         }
             break;
-        case UIInterfaceOrientationLandscapeLeft:{
-            [self toOrientation:UIInterfaceOrientationLandscapeLeft];
-            _player.isFullScreen = YES;
+            
+        case UIDeviceOrientationLandscapeLeft:
+        {
+            if (_originalDirection == 0 ) {
+                [self toFullWithrotationAngle:-M_PI_2];
+            }
+            _originalDirection = 1;
         }
             break;
-        case UIInterfaceOrientationLandscapeRight:{
-            [self toOrientation:UIInterfaceOrientationLandscapeRight];
-            _player.isFullScreen = YES;
+            
+        case UIDeviceOrientationLandscapeRight:
+        {
+            if (_originalDirection == 0 ) {
+                [self toFullWithrotationAngle:M_PI_2];
+            }
+            _originalDirection = 2;
         }
             break;
+            
         default:
             break;
     }
 }
  
-#pragma mark -
-#pragma mark - 屏幕旋转
--(void)toOrientation:(UIInterfaceOrientation)orientation{
-    //获取到当前状态条的方向
-    UIInterfaceOrientation currentOrientation = [UIApplication sharedApplication].statusBarOrientation;
-    //判断如果当前方向和要旋转的方向一致,那么不做任何操作
-    if (currentOrientation == orientation) {
-        return;
-    }
+//旋转至全屏
+- (void)toFullWithrotationAngle:(CGFloat)angle
+{
+    if (self.player.isFullScreen) return;
  
-    //根据要旋转的方向,使用Masonry重新修改限制
-    if (orientation ==UIInterfaceOrientationPortrait) {//
-        [_player mas_remakeConstraints:^(MASConstraintMaker *make) {
-            make.top.left.right.mas_equalTo(0);
-            make.height.equalTo(@(playerFrame.size.height));
+    [self presentViewController:self.fullVC animated:NO completion:^{
+        [_player removeFromSuperview];
+        [self.fullVC.view addSubview:self.player];
+        [self makePlayerViewConstraints:YES];
+        self.player.transform = CGAffineTransformMakeRotation(angle);
+        [UIView animateWithDuration:0.3 animations:^{
+            self.player.transform = CGAffineTransformMakeRotation(0);
         }];
-    }else{
-
-        if (currentOrientation ==UIInterfaceOrientationPortrait) {
-            [_player mas_remakeConstraints:^(MASConstraintMaker *make) {
-                make.width.equalTo(@([UIScreen mainScreen].bounds.size.height));
-                make.height.equalTo(@([UIScreen mainScreen].bounds.size.width));
-                make.center.equalTo(_player.superview);
-            }];
-        }
-    }
+    }];
  
-    //设置状态栏方向
-    [[UIApplication sharedApplication] setStatusBarOrientation:orientation animated:NO];
+    self.player.isFullScreen = YES;
  
-    //旋转屏幕
-    [UIView beginAnimations:nil context:nil];
-    _player.transform = CGAffineTransformIdentity;
-    _player.transform = [self getCurrentDeviceOrientation];
-    [UIView setAnimationDuration:2.0];
-    [UIView commitAnimations];
-}
-
-//获取旋转方向
-- (CGAffineTransform)getCurrentDeviceOrientation{
-    UIInterfaceOrientation orientation = [UIApplication sharedApplication].statusBarOrientation;
-    //根据要进行旋转的方向来计算旋转的角度
-    if (orientation ==UIInterfaceOrientationPortrait) {
-        return CGAffineTransformIdentity;
-    }else if (orientation ==UIInterfaceOrientationLandscapeLeft){
-        return CGAffineTransformMakeRotation(-M_PI_2);
-    }else if(orientation ==UIInterfaceOrientationLandscapeRight){
-        return CGAffineTransformMakeRotation(M_PI_2);
-    }
-    return CGAffineTransformIdentity;
+}
+
+//旋转至半屏
+- (void)toHalfScreenWithrotationAngle:(CGFloat)angle
+{
+    [_fullVC dismissViewControllerAnimated:NO completion:^{
+        [_player removeFromSuperview];
+        [self.view addSubview:self.player];
+        [self makePlayerViewConstraints:NO];
+        self.player.transform = CGAffineTransformMakeRotation(angle);
+        [UIView animateWithDuration:0.3 animations:^{
+            self.player.transform = CGAffineTransformMakeRotation(0);
+        }];
+    }];
 }
  
 #pragma mark -
@@ -136,32 +149,32 @@
 - (void)lvcPlayer:(LVCPlayer *)player clickedBackBtn:(UIButton *)backBtn
 {
     //如果是全屏返回半屏，如果是半屏直接退出
-    if (player.isFullScreen) {
-        [self toOrientation:UIInterfaceOrientationPortrait];
-        player.isFullScreen = NO;
+    if (self.player.isFullScreen) {
+        [self toHalfScreenWithrotationAngle:M_PI_2];
+        self.player.isFullScreen = NO;
     } else {
+        [_player stopPlaying];
         self.navigationController.navigationBar.hidden = NO;
         [self.navigationController popViewControllerAnimated:YES];
     }
 }
  
-- (void)lvcPlayer:(LVCPlayer *)player clickedPlayOrPauseBtn:(UIButton *)playOrPauseBtn
-{
-    
-}
-
 - (void)lvcPlayer:(LVCPlayer *)player clickedFullScreenBtn:(UIButton *)fullScreenBtn
 {
-    if (player.isFullScreen == YES) {//全屏
-        [self toOrientation:UIInterfaceOrientationPortrait];
-        player.isFullScreen = NO;
+    if (self.player.isFullScreen == YES) {//全屏
+        [self toHalfScreenWithrotationAngle:M_PI_2];
+        self.player.isFullScreen = NO;
  
     }else{//非全屏
-        [self toOrientation:UIInterfaceOrientationLandscapeRight];
-        player.isFullScreen = YES;
+        [self toFullWithrotationAngle:-M_PI_2];
     }
 }
  
+- (void)lvcPlayer:(LVCPlayer *)player clickedEditBtn:(UIButton *)editBtn
+{
+    NSLog(@"开始编辑~~~~");
+}
+
 #pragma mark -
 #pragma mark - makeConstraints
 - (void)makeConstraints
@@ -172,6 +185,21 @@
     }];
 }
  
+- (void)makePlayerViewConstraints:(BOOL)fullScreen
+{
+    if (fullScreen) {
+        [self.player mas_remakeConstraints:^(MASConstraintMaker *make) {
+            make.top.left.right.bottom.mas_equalTo(0);
+        }];
+        
+    } else {
+        [self.player mas_remakeConstraints:^(MASConstraintMaker *make) {
+            make.top.left.right.mas_equalTo(0);
+            make.height.equalTo(@(playerFrame.size.height));
+        }];
+    }
+}
+
 #pragma mark -
 #pragma mark - gatter
 - (LVCPlayer *)player
@@ -183,6 +211,13 @@
     return _player;
 }
  
+- (LVCFullScreenPlayerController *)fullVC
+{
+    if (!_fullVC) {
+        _fullVC = [[LVCFullScreenPlayerController alloc] init];
+    }
+    return _fullVC;
+}
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.
@@ -15,8 +15,8 @@
 @optional
  
 - (void)lvcPlayer:(LVCPlayer *)player clickedBackBtn:(UIButton *)backBtn;                       //返回
-- (void)lvcPlayer:(LVCPlayer *)player clickedPlayOrPauseBtn:(UIButton *)playOrPauseBtn;         //播放或暂停
 - (void)lvcPlayer:(LVCPlayer *)player clickedFullScreenBtn:(UIButton *)fullScreenBtn;           //全屏
+- (void)lvcPlayer:(LVCPlayer *)player clickedEditBtn:(UIButton *)editBtn;                       //全屏编辑按钮
  
 @end
  
@@ -25,9 +25,10 @@
  
 @property (nonatomic, assign) id<LVCPlayerDelegate> delegate;
  
-@property (nonatomic, strong) UIView *contentView;  //所有空间统一管理在这个view中
+@property (nonatomic, strong) UIImageView *contentView;     //所有空间统一管理在这个view中
 @property (nonatomic, strong) UIButton *backBtn;            //返回
+@property (nonatomic, assign) BOOL isFullScreen;            //是否是全屏
  
-@property (nonatomic, assign) BOOL isFullScreen;        //是否是全屏
+- (void)stopPlaying;
  
 @end
@@ -7,16 +7,27 @@
 //
  
 #import "LVCPlayer.h"
+#import "LVCPlayerLoadingView.h"
+#import "SevenSwitch.h"
  
-@interface LVCPlayer ()
+#define kAppId      @"60_irn9edco29"
+#define kAppKey     @"69fe70bda67e059286ad509d9f5377f815955645b52f94"
+#define kbundleId   @"com.cnlive.zhangxu.LiveVideoCloud"
  
+@interface LVCPlayer ()
+{
+    BOOL _isFull;
+}
 @property (nonatomic, strong) UIImageView *topBgView;               //顶部蒙版
 @property (nonatomic, strong) UIImageView *bottomBgView;            //底部蒙版
 @property (nonatomic, strong) UIButton *playOrPauseBtn;             //播放/暂停
 @property (nonatomic, strong) UILabel *titleLab;                    //标题
 @property (nonatomic, strong) UIButton *fullScreenBtn;              //控制全屏按钮
-@property (nonatomic, strong) UIGestureRecognizer *singleTap;       //单击手势
-@property (nonatomic, strong) UIActivityIndicatorView *loadingView; //加载图
+@property (nonatomic, strong) UITapGestureRecognizer *singleTap;    //单击手势
+@property (nonatomic, strong) LVCPlayerLoadingView *loadingView;    //加载图
+@property (nonatomic, strong) CNLiveMoviePlayerController   *player;
+@property (nonatomic, strong) SevenSwitch *barrageSwitch;           //弹幕开关
+@property (nonatomic, strong) UIButton *editBtn;                    //全屏编辑按钮
 @end
  
 @implementation LVCPlayer
@@ -26,27 +37,62 @@
     self = [super initWithFrame:frame];
     if (self) {
  
+        [self initPlayer];
+        
         [self addSubview:self.contentView];
         [self.contentView addSubview:self.bottomBgView];
         [self.contentView addSubview:self.topBgView];
         [self.bottomBgView addSubview:self.playOrPauseBtn];
         [self.bottomBgView addSubview:self.fullScreenBtn];
         [self.topBgView addSubview:self.titleLab];
-        [self.topBgView addSubview:self.backBtn];
+        [self.topBgView addSubview:self.barrageSwitch];
+        [self addSubview:self.backBtn];
         [self.contentView addSubview:self.loadingView];
+        [self.contentView addSubview:self.editBtn];
+        [self.contentView addGestureRecognizer:self.singleTap];
+        
         [self makeSubViewsConstraints];
  
     }
     return self;
 }
+#pragma mark -
+#pragma mark - initPlayer
+- (void)initPlayer
+{
+    [[CNLiveWebcastManager manager] initWithAppId:kAppId appKey:kAppKey];
+    //点播播放
+    _player = [[CNLiveMoviePlayerController alloc] initVodPlayWithVId:@"aaa123"
+                                                          authSuccess:^{
+                                                              
+          [self addObservers];
+          _player.videoDecoderMode = CNLiveMovieVideoDecoderMode_AUTO;
+          _player.shouldAutoplay = YES;
+          [_player prepareToPlay];
+          [self.contentView addSubview:_player.view];
+          [self.contentView sendSubviewToBack:_player.view];
+                                                             
+          [self makePlayerConstraint];
+
+          
+      } authFailed:^(NSDictionary *errorInfo) {
+          NSLog(@"初始化点播播放器失败%@", errorInfo);
+
+      }];
+}
  
 #pragma mark -
 #pragma mark - action
 - (void)playOrPauseBtnAction:(UIButton *)btn
 {
-    if (self.delegate && [self.delegate respondsToSelector:@selector(lvcPlayer:clickedPlayOrPauseBtn:)]) {
-        [self.delegate lvcPlayer:self clickedPlayOrPauseBtn:btn];
+    if (btn.selected) {
+        [_player pause];
+    } else {
+        [_player play];
     }
+    
+    btn.selected =! btn.selected;
+
 }
  
 - (void)backBtnAction:(UIButton *)btn
@@ -64,24 +110,238 @@
  
 }
  
+- (void)singleTapView
+{
+    [UIView animateWithDuration:0.25 animations:^{
+        self.topBgView.alpha = self.topBgView.alpha == 0 ? 1 : 0;
+        self.bottomBgView.alpha = self.bottomBgView.alpha == 0 ? 1 : 0;
+        self.editBtn.alpha = self.editBtn.alpha == 0 ? 1 : 0;
+    }];
+    [[UIApplication sharedApplication] setStatusBarHidden:self.topBgView.alpha == 0 ? YES : NO withAnimation:UIStatusBarAnimationFade];
+
+}
+
+- (void)barrageSwitchAction
+{
+    NSString *string = self.barrageSwitch.on ? @"已开启弹幕" : @"已关闭弹幕";
+    
+    NSLog(@"%@",string);
+}
+
+- (void)editBtnAction:(UIButton *)btn
+{
+    if (self.delegate && [self.delegate respondsToSelector:@selector(lvcPlayer:clickedEditBtn:)]) {
+        [self.delegate lvcPlayer:self clickedEditBtn:btn];
+    }
+}
+
 #pragma mark -
-#pragma mark - setter
+#pragma mark - Notification
+- (void)addObservers
+{
+    //视频加载状态改变
+    [[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(appResignActive:)
+                                                 name:UIApplicationWillResignActiveNotification
+                                               object:nil];
+    
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(appBecomeActive:)
+                                                 name:UIApplicationDidBecomeActiveNotification
+                                               object:nil];
+}
+
+- (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 {
+//            _loadingView.retryBtn.hidden = YES;
+        }
+        
+        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) {
+        
+        if (_player.playbackState == MPMoviePlaybackStatePlaying) {
+            _playOrPauseBtn.selected = YES;
+            [self.loadingView retry];
+        } else {
+            _playOrPauseBtn.selected = NO;
+        }
+        
+        NSLog(@"moviePlayBackStateDidChange : %ld",(long)_player.playbackState);
+
+        /*
+         switch (_player.playbackState) {
+         case MPMoviePlaybackStateStopped: {
+         
+         [self changePlayBtnStatus:NO];
+         NSLog(@"moviePlayBackStateDidChange : MPMoviePlaybackStateStopped");
+         break;
+         }
+         case MPMoviePlaybackStatePlaying: {
+         [self changePlayBtnStatus:YES];
+         NSLog(@"moviePlayBackStateDidChange : MPMoviePlaybackStatePlaying");
+         break;
+         }
+         case MPMoviePlaybackStatePaused:
+         [self changePlayBtnStatus:NO];
+         NSLog(@"moviePlayBackStateDidChange : MPMoviePlaybackStatePaused");
+         break;
+         case MPMoviePlaybackStateInterrupted:
+         [self changePlayBtnStatus:NO];
+         NSLog(@"moviePlayBackStateDidChange : MPMoviePlaybackStateInterrupted");
+         break;
+         case MPMoviePlaybackStateSeekingForward:
+         [self changePlayBtnStatus:NO];
+         NSLog(@"moviePlayBackStateDidChange : MPMoviePlaybackStateSeekingForward");
+         break;
+         case MPMoviePlaybackStateSeekingBackward:
+         [self changePlayBtnStatus:NO];
+         NSLog(@"moviePlayBackStateDidChange : MPMoviePlaybackStateSeekingBackward");
+         break;
+         default:
+         [self changePlayBtnStatus:NO];
+         NSLog(@"moviePlayBackStateDidChange : %ld", _player.playbackState);
+         break;
+         }
+         */
+    }
+}
+
+- (void)appResignActive:(NSNotification *)noti
+{
+    [_player pause];
+}
+
+- (void)appBecomeActive:(NSNotification *)noti
+{
+    [_player play];
+}
  
+#pragma mark -
+#pragma mark - public
+- (void)stopPlaying
+{
+    if (_player.isPlaying) {
+        [_player stop];
+    }
+    _player = nil;
+    [self removeMovieNotificationObservers];
+}
+
+- (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];
+}
+
+#pragma mark -
+#pragma mark - makeConstraints
+- (void)makePlayerConstraint
+{
+    [self.player.view mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.width.equalTo(self.contentView);
+        make.height.equalTo(self.contentView);
+        make.center.equalTo(self.contentView);
+    }];
+}
  
 - (void)makeSubViewsConstraints
 {
+  
     [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.left.right.bottom.mas_equalTo(0);
     }];
  
     [self.loadingView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.center.equalTo(self.contentView);
+        make.width.mas_equalTo(100);
+        make.height.mas_equalTo(80);
     }];
-    
+
     [self.backBtn mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(self.topBgView).with.offset(5);
-        make.height.mas_equalTo(30);
-        make.width.mas_equalTo(30);
+        make.width.height.mas_equalTo(30);
         make.top.equalTo(self.topBgView).with.offset(20);
     }];
  
@@ -90,41 +350,55 @@
         make.height.mas_equalTo(70);
     }];
  
+    [self.barrageSwitch mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.width.mas_equalTo(35);
+        make.height.mas_equalTo(20);
+        make.top.mas_equalTo(20);
+        make.right.equalTo(self.topBgView).offset(-60);
+    }];
+    
     [self.bottomBgView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.bottom.left.right.equalTo(self.contentView).with.offset(0);
         make.height.mas_equalTo(50);
     }];
  
     [self.titleLab mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.leading.trailing.bottom.mas_equalTo(0);
-        make.height.mas_equalTo(40);
+        make.left.equalTo(self.backBtn).offset(40);
+        make.top.trailing.bottom.mas_equalTo(0);
     }];
  
     [self.playOrPauseBtn mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.equalTo(self.bottomBgView).with.offset(0);
-        make.height.mas_equalTo(50);
-        make.bottom.equalTo(self.bottomBgView).with.offset(0);
-        make.width.mas_equalTo(50);
+        make.left.bottom.equalTo(self.bottomBgView).with.offset(0);
+        make.width.height.mas_equalTo(50);
     }];
  
     [self.fullScreenBtn mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.right.equalTo(self.bottomBgView).with.offset(0);
-        make.height.mas_equalTo(50);
-        make.bottom.equalTo(self.bottomBgView).with.offset(0);
-        make.width.mas_equalTo(50);
-
+        make.right.bottom.equalTo(self.bottomBgView).with.offset(0);
+        make.width.height.mas_equalTo(50);
+    }];
+    
+    [self.editBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.width.height.mas_equalTo(40);
+        make.centerY.equalTo(self.contentView);
+        make.right.equalTo(self.contentView).with.offset(-20);
     }];
  
 }
  
 #pragma mark -
+#pragma mark - setter
+
+
+#pragma mark -
 #pragma mark - getter
  
-- (UIView *)contentView
+- (UIImageView *)contentView
 {
     if (!_contentView) {
-        _contentView = [[UIView alloc] init];
-        _contentView.backgroundColor = [UIColor blueColor];
+        _contentView = [[UIImageView alloc] init];
+        _contentView.image = [UIImage imageNamed:@""];
+        _contentView.backgroundColor = [UIColor lightGrayColor];
+        _contentView.userInteractionEnabled = YES;
     }
     return _contentView;
 }
@@ -153,8 +427,8 @@
 {
     if (!_playOrPauseBtn) {
         _playOrPauseBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        [_playOrPauseBtn setImage:[UIImage imageNamed:@"pause"] forState:UIControlStateNormal];
-        [_playOrPauseBtn setImage:[UIImage imageNamed:@"play"] forState:UIControlStateSelected];
+        [_playOrPauseBtn setImage:[UIImage imageNamed:@"play"] forState:UIControlStateNormal];
+        [_playOrPauseBtn setImage:[UIImage imageNamed:@"pause"] forState:UIControlStateSelected];
         [_playOrPauseBtn addTarget:self action:@selector(playOrPauseBtnAction:) forControlEvents:UIControlEventTouchUpInside];
     }
     return _playOrPauseBtn;
@@ -164,8 +438,9 @@
 {
     if (!_titleLab) {
         _titleLab = [[UILabel alloc] init];
+        _titleLab.text = @"我是标题~~";
         _titleLab.textColor = [UIColor whiteColor];
-        _titleLab.font = [UIFont systemFontOfSize:15];
+        _titleLab.font = [UIFont systemFontOfSize:17];
     }
     return _titleLab;
 }
@@ -185,21 +460,53 @@
 {
     if (!_backBtn) {
         _backBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        [_backBtn setImage:[UIImage imageNamed:@"返回"] forState:UIControlStateNormal];
+        [_backBtn setImage:[UIImage imageNamed:@"play_back"] forState:UIControlStateNormal];
         [_backBtn addTarget:self action:@selector(backBtnAction:) forControlEvents:UIControlEventTouchUpInside];
     }
     return _backBtn;
 }
  
-- (UIActivityIndicatorView *)loadingView
+- (LVCPlayerLoadingView *)loadingView
 {
     if (!_loadingView) {
-        _loadingView = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge];
-        [_loadingView startAnimating];
+        _loadingView = [[LVCPlayerLoadingView alloc] init];
     }
     return _loadingView;
 }
  
+- (UITapGestureRecognizer *)singleTap
+{
+    if (!_singleTap) {
+        _singleTap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(singleTapView)];
+    }
+    return _singleTap;
+}
+
+- (SevenSwitch *)barrageSwitch {  //弹幕开关
+    if (!_barrageSwitch) {
+        _barrageSwitch = [[SevenSwitch alloc] init];
+        _barrageSwitch.knobOnImage = [UIImage imageNamed:@"弹off"];
+        _barrageSwitch.knobOffImage = [UIImage imageNamed:@"弹off"];
+        _barrageSwitch.onColor = [UIColor yellowColorZX];
+        _barrageSwitch.borderColor = [UIColor blackColor];
+        _barrageSwitch.activeColor = [UIColor blackColor];
+        _barrageSwitch.inactiveColor = [UIColor blackColor];
+        _barrageSwitch.on = YES;
+//        _barrageSwitch.hidden = YES;
+        [_barrageSwitch addTarget:self action:@selector(barrageSwitchAction) forControlEvents:UIControlEventValueChanged];
+    }
+    return _barrageSwitch;
+}
+
+- (UIButton *)editBtn
+{
+    if (!_editBtn) {
+        _editBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+        [_editBtn setImage:[UIImage imageNamed:@"Barrage input"] forState:UIControlStateNormal];
+        [_editBtn addTarget:self action:@selector(editBtnAction:) forControlEvents:UIControlEventTouchUpInside];
+    }
+    return _editBtn;
+}
  
 /*
 // Only override drawRect: if you perform custom drawing.
+//
+//  LVCPlayerLoadingView.h
+//  LiveVideoCloud
+//
+//  Created by iOS on 17/3/15.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@protocol LVCPlayerLoadingViewDelegate <NSObject>
+
+- (void)retryBtnClick;      //点击重试
+
+@end
+
+@interface LVCPlayerLoadingView : UIView
+
+@property (nonatomic, assign) id<LVCPlayerLoadingViewDelegate> delegate;
+
+- (void)startLoading;       //开始加载
+
+- (void)stopLoading;        //停止加载
+
+- (void)retry;
+
+@end
+//
+//  LVCPlayerLoadingView.m
+//  LiveVideoCloud
+//
+//  Created by iOS on 17/3/15.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "LVCPlayerLoadingView.h"
+
+@interface LVCPlayerLoadingView ()
+
+@property (nonatomic, strong) UIActivityIndicatorView *loadingView;
+@property (nonatomic, strong) UILabel *loadingLab;
+@property (nonatomic, strong) UIButton *retryBtn;
+
+@end
+
+@implementation LVCPlayerLoadingView
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        [self addSubview:self.loadingView];
+        [self addSubview:self.loadingLab];
+        [self addSubview:self.retryBtn];
+        
+        [self makeSubViewsConstraints];
+        [self.loadingView startAnimating];
+
+    }
+    return self;
+}
+
+#pragma mark -
+#pragma mark - public methods
+
+- (void)startLoading
+{
+    [self.loadingView startAnimating];
+    _loadingLab.hidden = NO;
+    self.retryBtn.hidden = YES;
+    self.hidden = NO;
+}
+
+- (void)stopLoading
+{
+    [self.loadingView stopAnimating];
+    self.hidden = YES;
+}
+
+- (void)retry
+{
+    _retryBtn.hidden = NO;
+    [_loadingView stopAnimating];
+    _loadingLab.hidden = YES;
+}
+
+#pragma mark -
+#pragma mark - action
+- (void)retryBtnAction
+{
+    [self startLoading];
+    if (self.delegate && [self.delegate respondsToSelector:@selector(retryBtnClick)]) {
+        [self.delegate retryBtnClick];
+    }
+}
+
+#pragma mark -
+#pragma mark - makeSubViewsConstraints
+- (void)makeSubViewsConstraints
+{
+    
+    [self.loadingView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.centerX.mas_equalTo(self.width/2);
+        make.top.mas_equalTo(0);
+    }];
+    
+    [self.loadingLab mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(0);
+        make.top.mas_equalTo(40);
+        make.width.equalTo(self);
+        make.height.mas_equalTo(40);
+    }];
+    
+    [self.retryBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.width.mas_equalTo(70);
+        make.height.mas_equalTo(40);
+        make.center.equalTo(self);
+    }];
+    
+}
+
+#pragma mark -
+#pragma mark - getter
+
+- (UIActivityIndicatorView *)loadingView
+{
+    if (!_loadingView) {
+        _loadingView = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge];
+    }
+    return _loadingView;
+}
+
+- (UILabel *)loadingLab
+{
+    if (!_loadingLab) {
+        _loadingLab = [[UILabel alloc] init];
+        _loadingLab.text = @"努力加载中...";
+        _loadingLab.textColor = [UIColor whiteColor];
+        _loadingLab.textAlignment = NSTextAlignmentCenter;
+    }
+    return _loadingLab;
+}
+
+- (UIButton *)retryBtn
+{
+    if (!_retryBtn) {
+        _retryBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+        [_retryBtn setTitle:@"重试" forState:UIControlStateNormal];
+        [_retryBtn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
+        _retryBtn.hidden = YES;
+        _retryBtn.layer.cornerRadius = 10;
+        _retryBtn.layer.masksToBounds = YES;
+        _retryBtn.layer.borderColor = [UIColor blackColor].CGColor;
+        _retryBtn.layer.borderWidth = 1;
+        [_retryBtn addTarget:self action:@selector(retryBtnAction) forControlEvents:UIControlEventTouchUpInside];
+    }
+    return _retryBtn;
+}
+
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+
+@end
@@ -2,15 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-    <key>NSAppTransportSecurity</key>
-    <dict>
-        <key>NSAllowsArbitraryLoads</key>
-        <true/>
-    </dict>
-    <key>NSCameraUsageDescription</key>
-    <string></string>
-    <key>NSMicrophoneUsageDescription</key>
-    <string></string>
+	<key>UIViewControllerBasedStatusBarAppearance</key>
+	<false/>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -29,16 +22,25 @@
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
+	<key>NSCameraUsageDescription</key>
+	<string></string>
+	<key>NSMicrophoneUsageDescription</key>
+	<string></string>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
-	<key>UIMainStoryboardFile</key>
-	<string>Main</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>
 	</array>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
 		<string>UIInterfaceOrientationPortrait</string>
 	</array>
 	<key>UISupportedInterfaceOrientations~ipad</key>
@@ -24,6 +24,7 @@
     #import "SVProgressHUD.h"
     #import "AFNetworking.h"
     #import "Masonry.h"
+    #import <CNLivePlayerSDK/CNLiveWebcastManager.h>
  
 #if TARGET_OS_IPHONE
  
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "littleHeart.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" : "littleHeart1.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" : "littleHeart2.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "orientation" : "portrait",
+      "idiom" : "ipad",
+      "minimum-system-version" : "7.0",
+      "extent" : "full-screen",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "landscape",
+      "idiom" : "ipad",
+      "minimum-system-version" : "7.0",
+      "extent" : "full-screen",
+      "scale" : "1x"
+    },
+    {
+      "orientation" : "landscape",
+      "idiom" : "ipad",
+      "minimum-system-version" : "7.0",
+      "extent" : "full-screen",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "minimum-system-version" : "7.0",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "minimum-system-version" : "7.0",
+      "subtype" : "retina4",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "ipad",
+      "minimum-system-version" : "7.0",
+      "extent" : "full-screen",
+      "scale" : "1x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "Barrage input.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "load_03.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" : "全屏加载图.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" : "弹off.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "弹on.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file