iOS Team / CNLivePlayerStreamerSDKDemo · Commits

Commit 290d59441dcb99618a4ca62e558196fd752d73f3

Authored by 朱林
1 parent 0502f728

no message

Inline Side-by-side
Showing 2 changed files with 48 additions and 20 deletions
CNLivePlayerSDKTest/CNLivePlayerSDKTest.xcodeproj/project.pbxproj
  View file @290d594
... ... @@ -7,30 +7,37 @@
7 7 objects = {
8 8  
9 9 /* Begin PBXBuildFile section */
10   - 3238FD4F1DFABEEE00377CA4 /* CNLivePlayerSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3238FD4E1DFABEEE00377CA4 /* CNLivePlayerSDK.framework */; };
11   - 3238FD511DFABEF100377CA4 /* CNLivePlayerSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3238FD4E1DFABEEE00377CA4 /* CNLivePlayerSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
12 10 32B4C85A1D9B66A400925AF0 /* CNLiveViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 32B4C8591D9B66A400925AF0 /* CNLiveViewController.m */; };
13 11 32B4C85D1D9B66E500925AF0 /* StreamerDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 32B4C85C1D9B66E500925AF0 /* StreamerDetailViewController.m */; };
14 12 32E6CA2B1D5B0AF400B58EBC /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 32E6CA2A1D5B0AF400B58EBC /* main.m */; };
15 13 32E6CA2E1D5B0AF400B58EBC /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 32E6CA2D1D5B0AF400B58EBC /* AppDelegate.m */; };
16 14 32E6CA311D5B0AF400B58EBC /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 32E6CA301D5B0AF400B58EBC /* ViewController.m */; };
17 15 32E6CA341D5B0AF400B58EBC /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 32E6CA321D5B0AF400B58EBC /* Main.storyboard */; };
18   - 32E6CA361D5B0AF400B58EBC /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 32E6CA351D5B0AF400B58EBC /* Assets.xcassets */; };
19 16 32E6CA391D5B0AF400B58EBC /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 32E6CA371D5B0AF400B58EBC /* LaunchScreen.storyboard */; };
20 17 32E6CA901D5B2AF700B58EBC /* BarrageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 32E6CA831D5B2AF700B58EBC /* BarrageViewController.m */; };
21   - 32E6CA921D5B2AF700B58EBC /* NormalViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 32E6CA881D5B2AF700B58EBC /* NormalViewController.m */; };
22 18 32E6CA931D5B2AF700B58EBC /* PlayerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 32E6CA8A1D5B2AF700B58EBC /* PlayerViewController.m */; };
23 19 32E6CA951D5B2AF700B58EBC /* StreamerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 32E6CA8F1D5B2AF700B58EBC /* StreamerViewController.m */; };
  20 + 8133FA351E71428800FBFE95 /* BackgroundView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8133FA341E71428800FBFE95 /* BackgroundView.m */; };
  21 + 8133FA391E71454C00FBFE95 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8133FA381E71454C00FBFE95 /* Assets.xcassets */; };
  22 + 813916061E70069300C55553 /* LoadingView.m in Sources */ = {isa = PBXBuildFile; fileRef = 813916051E70069300C55553 /* LoadingView.m */; };
  23 + 8139160B1E7006B800C55553 /* FilterFunctionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 813916081E7006B800C55553 /* FilterFunctionView.m */; };
  24 + 8139160C1E7006B800C55553 /* SliderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8139160A1E7006B800C55553 /* SliderView.m */; };
  25 + 813916191E70085A00C55553 /* KSYGPUResource.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 813916181E70085A00C55553 /* KSYGPUResource.bundle */; };
  26 + 813916211E70114D00C55553 /* CNLivePlayerSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8139161F1E70113800C55553 /* CNLivePlayerSDK.framework */; };
  27 + 813916221E70114D00C55553 /* CNLivePlayerSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 8139161F1E70113800C55553 /* CNLivePlayerSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
  28 + 814283681E73F59B0035D5A6 /* CNLiveMsgTools.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 814283671E73F59B0035D5A6 /* CNLiveMsgTools.framework */; };
  29 + 8142836A1E73F5A30035D5A6 /* CNLiveMsgTools.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 814283671E73F59B0035D5A6 /* CNLiveMsgTools.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
24 30 /* End PBXBuildFile section */
25 31  
26 32 /* Begin PBXCopyFilesBuildPhase section */
27   - 32ADA40E1DF91D5800B4585A /* Embed Frameworks */ = {
  33 + 813916231E70114D00C55553 /* Embed Frameworks */ = {
28 34 isa = PBXCopyFilesBuildPhase;
29 35 buildActionMask = 2147483647;
30 36 dstPath = "";
31 37 dstSubfolderSpec = 10;
32 38 files = (
33   - 3238FD511DFABEF100377CA4 /* CNLivePlayerSDK.framework in Embed Frameworks */,
  39 + 813916221E70114D00C55553 /* CNLivePlayerSDK.framework in Embed Frameworks */,
  40 + 8142836A1E73F5A30035D5A6 /* CNLiveMsgTools.framework in Embed Frameworks */,
34 41 );
35 42 name = "Embed Frameworks";
36 43 runOnlyForDeploymentPostprocessing = 0;
... ... @@ -38,7 +45,6 @@
38 45 /* End PBXCopyFilesBuildPhase section */
39 46  
40 47 /* Begin PBXFileReference section */
41   - 3238FD4E1DFABEEE00377CA4 /* CNLivePlayerSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLivePlayerSDK.framework; sourceTree = "<group>"; };
42 48 32B4C8581D9B66A400925AF0 /* CNLiveViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNLiveViewController.h; sourceTree = "<group>"; };
43 49 32B4C8591D9B66A400925AF0 /* CNLiveViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNLiveViewController.m; sourceTree = "<group>"; };
44 50 32B4C85B1D9B66E500925AF0 /* StreamerDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StreamerDetailViewController.h; sourceTree = "<group>"; };
... ... @@ -50,17 +56,26 @@
50 56 32E6CA2F1D5B0AF400B58EBC /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
51 57 32E6CA301D5B0AF400B58EBC /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
52 58 32E6CA331D5B0AF400B58EBC /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
53   - 32E6CA351D5B0AF400B58EBC /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
54 59 32E6CA381D5B0AF400B58EBC /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
55 60 32E6CA3A1D5B0AF400B58EBC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
56 61 32E6CA821D5B2AF700B58EBC /* BarrageViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BarrageViewController.h; sourceTree = "<group>"; };
57 62 32E6CA831D5B2AF700B58EBC /* BarrageViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BarrageViewController.m; sourceTree = "<group>"; };
58   - 32E6CA871D5B2AF700B58EBC /* NormalViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NormalViewController.h; sourceTree = "<group>"; };
59   - 32E6CA881D5B2AF700B58EBC /* NormalViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NormalViewController.m; sourceTree = "<group>"; };
60 63 32E6CA891D5B2AF700B58EBC /* PlayerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlayerViewController.h; sourceTree = "<group>"; };
61 64 32E6CA8A1D5B2AF700B58EBC /* PlayerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PlayerViewController.m; sourceTree = "<group>"; };
62 65 32E6CA8E1D5B2AF700B58EBC /* StreamerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StreamerViewController.h; sourceTree = "<group>"; };
63 66 32E6CA8F1D5B2AF700B58EBC /* StreamerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StreamerViewController.m; sourceTree = "<group>"; };
  67 + 8133FA331E71428800FBFE95 /* BackgroundView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BackgroundView.h; sourceTree = "<group>"; };
  68 + 8133FA341E71428800FBFE95 /* BackgroundView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BackgroundView.m; sourceTree = "<group>"; };
  69 + 8133FA381E71454C00FBFE95 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
  70 + 813916041E70069300C55553 /* LoadingView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoadingView.h; sourceTree = "<group>"; };
  71 + 813916051E70069300C55553 /* LoadingView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoadingView.m; sourceTree = "<group>"; };
  72 + 813916071E7006B800C55553 /* FilterFunctionView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FilterFunctionView.h; sourceTree = "<group>"; };
  73 + 813916081E7006B800C55553 /* FilterFunctionView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FilterFunctionView.m; sourceTree = "<group>"; };
  74 + 813916091E7006B800C55553 /* SliderView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SliderView.h; sourceTree = "<group>"; };
  75 + 8139160A1E7006B800C55553 /* SliderView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SliderView.m; sourceTree = "<group>"; };
  76 + 813916181E70085A00C55553 /* KSYGPUResource.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = KSYGPUResource.bundle; sourceTree = "<group>"; };
  77 + 8139161F1E70113800C55553 /* CNLivePlayerSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLivePlayerSDK.framework; sourceTree = "<group>"; };
  78 + 814283671E73F59B0035D5A6 /* CNLiveMsgTools.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveMsgTools.framework; sourceTree = "<group>"; };
64 79 /* End PBXFileReference section */
65 80  
66 81 /* Begin PBXFrameworksBuildPhase section */
... ... @@ -68,7 +83,8 @@
68 83 isa = PBXFrameworksBuildPhase;
69 84 buildActionMask = 2147483647;
70 85 files = (
71   - 3238FD4F1DFABEEE00377CA4 /* CNLivePlayerSDK.framework in Frameworks */,
  86 + 813916211E70114D00C55553 /* CNLivePlayerSDK.framework in Frameworks */,
  87 + 814283681E73F59B0035D5A6 /* CNLiveMsgTools.framework in Frameworks */,
72 88 );
73 89 runOnlyForDeploymentPostprocessing = 0;
74 90 };
... ... @@ -78,7 +94,9 @@
78 94 32E6CA1D1D5B0AF400B58EBC = {
79 95 isa = PBXGroup;
80 96 children = (
81   - 3238FD4E1DFABEEE00377CA4 /* CNLivePlayerSDK.framework */,
  97 + 814283671E73F59B0035D5A6 /* CNLiveMsgTools.framework */,
  98 + 813916181E70085A00C55553 /* KSYGPUResource.bundle */,
  99 + 8139161F1E70113800C55553 /* CNLivePlayerSDK.framework */,
82 100 32E6CA281D5B0AF400B58EBC /* CNLivePlayerSDKTest */,
83 101 32E6CA271D5B0AF400B58EBC /* Products */,
84 102 );
... ... @@ -103,7 +121,7 @@
103 121 32E6CA2F1D5B0AF400B58EBC /* ViewController.h */,
104 122 32E6CA301D5B0AF400B58EBC /* ViewController.m */,
105 123 32E6CA321D5B0AF400B58EBC /* Main.storyboard */,
106   - 32E6CA351D5B0AF400B58EBC /* Assets.xcassets */,
  124 + 8133FA381E71454C00FBFE95 /* Assets.xcassets */,
107 125 32E6CA371D5B0AF400B58EBC /* LaunchScreen.storyboard */,
108 126 32E6CA3A1D5B0AF400B58EBC /* Info.plist */,
109 127 32E6CA291D5B0AF400B58EBC /* Supporting Files */,
... ... @@ -133,10 +151,12 @@
133 151 children = (
134 152 32B4C8581D9B66A400925AF0 /* CNLiveViewController.h */,
135 153 32B4C8591D9B66A400925AF0 /* CNLiveViewController.m */,
136   - 32E6CA871D5B2AF700B58EBC /* NormalViewController.h */,
137   - 32E6CA881D5B2AF700B58EBC /* NormalViewController.m */,
138 154 32E6CA891D5B2AF700B58EBC /* PlayerViewController.h */,
139 155 32E6CA8A1D5B2AF700B58EBC /* PlayerViewController.m */,
  156 + 813916041E70069300C55553 /* LoadingView.h */,
  157 + 813916051E70069300C55553 /* LoadingView.m */,
  158 + 8133FA331E71428800FBFE95 /* BackgroundView.h */,
  159 + 8133FA341E71428800FBFE95 /* BackgroundView.m */,
140 160 );
141 161 path = Player;
142 162 sourceTree = "<group>";
... ... @@ -148,6 +168,10 @@
148 168 32B4C85C1D9B66E500925AF0 /* StreamerDetailViewController.m */,
149 169 32E6CA8E1D5B2AF700B58EBC /* StreamerViewController.h */,
150 170 32E6CA8F1D5B2AF700B58EBC /* StreamerViewController.m */,
  171 + 813916071E7006B800C55553 /* FilterFunctionView.h */,
  172 + 813916081E7006B800C55553 /* FilterFunctionView.m */,
  173 + 813916091E7006B800C55553 /* SliderView.h */,
  174 + 8139160A1E7006B800C55553 /* SliderView.m */,
151 175 );
152 176 path = Streamer;
153 177 sourceTree = "<group>";
... ... @@ -162,7 +186,7 @@
162 186 32E6CA221D5B0AF400B58EBC /* Sources */,
163 187 32E6CA231D5B0AF400B58EBC /* Frameworks */,
164 188 32E6CA241D5B0AF400B58EBC /* Resources */,
165   - 32ADA40E1DF91D5800B4585A /* Embed Frameworks */,
  189 + 813916231E70114D00C55553 /* Embed Frameworks */,
166 190 );
167 191 buildRules = (
168 192 );
... ... @@ -211,8 +235,9 @@
211 235 isa = PBXResourcesBuildPhase;
212 236 buildActionMask = 2147483647;
213 237 files = (
  238 + 813916191E70085A00C55553 /* KSYGPUResource.bundle in Resources */,
214 239 32E6CA391D5B0AF400B58EBC /* LaunchScreen.storyboard in Resources */,
215   - 32E6CA361D5B0AF400B58EBC /* Assets.xcassets in Resources */,
  240 + 8133FA391E71454C00FBFE95 /* Assets.xcassets in Resources */,
216 241 32E6CA341D5B0AF400B58EBC /* Main.storyboard in Resources */,
217 242 );
218 243 runOnlyForDeploymentPostprocessing = 0;
... ... @@ -225,14 +250,17 @@
225 250 buildActionMask = 2147483647;
226 251 files = (
227 252 32E6CA931D5B2AF700B58EBC /* PlayerViewController.m in Sources */,
  253 + 8139160C1E7006B800C55553 /* SliderView.m in Sources */,
  254 + 813916061E70069300C55553 /* LoadingView.m in Sources */,
228 255 32E6CA311D5B0AF400B58EBC /* ViewController.m in Sources */,
  256 + 8139160B1E7006B800C55553 /* FilterFunctionView.m in Sources */,
229 257 32E6CA951D5B2AF700B58EBC /* StreamerViewController.m in Sources */,
230 258 32E6CA901D5B2AF700B58EBC /* BarrageViewController.m in Sources */,
231 259 32B4C85D1D9B66E500925AF0 /* StreamerDetailViewController.m in Sources */,
  260 + 8133FA351E71428800FBFE95 /* BackgroundView.m in Sources */,
232 261 32B4C85A1D9B66A400925AF0 /* CNLiveViewController.m in Sources */,
233 262 32E6CA2E1D5B0AF400B58EBC /* AppDelegate.m in Sources */,
234 263 32E6CA2B1D5B0AF400B58EBC /* main.m in Sources */,
235   - 32E6CA921D5B2AF700B58EBC /* NormalViewController.m in Sources */,
236 264 );
237 265 runOnlyForDeploymentPostprocessing = 0;
238 266 };
... ... @@ -354,7 +382,7 @@
354 382 INFOPLIST_FILE = CNLivePlayerSDKTest/Info.plist;
355 383 IPHONEOS_DEPLOYMENT_TARGET = 8.0;
356 384 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
357   - PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.libs;
  385 + PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.video;
358 386 PRODUCT_NAME = "$(TARGET_NAME)";
359 387 };
360 388 name = Debug;
... ... @@ -373,7 +401,7 @@
373 401 INFOPLIST_FILE = CNLivePlayerSDKTest/Info.plist;
374 402 IPHONEOS_DEPLOYMENT_TARGET = 8.0;
375 403 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
376   - PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.libs;
  404 + PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.video;
377 405 PRODUCT_NAME = "$(TARGET_NAME)";
378 406 };
379 407 name = Release;
... ...
CNLivePlayerSDKTest/CNLivePlayerSDKTest.xcodeproj/project.xcworkspace/xcuserdata/iOS.xcuserdatad/UserInterfaceState.xcuserstate
View file @290d594
No preview for this file type