iOS Team / CNLiveAVCamera · Commits

Commit 5b96273774b82cd6b5ee10f77b9cc30699a8a75d

Authored by 梁星国
1 parent 527037fc

提交0.1.1

Inline Side-by-side
Showing 30 changed files with 189 additions and 9 deletions
CNLiveAVCamera.podspec
  View file @5b96273
... ... @@ -8,8 +8,8 @@
8 8  
9 9 Pod::Spec.new do |s|
10 10 s.name = 'CNLiveAVCamera'
11   - s.version = '0.1.0'
12   - s.summary = 'A short description of CNLiveAVCamera.'
  11 + s.version = '0.1.1'
  12 + s.summary = '常用相机'
13 13  
14 14 # This description is used to generate tags and improve search results.
15 15 # * Think: What does it do? Why did you write it? What is the focus?
... ... @@ -21,16 +21,22 @@ Pod::Spec.new do |s|
21 21 TODO: Add long description of the pod here.
22 22 DESC
23 23  
24   - s.homepage = 'https://github.com/jyyjkt/CNLiveAVCamera'
  24 + s.homepage = 'http://bj.gitlab.cnlive.com/ios-team/CNLiveRepos.git'
25 25 # s.screenshots = 'www.example.com/screenshots_1', 'www.example.com/screenshots_2'
26 26 s.license = { :type => 'MIT', :file => 'LICENSE' }
27 27 s.author = { 'jyyjkt' => 'jyyjkt@qq.com' }
28   - s.source = { :git => 'https://github.com/jyyjkt/CNLiveAVCamera.git', :tag => s.version.to_s }
  28 + s.source = { :git => 'http://bj.gitlab.cnlive.com/ios-team/CNLiveAVCamera.git', :tag => s.version.to_s }
29 29 # s.social_media_url = 'https://twitter.com/<TWITTER_USERNAME>'
30 30  
31   - s.ios.deployment_target = '8.0'
  31 + s.ios.deployment_target = '9.0'
32 32  
33   - s.source_files = 'CNLiveAVCamera/Classes/**/*'
  33 + s.source_files = 'CNLiveAVCamera/Classes/XFAVCamera/*.{h,m}'
  34 +
  35 + s.resource_bundles = {
  36 + 'CNLiveAVCamera' => ['CNLiveAVCamera/Assets/Media.xcassets']
  37 + }
  38 + s.frameworks = 'UIKit', 'Photos'
  39 + s.dependency 'Masonry', '~> 1.0.2'
34 40  
35 41 # s.resource_bundles = {
36 42 # 'CNLiveAVCamera' => ['CNLiveAVCamera/Assets/*.png']
... ...
CNLiveAVCamera/Assets/Media.xcassets/Contents.json 0 → 100644
  View file @5b96273
  1 +{
  2 + "info" : {
  3 + "version" : 1,
  4 + "author" : "xcode"
  5 + }
  6 +}
0 7 \ No newline at end of file
... ...
CNLiveAVCamera/Assets/Media.xcassets/fb_chongpai.imageset/Contents.json 0 → 100644
  View file @5b96273
  1 +{
  2 + "images" : [
  3 + {
  4 + "idiom" : "universal",
  5 + "filename" : "fb_chongpai.png",
  6 + "scale" : "1x"
  7 + },
  8 + {
  9 + "idiom" : "universal",
  10 + "filename" : "fb_chongpai@2x.png",
  11 + "scale" : "2x"
  12 + },
  13 + {
  14 + "idiom" : "universal",
  15 + "filename" : "fb_chongpai@3x.png",
  16 + "scale" : "3x"
  17 + }
  18 + ],
  19 + "info" : {
  20 + "version" : 1,
  21 + "author" : "xcode"
  22 + }
  23 +}
0 24 \ No newline at end of file
... ...
CNLiveAVCamera/Assets/Media.xcassets/fb_chongpai.imageset/fb_chongpai.png 0 → 100644
View file @5b96273

1.98 KB
CNLiveAVCamera/Assets/Media.xcassets/fb_chongpai.imageset/fb_chongpai@2x.png 0 → 100644
View file @5b96273

3.38 KB
CNLiveAVCamera/Assets/Media.xcassets/fb_chongpai.imageset/fb_chongpai@3x.png 0 → 100644
View file @5b96273

