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

Conflicts: LiveVideoCloud/LiveVideoCloud.xcodeproj/project.pbxproj LiveVideoCloud/LiveVideoCloud/Assets.xcassets/bottom_shadow.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/Assets.xcassets/bottom_shadow.imageset/bottom_shadow.png LiveVideoCloud/LiveVideoCloud/Assets.xcassets/dot.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/Assets.xcassets/dot.imageset/dot@3x.png LiveVideoCloud/LiveVideoCloud/Assets.xcassets/fullscreen.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/Assets.xcassets/fullscreen.imageset/fullscreen@3x.png LiveVideoCloud/LiveVideoCloud/Assets.xcassets/nonfullscreen.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/Assets.xcassets/nonfullscreen.imageset/nonfullscreen@3x.png LiveVideoCloud/LiveVideoCloud/Assets.xcassets/pause.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/Assets.xcassets/pause.imageset/pause@3x.png LiveVideoCloud/LiveVideoCloud/Assets.xcassets/play.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/Assets.xcassets/play.imageset/play@3x.png LiveVideoCloud/LiveVideoCloud/Assets.xcassets/play_back.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/Assets.xcassets/play_back.imageset/play_back.png LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/bottom_shadow.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/bottom_shadow.imageset/bottom_shadow.png LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/dot.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/dot.imageset/dot@3x.png LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/fullscreen.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/fullscreen.imageset/fullscreen@3x.png LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/nonfullscreen.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/nonfullscreen.imageset/nonfullscreen@3x.png LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/pause.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/pause.imageset/pause@3x.png LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/play.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/play.imageset/play@3x.png LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/play_back.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/play_back.imageset/play_back.png LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/top_shadow.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/top_shadow.imageset/top_shadow.png LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/返回.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/返回.imageset/返回@3x.png LiveVideoCloud/LiveVideoCloud/Assets.xcassets/top_shadow.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/Assets.xcassets/top_shadow.imageset/top_shadow.png LiveVideoCloud/LiveVideoCloud/Assets.xcassets/返回.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/Assets.xcassets/返回.imageset/返回@3x.png LiveVideoCloud/LiveVideoCloud/animation.xcassets/bottom_shadow.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/animation.xcassets/bottom_shadow.imageset/bottom_shadow.png LiveVideoCloud/LiveVideoCloud/animation.xcassets/dot.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/animation.xcassets/dot.imageset/dot@3x.png LiveVideoCloud/LiveVideoCloud/animation.xcassets/fullscreen.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/animation.xcassets/fullscreen.imageset/fullscreen@3x.png LiveVideoCloud/LiveVideoCloud/animation.xcassets/nonfullscreen.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/animation.xcassets/nonfullscreen.imageset/nonfullscreen@3x.png LiveVideoCloud/LiveVideoCloud/animation.xcassets/pause.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/animation.xcassets/pause.imageset/pause@3x.png LiveVideoCloud/LiveVideoCloud/animation.xcassets/play.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/animation.xcassets/play.imageset/play@3x.png LiveVideoCloud/LiveVideoCloud/animation.xcassets/play_back.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/animation.xcassets/play_back.imageset/play_back.png LiveVideoCloud/LiveVideoCloud/animation.xcassets/top_shadow.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/animation.xcassets/top_shadow.imageset/top_shadow.png LiveVideoCloud/LiveVideoCloud/animation.xcassets/返回.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/animation.xcassets/返回.imageset/返回@3x.png

Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud
Conflicts: LiveVideoCloud/LiveVideoCloud.xcodeproj/project.pbxproj LiveVideoCloud/LiveVideoCloud/Assets.xcassets/bottom_shadow.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/Assets.xcassets/bottom_shadow.imageset/bottom_shadow.png LiveVideoCloud/LiveVideoCloud/Assets.xcassets/dot.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/Assets.xcassets/dot.imageset/dot@3x.png LiveVideoCloud/LiveVideoCloud/Assets.xcassets/fullscreen.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/Assets.xcassets/fullscreen.imageset/fullscreen@3x.png LiveVideoCloud/LiveVideoCloud/Assets.xcassets/nonfullscreen.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/Assets.xcassets/nonfullscreen.imageset/nonfullscreen@3x.png LiveVideoCloud/LiveVideoCloud/Assets.xcassets/pause.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/Assets.xcassets/pause.imageset/pause@3x.png LiveVideoCloud/LiveVideoCloud/Assets.xcassets/play.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/Assets.xcassets/play.imageset/play@3x.png LiveVideoCloud/LiveVideoCloud/Assets.xcassets/play_back.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/Assets.xcassets/play_back.imageset/play_back.png LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/bottom_shadow.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/bottom_shadow.imageset/bottom_shadow.png LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/dot.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/dot.imageset/dot@3x.png LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/fullscreen.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/fullscreen.imageset/fullscreen@3x.png LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/nonfullscreen.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/nonfullscreen.imageset/nonfullscreen@3x.png LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/pause.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/pause.imageset/pause@3x.png LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/play.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/play.imageset/play@3x.png LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/play_back.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/play_back.imageset/play_back.png LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/top_shadow.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/top_shadow.imageset/top_shadow.png LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/返回.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/返回.imageset/返回@3x.png LiveVideoCloud/LiveVideoCloud/Assets.xcassets/top_shadow.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/Assets.xcassets/top_shadow.imageset/top_shadow.png LiveVideoCloud/LiveVideoCloud/Assets.xcassets/返回.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/Assets.xcassets/返回.imageset/返回@3x.png LiveVideoCloud/LiveVideoCloud/animation.xcassets/bottom_shadow.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/animation.xcassets/bottom_shadow.imageset/bottom_shadow.png LiveVideoCloud/LiveVideoCloud/animation.xcassets/dot.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/animation.xcassets/dot.imageset/dot@3x.png LiveVideoCloud/LiveVideoCloud/animation.xcassets/fullscreen.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/animation.xcassets/fullscreen.imageset/fullscreen@3x.png LiveVideoCloud/LiveVideoCloud/animation.xcassets/nonfullscreen.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/animation.xcassets/nonfullscreen.imageset/nonfullscreen@3x.png LiveVideoCloud/LiveVideoCloud/animation.xcassets/pause.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/animation.xcassets/pause.imageset/pause@3x.png LiveVideoCloud/LiveVideoCloud/animation.xcassets/play.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/animation.xcassets/play.imageset/play@3x.png LiveVideoCloud/LiveVideoCloud/animation.xcassets/play_back.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/animation.xcassets/play_back.imageset/play_back.png LiveVideoCloud/LiveVideoCloud/animation.xcassets/top_shadow.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/animation.xcassets/top_shadow.imageset/top_shadow.png LiveVideoCloud/LiveVideoCloud/animation.xcassets/返回.imageset/Contents.json LiveVideoCloud/LiveVideoCloud/animation.xcassets/返回.imageset/返回@3x.png
朱林
2 parents be2ab2b8 7b964133
Showing 92 changed files with 1618 additions and 20 deletions
LiveVideoCloud/LiveVideoCloud.xcodeproj/project.pbxproj
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/BottomToolView/BottomToolView.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/BottomToolView/BottomToolView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftModel/GiftModel.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftModel/GiftModel.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftResource/NHPlaneViews.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftViews/GiftListView.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftViews/GiftListView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftViews/GiftModelView.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftViews/GiftModelView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/LVCGiftManager.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/LVCInteractionController.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/LiveBaseView.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/LiveBaseView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/LiveSections/Controller/LVCLiveViewController.m
LiveVideoCloud/LiveVideoCloud/UtilKits/DeviceInfo/ZXDeviceInfo.h
LiveVideoCloud/LiveVideoCloud/Assets.xcassets/AppIcon.appiconset/Contents.json → LiveVideoCloud/LiveVideoCloud/animation.xcassets/AppIcon.appiconset/Contents.json
LiveVideoCloud/LiveVideoCloud/Assets.xcassets/Contents.json → LiveVideoCloud/LiveVideoCloud/animation.xcassets/Contents.json
LiveVideoCloud/LiveVideoCloud/Assets.xcassets/Interaction/Contents.json → LiveVideoCloud/LiveVideoCloud/animation.xcassets/Interaction/Animation/Contents.json
LiveVideoCloud/LiveVideoCloud/Assets.xcassets/Interaction/love.imageset/Contents.json → LiveVideoCloud/LiveVideoCloud/animation.xcassets/Interaction/Animation/love.imageset/Contents.json
@@ -29,6 +29,8 @@
 		81FB5B031E7A251300F98E1D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 81FB5B021E7A251300F98E1D /* Assets.xcassets */; };
 		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 */; };
 		D2029BAA1E6EAAA50027CD92 /* LiveVideoCloudUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = D2029BA91E6EAAA50027CD92 /* LiveVideoCloudUITests.m */; };
@@ -125,6 +127,11 @@
 		D2029D091E6EAE2E0027CD92 /* Foundation+Log.m in Sources */ = {isa = PBXBuildFile; fileRef = D2029CF21E6EAE2E0027CD92 /* Foundation+Log.m */; };
 		D2029D0A1E6EAE2E0027CD92 /* ZXServerUrl.m in Sources */ = {isa = PBXBuildFile; fileRef = D2029CFE1E6EAE2E0027CD92 /* ZXServerUrl.m */; };
 		D2029D161E6EB00D0027CD92 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = D2029D151E6EB00D0027CD92 /* AppDelegate.m */; };
+		D22830F11E778C0F00627701 /* LiveBaseView.m in Sources */ = {isa = PBXBuildFile; fileRef = D22830F01E778C0F00627701 /* LiveBaseView.m */; };
+		D22830FC1E77C2D900627701 /* BottomToolView.m in Sources */ = {isa = PBXBuildFile; fileRef = D22830FB1E77C2D900627701 /* BottomToolView.m */; };
+		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 */; };
 		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 */; };
@@ -217,6 +224,8 @@
 		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>"; };
 		D2029B9A1E6EAAA50027CD92 /* LiveVideoCloudTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = LiveVideoCloudTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -425,6 +434,16 @@
 		D2029CFF1E6EAE2E0027CD92 /* UtilKits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UtilKits.h; sourceTree = "<group>"; };
 		D2029D121E6EAF8D0027CD92 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		D2029D151E6EB00D0027CD92 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
+		D22830EF1E778C0F00627701 /* LiveBaseView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LiveBaseView.h; sourceTree = "<group>"; };
+		D22830F01E778C0F00627701 /* LiveBaseView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LiveBaseView.m; sourceTree = "<group>"; };
+		D22830FA1E77C2D900627701 /* BottomToolView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BottomToolView.h; sourceTree = "<group>"; };
+		D22830FB1E77C2D900627701 /* BottomToolView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BottomToolView.m; sourceTree = "<group>"; };
+		D22830FD1E77C69E00627701 /* GiftListView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GiftListView.h; sourceTree = "<group>"; };
+		D22830FE1E77C69E00627701 /* GiftListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GiftListView.m; sourceTree = "<group>"; };
+		D22831001E77D83C00627701 /* GiftModelView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GiftModelView.h; sourceTree = "<group>"; };
+		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>"; };
 		D2575C481E7685DE00E3A8FC /* UIView+Bubbling.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+Bubbling.m"; sourceTree = "<group>"; };
@@ -574,6 +593,7 @@
 				D2029BD01E6EADE10027CD92 /* Classes */,
 				D2029CD11E6EADE70027CD92 /* HttpService */,
 				D2029CD71E6EAE140027CD92 /* Resource */,
+				D2029B901E6EAAA50027CD92 /* animation.xcassets */,
 				D2029CD61E6EADFB0027CD92 /* PrefixHeader.pch */,
 				D2029B841E6EAAA50027CD92 /* Supporting Files */,
 			);
@@ -1159,9 +1179,65 @@
 			path = AppDelegate;
 			sourceTree = "<group>";
 		};