4.87 KB
CNLiveAVCamera/Assets/Media.xcassets/fb_quxiaoxia.imageset/Contents.json 0 → 100644
  View file @5b96273
  1 +{
  2 + "images" : [
  3 + {
  4 + "idiom" : "universal",
  5 + "filename" : "fb_quxiaoxia.png",
  6 + "scale" : "1x"
  7 + },
  8 + {
  9 + "idiom" : "universal",
  10 + "filename" : "fb_quxiaoxia@2x.png",
  11 + "scale" : "2x"
  12 + },
  13 + {
  14 + "idiom" : "universal",
  15 + "filename" : "fb_quxiaoxia@3x.png",
  16 + "scale" : "3x"
  17 + }
  18 + ],
  19 + "info" : {
  20 + "version" : 1,
  21 + "author" : "xcode"
  22 + }
  23 +}
0 24 \ No newline at end of file
... ...
CNLiveAVCamera/Assets/Media.xcassets/fb_quxiaoxia.imageset/fb_quxiaoxia.png 0 → 100644
View file @5b96273

1.26 KB
CNLiveAVCamera/Assets/Media.xcassets/fb_quxiaoxia.imageset/fb_quxiaoxia@2x.png 0 → 100644
View file @5b96273

1.68 KB
CNLiveAVCamera/Assets/Media.xcassets/fb_quxiaoxia.imageset/fb_quxiaoxia@3x.png 0 → 100644
View file @5b96273

1.96 KB
CNLiveAVCamera/Assets/Media.xcassets/fb_wancheng.imageset/Contents.json 0 → 100644
  View file @5b96273
  1 +{
  2 + "images" : [
  3 + {
  4 + "idiom" : "universal",
  5 + "filename" : "fb_wancheng.png",
  6 + "scale" : "1x"
  7 + },
  8 + {
  9 + "idiom" : "universal",
  10 + "filename" : "fb_wancheng@2x.png",
  11 + "scale" : "2x"
  12 + },
  13 + {
  14 + "idiom" : "universal",
  15 + "filename" : "fb_wancheng@3x.png",
  16 + "scale" : "3x"
  17 + }
  18 + ],
  19 + "info" : {
  20 + "version" : 1,
  21 + "author" : "xcode"
  22 + }
  23 +}
0 24 \ No newline at end of file
... ...
CNLiveAVCamera/Assets/Media.xcassets/fb_wancheng.imageset/fb_wancheng.png 0 → 100644
View file @5b96273

1.97 KB
CNLiveAVCamera/Assets/Media.xcassets/fb_wancheng.imageset/fb_wancheng@2x.png 0 → 100644
View file @5b96273

3.46 KB
CNLiveAVCamera/Assets/Media.xcassets/fb_wancheng.imageset/fb_wancheng@3x.png 0 → 100644
View file @5b96273

5.08 KB
CNLiveAVCamera/Assets/Media.xcassets/fb_xiangji.imageset/Contents.json 0 → 100644
  View file @5b96273
  1 +{
  2 + "images" : [
  3 + {
  4 + "idiom" : "universal",
  5 + "filename" : "fb_xiangji.png",
  6 + "scale" : "1x"
  7 + },
  8 + {
  9 + "idiom" : "universal",
  10 + "filename" : "fb_xiangji@2x.png",
  11 + "scale" : "2x"
  12 + },
  13 + {
  14 + "idiom" : "universal",
  15 + "filename" : "fb_xiangji@3x.png",
  16 + "scale" : "3x"
  17 + }
  18 + ],
  19 + "info" : {
  20 + "version" : 1,
  21 + "author" : "xcode"
  22 + }
  23 +}
0 24 \ No newline at end of file
... ...
CNLiveAVCamera/Assets/Media.xcassets/fb_xiangji.imageset/fb_xiangji.png 0 → 100644
View file @5b96273

1.32 KB
CNLiveAVCamera/Assets/Media.xcassets/fb_xiangji.imageset/fb_xiangji@2x.png 0 → 100644
View file @5b96273

1.68 KB
CNLiveAVCamera/Assets/Media.xcassets/fb_xiangji.imageset/fb_xiangji@3x.png 0 → 100644
View file @5b96273