+		D22830F51E77C24900627701 /* GiftViews */ = {
+			isa = PBXGroup;
+			children = (
+				D22830FD1E77C69E00627701 /* GiftListView.h */,
+				D22830FE1E77C69E00627701 /* GiftListView.m */,
+				D22831001E77D83C00627701 /* GiftModelView.h */,
+				D22831011E77D83C00627701 /* GiftModelView.m */,
+			);
+			path = GiftViews;
+			sourceTree = "<group>";
+		};
+		D22830F61E77C26C00627701 /* Chat */ = {
+			isa = PBXGroup;
+			children = (
+				D22830F71E77C27A00627701 /* ChatViews */,
+			);
+			path = Chat;
+			sourceTree = "<group>";
+		};
+		D22830F71E77C27A00627701 /* ChatViews */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = ChatViews;
+			sourceTree = "<group>";
+		};
+		D22830F81E77C2A700627701 /* TopToolView */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = TopToolView;
+			sourceTree = "<group>";
+		};
+		D22830F91E77C2D900627701 /* BottomToolView */ = {
+			isa = PBXGroup;
+			children = (
+				D22830FA1E77C2D900627701 /* BottomToolView.h */,
+				D22830FB1E77C2D900627701 /* BottomToolView.m */,
+			);
+			path = BottomToolView;
+			sourceTree = "<group>";
+		};
+		D22831061E77D8D500627701 /* GiftModel */ = {
+			isa = PBXGroup;
+			children = (
+				D22831071E77D8D500627701 /* GiftModel.h */,
+				D22831081E77D8D500627701 /* GiftModel.m */,
+			);
+			path = GiftModel;
+			sourceTree = "<group>";
+		};
 		D2575C431E76846900E3A8FC /* InteractionSections */ = {
 			isa = PBXGroup;
 			children = (
+				D22830F91E77C2D900627701 /* BottomToolView */,
+				D22830F81E77C2A700627701 /* TopToolView */,
+				D22830F61E77C26C00627701 /* Chat */,
+				D22830EF1E778C0F00627701 /* LiveBaseView.h */,
+				D22830F01E778C0F00627701 /* LiveBaseView.m */,
 				D2575C651E76A25400E3A8FC /* LVCInteractionController.h */,
 				D2575C661E76A25400E3A8FC /* LVCInteractionController.m */,
 				D2575C681E76A42B00E3A8FC /* Gift */,
@@ -1186,7 +1262,9 @@
 			children = (
 				D2575C691E76A45400E3A8FC /* LVCGiftManager.h */,
 				D2575C6A1E76A45400E3A8FC /* LVCGiftManager.m */,
+				D22830F51E77C24900627701 /* GiftViews */,
 				D2575C6C1E76A4F300E3A8FC /* GiftResource */,
+				D22831061E77D8D500627701 /* GiftModel */,
 			);
 			path = Gift;
 			sourceTree = "<group>";
@@ -1443,6 +1521,7 @@
 				D2029CC91E6EADE10027CD92 /* SVProgressHUD.bundle in Resources */,
 				D2575C801E76A4F300E3A8FC /* resource.bundle in Resources */,
 				D2029B941E6EAAA50027CD92 /* LaunchScreen.storyboard in Resources */,
+				D2029B911E6EAAA50027CD92 /* animation.xcassets in Resources */,
 				D2029CB01E6EADE10027CD92 /* MJRefresh.bundle in Resources */,
 				D2575C7C1E76A4F300E3A8FC /* NHFighterView.nib in Resources */,
 				812E50541E7699DC004F5FCD /* KSYGPUResource.bundle in Resources */,
@@ -1471,6 +1550,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				D2029CC31E6EADE10027CD92 /* UIImageView+HighlightedWebCache.m in Sources */,
+				D22830FF1E77C69E00627701 /* GiftListView.m in Sources */,
 				D2029CC01E6EADE10027CD92 /* UIImage+GIF.m in Sources */,
 				D2029BCF1E6EADD70027CD92 /* ZXTabBarController.m in Sources */,
 				D2029D071E6EAE2E0027CD92 /* ZXConst.m in Sources */,
@@ -1482,6 +1562,7 @@
 				D2029CA01E6EADE10027CD92 /* NSObject+MJProperty.m in Sources */,
 				D2029CB51E6EADE10027CD92 /* SDiOSVersion.m in Sources */,
 				D2029C9C1E6EADE10027CD92 /* MJPropertyType.m in Sources */,
+				D22831091E77D8D500627701 /* GiftModel.m in Sources */,
 				D2029CCD1E6EADE10027CD92 /* SearchModel.m in Sources */,
 				810B65051E779B1F00133E15 /* NSLayoutConstraint+MASDebugAdditions.m in Sources */,
 				D2029CCB1E6EADE10027CD92 /* SVRadialGradientLayer.m in Sources */,
@@ -1495,6 +1576,7 @@
 				D2575C7A1E76A4F300E3A8FC /* NHCarViews.m in Sources */,
 				D2029CBC1E6EADE10027CD92 /* SDWebImageDownloaderOperation.m in Sources */,
 				D2029CA51E6EADE10027CD92 /* MJRefreshFooter.m in Sources */,
+				D22830FC1E77C2D900627701 /* BottomToolView.m in Sources */,
 				810B65061E779B1F00133E15 /* View+MASAdditions.m in Sources */,
 				D2029D161E6EB00D0027CD92 /* AppDelegate.m in Sources */,
 				D2029CB71E6EADE10027CD92 /* NSData+ImageContentType.m in Sources */,
@@ -1519,6 +1601,7 @@
 				D2029CC71E6EADE10027CD92 /* SVIndefiniteAnimatedView.m in Sources */,
 				D2029CA31E6EADE10027CD92 /* MJRefreshBackFooter.m in Sources */,
 				D2575C4A1E7685DE00E3A8FC /* UIView+Bubbling.m in Sources */,
+				D22831021E77D83C00627701 /* GiftModelView.m in Sources */,
 				D2029CA61E6EADE10027CD92 /* MJRefreshHeader.m in Sources */,
 				D2029CC41E6EADE10027CD92 /* UIImageView+WebCache.m in Sources */,
 				D2029CC81E6EADE10027CD92 /* SVProgressAnimatedView.m in Sources */,
@@ -1561,6 +1644,7 @@
 				D2029CCA1E6EADE10027CD92 /* SVProgressHUD.m in Sources */,
 				D2029CA81E6EADE10027CD92 /* MJRefreshAutoNormalFooter.m in Sources */,
 				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 */,
+//
+//  BottomToolView.h
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/14.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "BaseView.h"
+
+typedef NS_ENUM(NSInteger, BtnClickType) {//底部按钮类型
+    BtnClickTypeChat        = 1,//聊天按钮点击
+    BtnClickTypePriChat        ,//私聊按钮点击
+    BtnClickTypeGift           ,//礼物按钮点击
+};
+
+@protocol bottomBtnDeledate <NSObject>
+
+- (void)bottomActionWithType:(BtnClickType)btnType;
+
+@end
+@interface BottomToolView : BaseView
+
+@property (nonatomic) id <bottomBtnDeledate>                     delegate;
+
+@end
+//
+//  BottomToolView.m
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/14.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "BottomToolView.h"
+
+@interface BottomToolView ()
+
+@property (nonatomic ,strong) UIButton * _Nullable             chatBtn;
+@property (nonatomic ,strong) UIButton * _Nullable             privateChatBtn;
+@property (nonatomic ,strong) UIButton * _Nullable             giftBtn;
+
+@end
+
+@implementation BottomToolView
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+    if (self = [super initWithFrame:frame]) {
+        [self addSubview:self.chatBtn];
+        [self addSubview:self.privateChatBtn];
+        [self addSubview:self.giftBtn];
+    }
+    return self;
+}
+
+#pragma mark - buttonClick
+- (void)chatAction
+{
+    
+}
+
+- (void)privateChatAction
+{
+    
+}
+
+- (void)giftAction
+{
+    if ([self.delegate respondsToSelector:@selector(bottomActionWithType:)]) {
+        [self.delegate bottomActionWithType:BtnClickTypeGift];
+    }
+}
+
+#pragma mark - getter
+- (UIButton *)chatBtn
+{
+    if (!_chatBtn)
+    {
+        UIButton *chatBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+        chatBtn.frame = CGRectMake(10, (self.height - 45)*0.5, 45, 45);
+        [chatBtn setBackgroundImage:[UIImage imageNamed:@"LiveChatNormal"] forState:UIControlStateNormal];
+        [chatBtn setBackgroundImage:[UIImage imageNamed:@"LiveChatTouch"] forState:UIControlStateHighlighted];
+        [chatBtn addTarget:self action:@selector(chatAction) forControlEvents:UIControlEventTouchUpInside];
+        _chatBtn = chatBtn;
+    }
+    return _chatBtn;
+}
+
+- (UIButton *)privateChatBtn
+{
+    if (!_privateChatBtn)
+    {
+        UIButton *privateChatBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+        privateChatBtn.frame = CGRectMake(self.width*0.5 - 50, (self.height - 45)*0.5, 45, 45);
+        [privateChatBtn setBackgroundImage:[UIImage imageNamed:@"LiveChatNormal"] forState:UIControlStateNormal];
+        [privateChatBtn setBackgroundImage:[UIImage imageNamed:@"LiveChatTouch"] forState:UIControlStateHighlighted];
+        [privateChatBtn addTarget:self action:@selector(privateChatAction) forControlEvents:UIControlEventTouchUpInside];
+        _privateChatBtn = privateChatBtn;
+    }
+    return _privateChatBtn;
+}
+
+- (UIButton *)giftBtn
+{
+    if (!_giftBtn)
+    {
+        UIButton *giftBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+        giftBtn.frame = CGRectMake(self.width*0.5 + 10, (self.height - 45)*0.5, 45, 45);
+        [giftBtn setBackgroundImage:[UIImage imageNamed:@"LiveChatGiftNormal"] forState:UIControlStateNormal];
+        [giftBtn setBackgroundImage:[UIImage imageNamed:@"LiveChatGiftTouch"] forState:UIControlStateHighlighted];
+        [giftBtn addTarget:self action:@selector(giftAction) forControlEvents:UIControlEventTouchUpInside];
+        _giftBtn = giftBtn;
+    }
+    return _giftBtn;
+}
+
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+
+@end
+//
+//  GiftModel.h
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/14.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "BaseModel.h"
+
+typedef NS_ENUM(NSInteger, GiftModelType) {//礼物类型
+    GiftModelTypeCommon          = 1,//普通礼物
+    GiftModelTypeSpecial             //特殊(豪华)礼物
+};
+
+@interface GiftModel : BaseModel
+
+@property (nonatomic ,copy) NSString * _Nullable     image;
+@property (nonatomic      ) GiftModelType            type;
+@property (nonatomic ,copy) NSString * _Nullable     price;
+
+@end
+//
+//  GiftModel.m
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/14.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "GiftModel.h"
+
+@implementation GiftModel
+
+@end
@@ -39,7 +39,7 @@
  
     CGPathAddQuadCurveToPoint(path, NULL, endPoint.x, endPoint.y, endPoint.x, endPoint.y);
     position.path = path;
-    position.duration = 4.f;
+    position.duration = 5.f;
     position.speed = 0.6;
     position.removedOnCompletion = NO;
     position.fillMode = kCAFillModeForwards;
+//
+//  GiftListView.h
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/14.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "BaseView.h"
+
+@interface GiftListView : BaseView
+
+@end
+//
+//  GiftListView.m
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/14.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "GiftListView.h"
+#import "GiftModel.h"
+
+#define MAX_LINE_COUNT 4
+#define MAX_ROW_COUNT  2
+
+@interface GiftListView ()
+
+@property (nonatomic ,strong) NSArray <GiftModel *>* _Nullable            giftArray;
+
+@end
+
+@implementation GiftListView
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+    if (self = [super initWithFrame:frame]) {
+        
+        
+        UIScrollView *scrollView = [[UIScrollView alloc] initWithFrame:self.bounds];
+        scrollView.contentSize = CGSizeMake(self.width *(self.giftArray.count/(MAX_ROW_COUNT*MAX_LINE_COUNT) + 1), self.height);
+        scrollView.pagingEnabled = YES;
+        scrollView.bounces = NO;
+        scrollView.showsVerticalScrollIndicator = NO;
+        scrollView.showsHorizontalScrollIndicator = NO;
+        scrollView.backgroundColor = [UIColor blueColor];
+        [self addSubview:scrollView];
+        
+        int line = 0;
+        int row = 0;
+        CGFloat giftX = 0;
+        CGFloat giftY = 0;
+        int page = 0;
+        for (int i = 0; i < self.giftArray.count; i ++) {
+            
+            if (i % MAX_LINE_COUNT == 0 && i > 0) {
+                line ++;
+            }
+            if (i % (MAX_LINE_COUNT * MAX_ROW_COUNT) == 0 && i > 0) {
+                page++;
+                line = 0;
+            }
+            row = i % MAX_LINE_COUNT;
+            CGFloat giftWidth = self.width / MAX_LINE_COUNT * 1.0;
+            CGFloat giftHeight = self.height / 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;
+            picImg.centerY = giftView.height * 0.5;
+            [giftView addSubview:picImg];
+
+            [scrollView addSubview:giftView];
+        }
+    }
+    return self;
+}
+
+- (UIView *)giftViewWithFrame:(CGRect)frame model:(GiftModel *)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;
+    }
+    
+    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;
+}
+
+- (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];
+    }
+    return _giftArray;
+}
+
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+
+@end
+//
+//  GiftModelView.h
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/14.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "BaseView.h"
+
+@class GiftModel;
+@interface GiftModelView : BaseView
+
++ (instancetype)giftViewWithModel:(GiftModel *)giftModel;
+@end
+//
+//  GiftModelView.m
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/14.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "GiftModelView.h"
+#import "GiftModel.h"
+
+@implementation GiftModelView
+
+//+ (instancetype)giftViewWithModel:(GiftModel *)giftModel
+//{
+//    GiftModelView *view = [[GiftModelView alloc] init];
+//    view
+//    return ;
+//}
+
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+
+@end
@@ -23,7 +23,7 @@
             //数组中放CGRect数据，CGRect的x和y分别作为控制点的x和y，CGRect的width和height作为结束点的x和y
             //方法如下：数组内的每个元素代码一个控制点和结束点
             NSMutableArray *pointArrs = [[NSMutableArray alloc] init];