2.27 KB
CNLiveAVCamera/Assets/Media.xcassets/gz_shoudian.imageset/Contents.json 0 → 100644
  View file @5b96273
  1 +{
  2 + "images" : [
  3 + {
  4 + "idiom" : "universal",
  5 + "filename" : "gz_shoudian.png",
  6 + "scale" : "1x"
  7 + },
  8 + {
  9 + "idiom" : "universal",
  10 + "filename" : "gz_shoudian@2x.png",
  11 + "scale" : "2x"
  12 + },
  13 + {
  14 + "idiom" : "universal",
  15 + "filename" : "gz_shoudian@3x.png",
  16 + "scale" : "3x"
  17 + }
  18 + ],
  19 + "info" : {
  20 + "version" : 1,
  21 + "author" : "xcode"
  22 + }
  23 +}
0 24 \ No newline at end of file
... ...
CNLiveAVCamera/Assets/Media.xcassets/gz_shoudian.imageset/gz_shoudian.png 0 → 100644
View file @5b96273

1.11 KB
CNLiveAVCamera/Assets/Media.xcassets/gz_shoudian.imageset/gz_shoudian@2x.png 0 → 100644
View file @5b96273

1.29 KB
CNLiveAVCamera/Assets/Media.xcassets/gz_shoudian.imageset/gz_shoudian@3x.png 0 → 100644
View file @5b96273

1.41 KB
CNLiveAVCamera/Assets/Media.xcassets/gz_shoudian2.imageset/Contents.json 0 → 100644
  View file @5b96273
  1 +{
  2 + "images" : [
  3 + {
  4 + "idiom" : "universal",
  5 + "filename" : "gz_shoudian2.png",
  6 + "scale" : "1x"
  7 + },
  8 + {
  9 + "idiom" : "universal",
  10 + "filename" : "gz_shoudian2@2x.png",
  11 + "scale" : "2x"
  12 + },
  13 + {
  14 + "idiom" : "universal",
  15 + "filename" : "gz_shoudian2@3x.png",
  16 + "scale" : "3x"
  17 + }
  18 + ],
  19 + "info" : {
  20 + "version" : 1,
  21 + "author" : "xcode"
  22 + }
  23 +}
0 24 \ No newline at end of file
... ...
CNLiveAVCamera/Assets/Media.xcassets/gz_shoudian2.imageset/gz_shoudian2.png 0 → 100644
View file @5b96273

1.13 KB
CNLiveAVCamera/Assets/Media.xcassets/gz_shoudian2.imageset/gz_shoudian2@2x.png 0 → 100644
View file @5b96273

1.34 KB
CNLiveAVCamera/Assets/Media.xcassets/gz_shoudian2.imageset/gz_shoudian2@3x.png 0 → 100644
View file @5b96273

1.52 KB
CNLiveAVCamera/Assets/Media.xcassets/sight_video_focus.imageset/Contents.json 0 → 100644
  View file @5b96273
  1 +{
  2 + "images" : [
  3 + {
  4 + "idiom" : "universal",
  5 + "scale" : "1x"
  6 + },
  7 + {
  8 + "idiom" : "universal",
  9 + "filename" : "sight_video_focus@2x.png",
  10 + "scale" : "2x"
  11 + },
  12 + {
  13 + "idiom" : "universal",
  14 + "filename" : "sight_video_focus@3x.png",
  15 + "scale" : "3x"
  16 + }
  17 + ],
  18 + "info" : {
  19 + "version" : 1,
  20 + "author" : "xcode"
  21 + }
  22 +}
0 23 \ No newline at end of file
... ...
CNLiveAVCamera/Assets/Media.xcassets/sight_video_focus.imageset/sight_video_focus@2x.png 0 → 100644
View file @5b96273

3.02 KB
CNLiveAVCamera/Assets/Media.xcassets/sight_video_focus.imageset/sight_video_focus@3x.png 0 → 100644
View file @5b96273

3.36 KB
Example/CNLiveAVCamera.xcodeproj/project.pbxproj
  View file @5b96273