-            CGFloat width = [UIScreen mainScreen].bounds.size.width / 2;
+            CGFloat width = SCREEN_WIDTH / 2;
             [pointArrs addObject:NSStringFromCGRect(CGRectMake(width, 300, width, 300))];
             [pointArrs addObject:NSStringFromCGRect(CGRectMake(width, 300, width, 300))];
             car.curveControlAndEndPoints = pointArrs;
@@ -41,6 +41,10 @@
         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];
         }
@@ -7,10 +7,12 @@
 //
  
 #import "LVCInteractionController.h"
-#import "LVCGiftManager.h"
+#import "LiveBaseView.h"
  
 @interface LVCInteractionController ()
  
+@property (nonatomic ,strong) LiveBaseView * _Nullable             liveBaseView;
+
 @end
  
 @implementation LVCInteractionController
@@ -18,12 +20,22 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
-    
+    self.automaticallyAdjustsScrollViewInsets = NO;
+}
+
+- (void)bindView
+{
+    [self.view addSubview:self.liveBaseView];
 }
  
-- (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
+- (LiveBaseView *)liveBaseView
 {
-    [LVCGiftManager giftType:GiftTypeFighter toView:self.view];
+    if (!_liveBaseView)
+    {
+        _liveBaseView = [[LiveBaseView alloc] initWithFrame:SCREEN_RECT];
+        _liveBaseView.backgroundColor = [UIColor greenColor];
+    }
+    return _liveBaseView;
 }
  
 - (void)didReceiveMemoryWarning {
+//
+//  LiveBaseView.h
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/14.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "BaseView.h"
+
+@interface LiveBaseView : BaseView 
+
+@end
+
+//
+//  LiveBaseView.m
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/14.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "LiveBaseView.h"
+#import "LVCGiftManager.h"
+#import "BottomToolView.h"
+#import "GiftListView.h"
+
+@interface LiveBaseView ()<bottomBtnDeledate>
+
+@property (nonatomic ,strong) UIScrollView *  _Nullable scrollView;
+@property (nonatomic ,strong) BottomToolView* _Nullable bottomToolView;
+@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
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+    if (self = [super initWithFrame:frame]) {
+        
+        [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];
+    }
+    return self;
+}
+
+#pragma mark - bottomBtnDelegate
+- (void)bottomActionWithType:(BtnClickType)btnType
+{
+    [self hiddenView:YES];
+    switch (btnType) {
+        case BtnClickTypeChat:
+        {
+            
+        }
+            break;
+        case BtnClickTypePriChat:
+        {
+            
+        }
+            break;
+        case BtnClickTypeGift:
+        {
+            GiftListView *giftListView = [[GiftListView alloc] initWithFrame:CGRectMake(0, SCREEN_HEIGHT - 200, SCREEN_WIDTH, 200)];
+            giftListView.backgroundColor = [UIColor redColor];
+            [self addSubview:giftListView];
+            self.currentPopView = giftListView;
+            
+            
+            
+            
+        }
+            break;
+        default:
+            break;
+    }
+}
+
+- (void)hiddenView:(BOOL)isHidden
+{
+    self.bottomToolView.hidden = isHidden;
+    self.closeBtn.hidden = isHidden;
+}
+
+- (void)clearCurrentPopView
+{
+    [UIView animateWithDuration:0.25 animations:^{
+        
+        self.currentPopView.frame = CGRectMake(0, SCREEN_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT);
+        [self hiddenView:NO];
+    } completion:^(BOOL finished) {
+        [self.currentPopView removeFromSuperview];
+    }];
+}
+
+#pragma mark - buttonClick
+- (void)tapGestureClick
+{
+    [self clearCurrentPopView];
+}
+
+
+- (void)porschAction
+{
+    [LVCGiftManager giftType:GiftTypePorsch toView:self];
+}
+
+- (void)fightAction
+{
+    [LVCGiftManager giftType:GiftTypeFighter toView:self];
+}
+
+- (void)planeAction
+{
+    [LVCGiftManager giftType:GiftTypePlane toView:self];
+}
+
+- (void)closeAction
+{
+    
+}
+
+#pragma mark - getter
+- (UIScrollView *)scrollView
+{
+    if (!_scrollView)
+    {
+        _scrollView = [[UIScrollView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT)];
+        _scrollView.contentSize = CGSizeMake(SCREEN_WIDTH*2, SCREEN_HEIGHT);
+        _scrollView.contentOffset = CGPointMake(SCREEN_WIDTH, 0);
+        _scrollView.bounces = NO;
+        _scrollView.pagingEnabled = YES;
+        _scrollView.showsVerticalScrollIndicator = NO;
+        _scrollView.showsHorizontalScrollIndicator = NO;
+        _scrollView.backgroundColor = [UIColor clearColor];
+    }
+    return _scrollView;
+}
+
+- (BottomToolView *)bottomToolView
+{
+    if (!_bottomToolView)
+    {
+        _bottomToolView = [[BottomToolView alloc] initWithFrame:CGRectMake(SCREEN_WIDTH, SCREEN_HEIGHT - 60, SCREEN_WIDTH, 60)];
+        _bottomToolView.delegate = self;
+        _bottomToolView.backgroundColor = [UIColor lightGrayColor];
+        _bottomToolView.alpha = 0.7;
+    }
+    return _bottomToolView;
+}
+
+- (UIButton *)closeBtn
+{
+    if (!_closeBtn)
+    {
+        UIButton *closeBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+        closeBtn.frame = CGRectMake(SCREEN_WIDTH - 43,SCREEN_HEIGHT - self.bottomToolView.height + (self.bottomToolView.height - 33)*0.5, 33, 33);
+        [closeBtn setBackgroundImage:[UIImage imageNamed:@"LiveCloseNormal"] forState:UIControlStateNormal];
+        [closeBtn setBackgroundImage:[UIImage imageNamed:@"LiveCloseTouch"] forState:UIControlStateHighlighted];
+        [closeBtn addTarget:self action:@selector(closeAction) forControlEvents:UIControlEventTouchUpInside];
+        _closeBtn = closeBtn;
+    }
+    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.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+
+@end
@@ -7,42 +7,470 @@
 //
  
 #import "LVCLiveViewController.h"
+#import <CNLivePlayerSDK/CNLiveGPUStreamerKit.h>
+#import <CNLivePlayerSDK/CNLiveWebcastManager.h>
  
-@interface LVCLiveViewController ()
+#define KAppId @"60_irn9edco29"
+#define KAppKey @"69fe70bda67e059286ad509d9f5377f815955645b52f94"
+
+@interface LVCLiveViewController () {
+    // 开始直播
+    UIButton *_startLiveBtn;
+    // 缩放因子
+    CGFloat _currentPinchZoomFactor;
+}
+
+@property (nonatomic,strong) UIView *captureView;
+
+@property (nonatomic,strong) CNLiveGPUStreamerKit *kitCN;
  
 @end
  
 @implementation LVCLiveViewController
  
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
+    
+    if (_kitCN) {
+        return UIInterfaceOrientationMaskAllButUpsideDown;
+    } else {
+        return UIInterfaceOrientationMaskPortrait;
+    }
+}
+
+-(void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation {
+    
+    UIInterfaceOrientation orie = [[UIApplication sharedApplication] statusBarOrientation];
+    [_kitCN rotatePreviewTo:orie];
+    
+    if (_kitCN.streamerBase.isStreaming) {
+        [_kitCN rotateStreamTo:orie];
+    }
+}
+
 - (void)viewDidLoad {
     [super viewDidLoad];
-    // Do any additional setup after loading the view.
+    
     self.view.backgroundColor = [UIColor blueColor];
  
+    [self.view addSubview:self.captureView];
+    
     UIButton *closeBtn = [[UIButton alloc] initWithFrame:CGRectMake(SCREEN_WIDTH - 50, 30, 50, 30)];
     [closeBtn setTitle:@"关闭" forState:UIControlStateNormal];
     [closeBtn addTarget:self action:@selector(closeBtnClivk) forControlEvents:UIControlEventTouchUpInside];
     [self.view addSubview:closeBtn];
+    
+    // 活动Id
+    NSString *activityId = [NSString stringWithFormat:@"%d%d%d%d%d",arc4random()%9,arc4random()%9,arc4random()%9,arc4random()%9,arc4random()%9];
+    // 初始化直播云
+    [[CNLiveWebcastManager manager] initWithAppId:KAppId appKey:KAppKey];
+    // 初始化推流
+    _kitCN = [[CNLiveGPUStreamerKit alloc] initWithDefaultConfigWithActivityId:activityId channelId:@"iOStest" isHorizontalScreen:@"0"];
+    
+    //        _kitCN.activityName = @"iOS test";
+    //        _kitCN.coverImgUrl = @"djfiwooa";
+    
+    [self setStreamerCfg];
+    [self addObservers];
+    
+    _startLiveBtn = [self addButton:@"开始直播" frame:CGRectMake(100, 40, 80, 40) action:@selector(startCapture:)];
+    [_startLiveBtn setTitle:@"开始直播" forState:UIControlStateNormal];
+    [_startLiveBtn setTitle:@"停止直播" forState:UIControlStateSelected];
+    
+    [self addButton:@"关闭预览" frame:CGRectMake(10, 40, 80, 40) action:@selector(startPreview:)];
+    [self addButton:@"退出" frame:CGRectMake(190, 40, 80, 40) action:@selector(quit)];
+    [self addButton:@"美颜" frame:CGRectMake(10, 100, 80, 40) action:@selector(openFilter:)];
+    [self addButton:@"摄像头" frame:CGRectMake(100, 100, 80, 40) action:@selector(changeCamera:)];
+    [self addButton:@"闪光灯" frame:CGRectMake(190, 100, 80, 40) action:@selector(openFlash)];
+    
+    UITapGestureRecognizer * singleRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(onTap:)];
+    singleRecognizer.delegate = self;
+    [self.captureView addGestureRecognizer:singleRecognizer];
+    
+    UIPinchGestureRecognizer *pinch = [[UIPinchGestureRecognizer alloc]initWithTarget:self action:@selector(pinchDetected:)];
+    [self.view addGestureRecognizer:pinch];
 }
  
-- (void)closeBtnClivk
-{
+#pragma mark - initialization Streamer
+- (void)setStreamerCfg {
+    //采集配置
+    _kitCN.capPreset = AVCaptureSessionPreset640x480;
+    _kitCN.previewDimension = CGSizeMake(360, 640);
+    _kitCN.streamDimension = CGSizeMake(360, 640);
+    _kitCN.videoFPS = 15;
+    _kitCN.cameraPosition = AVCaptureDevicePositionFront;
+    
+    //推流配置
+    _kitCN.streamerBase.videoCodec = CNLiveVideoCodec_AUTO;
+    _kitCN.streamerBase.videoInitBitrate = 900;
+    _kitCN.streamerBase.videoMaxBitrate = 900;
+    _kitCN.streamerBase.videoMinBitrate = 300;
+    _kitCN.streamerBase.maxKeyInterval = 2;
+    _kitCN.streamerBase.audiokBPS = 48;
+    
+    // 如果有耳机,麦克风
+    if ([CNLiveAudioCapture isHeadsetPluggedIn]) {
+        // 音频采集器  自动播放采集声音
+        [_kitCN.audioCapture setBPlayCapturedAudio:YES];
+    }
+    
+    //设置画面朝向
+    [_kitCN setVideoOrientationBy:[[UIApplication sharedApplication] statusBarOrientation]];
+    
+    // 启动预览
+    [_kitCN startPreview:self.captureView];
+    
+    //水印图片
+    _kitCN.watermark.logoPic = [UIImage imageNamed:@"互动电视180x180"];
+    _kitCN.watermark.logoRect = CGRectMake(0.8, 0.8, 50, 50);
+    _kitCN.watermark.logoAlpha = 0.6;
+    
+    //水印文字
+    _kitCN.watermark.textLabel = [[UILabel alloc] init];
+    _kitCN.watermark.textLabel.text = [NSString stringWithFormat:@"cnlive"];
+    _kitCN.watermark.textLabel.font = [UIFont systemFontOfSize:8];
+    _kitCN.watermark.textRect = CGRectMake(0.78, 0.88, 0.2, 0.04);
+    [_kitCN.watermark updateTextLabel];
+    
+}
+
+#pragma mark - GetMethod   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+// 拍摄视图
+- (UIView *)captureView {
+    
+    if (!_captureView) {
+        _captureView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, self.view.bounds.size.width, self.view.bounds.size.height)];
+        _captureView.backgroundColor = [UIColor blackColor];
+    }
+    return _captureView;
+}
+
+
+#pragma mark - UIButton Action  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+// 开始推流
+- (void)startCapture:(UIButton *)button {
+    
+    button.selected = !button.selected;
+    
+    if (button.selected) {
+        [_kitCN startStream:^{
+            NSLog(@"开启推流成功 ------- success");
+        } failure:^(NSDictionary *errorDic) {
+            [self toast:errorDic[@"errorMessage"]];
+            _startLiveBtn.selected = NO;
+        }];
+    }else{
+//        _stateLab.text = nil;
+        [_kitCN stopStream];
+    }
+}
+
+// 开始 / 关闭 预览
+- (void)startPreview:(UIButton *)button {
+    
+    button.selected = !button.selected;
+    if (button.selected) {
+        _startLiveBtn.enabled = NO;
+        [button setTitle:@"开启预览" forState:UIControlStateNormal];
+        if (_kitCN.streamState == CNLiveStreamStateConnected) {
+            [_kitCN stopStream];
+            _startLiveBtn.selected = NO;
+        }
+        [_kitCN stopPreview];
+    }else{
+        [_kitCN startPreview:self.captureView];
+        [button setTitle:@"关闭预览" forState:UIControlStateNormal];
+        _startLiveBtn.enabled = YES;
+    }
+}
+
+// 退出
+- (void)closeBtnClivk {
+    
+    if (_kitCN.streamState == CNLiveStreamStateConnected) {
+        [_kitCN stopStream];
+    }
+    if (_kitCN.captureState == CNLiveCaptureStateCapturing) {
+        [_kitCN stopPreview];
+    }
+    
     [self dismissViewControllerAnimated:YES completion:nil];
 }
  