... ... @@ -63,10 +63,10 @@
63 63 71719F9E1E33DC2100824A3D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
64 64 873B8AEA1B1F5CCA007FD442 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = Main.storyboard; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
65 65 93BF696255FE00CF6E596D8F /* Pods-CNLiveAVCamera_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CNLiveAVCamera_Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-CNLiveAVCamera_Example/Pods-CNLiveAVCamera_Example.release.xcconfig"; sourceTree = "<group>"; };
66   - 9EC6432D35122051E3EAA096 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; name = LICENSE; path = ../LICENSE; sourceTree = "<group>"; };
67   - AD6C2CD543580B3E793C7DA5 /* CNLiveAVCamera.podspec */ = {isa = PBXFileReference; includeInIndex = 1; name = CNLiveAVCamera.podspec; path = ../CNLiveAVCamera.podspec; sourceTree = "<group>"; };
  66 + 9EC6432D35122051E3EAA096 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = "<group>"; };
  67 + AD6C2CD543580B3E793C7DA5 /* CNLiveAVCamera.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = CNLiveAVCamera.podspec; path = ../CNLiveAVCamera.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
68 68 C12855D6E1B2B0DA048CAC16 /* Pods_CNLiveAVCamera_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_CNLiveAVCamera_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
69   - FA45440BB6994ACA16F686E1 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; name = README.md; path = ../README.md; sourceTree = "<group>"; };
  69 + FA45440BB6994ACA16F686E1 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
70 70 /* End PBXFileReference section */
71 71  
72 72 /* Begin PBXFrameworksBuildPhase section */
... ... @@ -247,7 +247,11 @@
247 247 LastUpgradeCheck = 0720;
248 248 ORGANIZATIONNAME = jyyjkt;
249 249 TargetAttributes = {
  250 + 6003F589195388D20070C39A = {
  251 + DevelopmentTeam = 94X49GG3ZW;
  252 + };
250 253 6003F5AD195388D20070C39A = {
  254 + DevelopmentTeam = 94X49GG3ZW;
251 255 TestTargetID = 6003F589195388D20070C39A;
252 256 };
253 257 };
... ... @@ -497,6 +501,7 @@
497 501 baseConfigurationReference = 0DEF7D98D19D939CF6521425 /* Pods-CNLiveAVCamera_Example.debug.xcconfig */;
498 502 buildSettings = {
499 503 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
  504 + DEVELOPMENT_TEAM = 94X49GG3ZW;
500 505 GCC_PRECOMPILE_PREFIX_HEADER = YES;
501 506 GCC_PREFIX_HEADER = "CNLiveAVCamera/CNLiveAVCamera-Prefix.pch";
502 507 INFOPLIST_FILE = "CNLiveAVCamera/CNLiveAVCamera-Info.plist";
... ... @@ -512,6 +517,7 @@
512 517 baseConfigurationReference = 93BF696255FE00CF6E596D8F /* Pods-CNLiveAVCamera_Example.release.xcconfig */;
513 518 buildSettings = {
514 519 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
  520 + DEVELOPMENT_TEAM = 94X49GG3ZW;
515 521 GCC_PRECOMPILE_PREFIX_HEADER = YES;
516 522 GCC_PREFIX_HEADER = "CNLiveAVCamera/CNLiveAVCamera-Prefix.pch";
517 523 INFOPLIST_FILE = "CNLiveAVCamera/CNLiveAVCamera-Info.plist";
... ... @@ -527,6 +533,7 @@
527 533 baseConfigurationReference = 084A487B8D91F2EC25B5CF39 /* Pods-CNLiveAVCamera_Tests.debug.xcconfig */;
528 534 buildSettings = {
529 535 BUNDLE_LOADER = "$(TEST_HOST)";
  536 + DEVELOPMENT_TEAM = 94X49GG3ZW;
530 537 FRAMEWORK_SEARCH_PATHS = (
531 538 "$(SDKROOT)/Developer/Library/Frameworks",
532 539 "$(inherited)",
... ... @@ -551,6 +558,7 @@
551 558 baseConfigurationReference = 35820DA1F6C64F6B7D896139 /* Pods-CNLiveAVCamera_Tests.release.xcconfig */;
552 559 buildSettings = {
553 560 BUNDLE_LOADER = "$(TEST_HOST)";
  561 + DEVELOPMENT_TEAM = 94X49GG3ZW;
554 562 FRAMEWORK_SEARCH_PATHS = (
555 563 "$(SDKROOT)/Developer/Library/Frameworks",
556 564 "$(inherited)",
... ...