-- (void)didReceiveMemoryWarning {
-    [super didReceiveMemoryWarning];
-    // Dispose of any resources that can be recreated.
+
+#pragma mark - UIGestureRecognizer Action !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+//对焦与曝光
+- (void)onTap:(UIGestureRecognizer *)sender
+{
+    CGPoint current = [sender locationInView:self.view];
+    CGPoint point = [self convertToPointOfInterestFromViewCoordinates:current];
+    [_kitCN exposureAtPoint:point];
+    [_kitCN focusAtPoint:point];
+}
+
+//缩放
+- (void)pinchDetected:(UIPinchGestureRecognizer *)recognizer{
+    if (recognizer.state == UIGestureRecognizerStateBegan) {
+        _currentPinchZoomFactor = _kitCN.pinchZoomFactor;
+    }
+    CGFloat zoomFactor = _currentPinchZoomFactor * recognizer.scale;//当前触摸缩放因子*坐标比例
+    [_kitCN setPinchZoomFactor:zoomFactor];
 }
  
-/*
-#pragma mark - Navigation
+#pragma mark - notification  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+// 进入后台
+- (void)enterBg {
+    
+    [_kitCN appEnterBackground];
+}
+// 回到前台
+- (void)becameActive {
+    
+    [_kitCN appBecomeActive];
+}
+// 拍摄状态改变
+- (void)captureStateChange {
+    
+    if ( _kitCN.captureState == CNLiveCaptureStateIdle){
+        //初始化时状态为空闲
+//        _stateLab.text = @"CNLiveCaptureStateIdle";
+        
+        return;
+    }
+    else if (_kitCN.captureState == CNLiveCaptureStateCapturing ) {
+        //设备工作中
+//        _stateLab.text = @"CNLiveCaptureStateCapturing";
+        
+        return;
+    }
+    else if (_kitCN.captureState == CNLiveCaptureStateClosingCapture ) {
+        //关闭采集设备中
+//        _stateLab.text = @"CNLiveCaptureStateClosingCapture";
+        
+        return;
+    }
+    else if (_kitCN.captureState == CNLiveCaptureStateDevAuthDenied ) {
+        //设备授权被拒绝
+        NSLog(@"---------CNLiveCaptureStateDevAuthDenied");
+//        _stateLab.text = @"camera/mic Authorization Denied";
+        
+        return;
+    }
+    else if (_kitCN.captureState == CNLiveCaptureStateParameterError ) {
+        // 参数错误，无法打开
+        NSLog(@"---------CNLiveCaptureStateParameterError");
+//        _stateLab.text = @"capture devices ParameterError";
+        
+        return;
+    }
+    else if (_kitCN.captureState == CNLiveCaptureStateDevBusy ) {
+        //设备正忙，请稍后尝试
+        NSLog(@"---------CNLiveCaptureStateDevBusy");
+//        _stateLab.text = @"device busy, try later";
+        
+    }
+}
+// 推流状态改变
+- (void)streamStateChange {
+    
+    if (_kitCN.streamState == CNLiveStreamStateIdle) {
+        
+        NSLog(@"---------CNLiveStreamStateIdle");
+//        _stateLab.text = @"CNLiveStreamStateIdle";
+    }
+    
+    if (_kitCN.streamState == CNLiveStreamStateConnected) {
+        
+        NSLog(@"---------CNLiveStreamStateConnected");
+//        _stateLab.text = [NSString stringWithFormat:@"CNLiveStreamStateConnected------%@",_hostURL];
+    }
+    
+    if (_kitCN.streamState == CNLiveStreamStateConnecting) {
+        
+        NSLog(@"---------CNLiveStreamStateConnecting");
+//        _stateLab.text = @"CNLiveStreamStateConnecting";
+    }
+    
+    //推流出错
+    if (_kitCN.streamState == CNLiveStreamStateError) {
+        
+        NSLog(@"---------CNLiveStreamStateError");
+        [self onStreamError];
+    }
+    
+    //断开推流
+    if ( _kitCN.streamState == CNLiveStreamStateDisconnecting) {
+        
+        NSLog(@"---------CNLiveStreamStateDisconnecting");
+//        _stateLab.text = @"CNLiveStreamStateDisconnecting";
+    }
+    
+    //结束推流成功
+    if ( _kitCN.streamState == CNLiveStopStreamSuccess) {
+        
+        NSLog(@"---------CNLiveStopStreamSuccess");
+//        _stateLab.text = @"CNLiveStopStreamSuccess";
+    }
+}
+// 推流失败
+- (void)onStreamError {
+    
+    CNLiveStreamErrorCode err = _kitCN.streamErrorCode;
+    
+    NSLog(@"onErr: %lu ", (unsigned long) err);
+    
+    if ( CNLiveStreamErrorCode_CNLiveAUTHFAILED == err ) {
+//        _stateLab.text = @"SDK auth failed, \npls check ak/sk";
+    }
+    else if ( CNLiveStreamErrorCode_CODEC_OPEN_FAILED == err) {
+//        _stateLab.text = @"Selected Codec not supported \n in this version";
+    }
+    else if ( CNLiveStreamErrorCode_CONNECT_FAILED == err) {
+//        _stateLab.text = @"Connecting error, pls check host url \nor network";
+    }
+    else if ( CNLiveStreamErrorCode_CONNECT_BREAK == err) {
+//        _stateLab.text = @"Connection break";
+    }
+    else if ( CNLiveStreamErrorCode_ABNORMAL == err) {
+//        _stateLab.text = @"CNLiveStreamErrorCode_ABNORMAL";
+        [self toast:@"推流异常中断~~"];
+        _startLiveBtn.selected = NO;
+        
+    } else if (err == CNLiveStreamErrorCode_CODEC_OPEN_FAILED) {
+        NSLog(@"video codec open failed, try software codec");
+        // 换个编码类型重新尝试
+        _kitCN.streamerBase.videoCodec = CNLiveVideoCodec_VT264;
+        [self tryReconnect];
+    }
+    else {
+        
+    }
+    
+    // 断网重连
+    if (err == CNLiveStreamErrorCode_CONNECT_BREAK || err == CNLiveStreamErrorCode_AV_SYNC_ERROR) {
+        [self tryReconnect];
+    }
+    
+}
  
-// 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.
+// 重试
+- (void) tryReconnect {
+    
+    dispatch_time_t delay = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC));
+    dispatch_after(delay, dispatch_get_main_queue(), ^{
+        
+        NSLog(@"try again");
+        
+        [_kitCN stopStream];
+        
+        [_kitCN startStream:^{
+            NSLog(@"开启推流成功 ------- success");
+            _startLiveBtn.selected = YES;
+            
+        } failure:^(NSDictionary *errorDic) {
+            [self toast:errorDic[@"errorMessage"]];
+            _startLiveBtn.selected = NO;
+        }];
+        
+    });
+}
+
+// 提示框
+- (void)toast:(NSString*)message
+{
+    
+    UIAlertView *toast = [[UIAlertView alloc] initWithTitle:nil
+                                                    message:message
+                                                   delegate:nil
+                                          cancelButtonTitle:nil
+                                          otherButtonTitles:nil, nil];
+    [toast show];
+    double duration = 2.5;
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(duration * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        [toast dismissWithClickedButtonIndex:0 animated:NO];
+    });
+}
+
+
+// 将UI的坐标转换成相机坐标
+- (CGPoint)convertToPointOfInterestFromViewCoordinates:(CGPoint)viewCoordinates
+{
+    CGPoint pointOfInterest = CGPointMake(.5f, .5f);
+    CGSize frameSize = self.view.frame.size;
+    CGSize apertureSize = [_kitCN captureDimension];
+    CGPoint point = viewCoordinates;
+    CGFloat apertureRatio = apertureSize.height / apertureSize.width;
+    CGFloat viewRatio = frameSize.width / frameSize.height;
+    CGFloat xc = .5f;
+    CGFloat yc = .5f;
+    
+    if (viewRatio > apertureRatio) {
+        CGFloat y2 = frameSize.height;
+        CGFloat x2 = frameSize.height * apertureRatio;
+        CGFloat x1 = frameSize.width;
+        CGFloat blackBar = (x1 - x2) / 2;
+        if (point.x >= blackBar && point.x <= blackBar + x2) {
+            xc = point.y / y2;
+            yc = 1.f - ((point.x - blackBar) / x2);
+        }
+    }else {
+        CGFloat y2 = frameSize.width / apertureRatio;
+        CGFloat y1 = frameSize.height;
+        CGFloat x2 = frameSize.width;
+        CGFloat blackBar = (y1 - y2) / 2;
+        if (point.y >= blackBar && point.y <= blackBar + y2) {
+            xc = ((point.y - blackBar) / y2);
+            yc = 1.f - (point.x / x2);
+        }
+    }
+    pointOfInterest = CGPointMake(xc, yc);
+    return pointOfInterest;
+}
+
+#pragma mark - Action !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+- (void)addObservers {
+    
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(captureStateChange) name:CNLiveCaptureStateDidChangeNotification object:nil];
+    
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(streamStateChange)
+                                                 name:CNLiveStreamStateDidChangeNotification
+                                               object:nil];
+    
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(enterBg)
+                                                 name:UIApplicationDidEnterBackgroundNotification
+                                               object:nil];
+    
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(becameActive)
+                                                 name:UIApplicationDidBecomeActiveNotification
+                                               object:nil];
+}
+
+- (UIButton *)addButton:(NSString*)title
+                  frame:(CGRect)frame
+                 action:(SEL)action {
+    UIButton * button;
+    button = [UIButton buttonWithType:UIButtonTypeCustom];
+    button.frame = frame;
+    [button setTitle: title forState: UIControlStateNormal];
+    [button addTarget:self action:action forControlEvents:UIControlEventTouchUpInside];
+    button.titleLabel.font = [UIFont systemFontOfSize:15];
+    [button setTitleColor:[UIColor colorWithRed:23/255.0 green:110/255.0 blue:254/255.0 alpha:1] forState:UIControlStateNormal];
+    button.layer.cornerRadius = 10;
+    button.layer.masksToBounds = YES;
+    button.layer.borderColor = [UIColor blackColor].CGColor;
+    button.layer.borderWidth = 1;
+    [self.captureView addSubview:button];
+    return button;
+    
+}
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
 }
-*/
  
 @end
@@ -17,6 +17,10 @@
 #define SCREEN_HEIGHT [ZXDeviceInfo mainScreenHeight]
 #endif
  
+#ifndef SCREEN_RECT
+#define SCREEN_RECT CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT)
+#endif
+
 @interface ZXDeviceInfo : NSObject
  
 /**
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "filename" : "Click on the comment.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Close the open.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "filename" : "LiveChatGiftNormal.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "filename" : "LiveChatGiftTouch.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "filename" : "LiveChatNormal.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "filename" : "LiveChatTouch.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "filename" : "LiveCloseNormal.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "filename" : "LiveCloseTouch.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "filename" : "comments.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "1 2.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" : "bottom_shadow.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",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "dot@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "fullscreen@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "nonfullscreen@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "pause@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "play@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "play_back.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" : "top_shadow.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",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "返回@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file