iOS Team / CNLiveImagePickerController · Commits

Commit 11aa35afb92c3848d35781c5511a8494dcc57d73

Authored by daojian
1 parent f457e34b

0.0.22 版本，适配 iPhone 12 系列手机

Inline Side-by-side
Showing 5 changed files with 22 additions and 13 deletions
CNLiveImagePickerController.podspec
  View file @11aa35a
... ... @@ -8,7 +8,7 @@
8 8  
9 9 Pod::Spec.new do |s|
10 10 s.name = 'CNLiveImagePickerController'
11   - s.version = '0.0.21'
  11 + s.version = '0.0.22'
12 12 s.summary = '相册'
13 13  
14 14 # This description is used to generate tags and improve search results.
... ... @@ -28,7 +28,7 @@ Pod::Spec.new do |s|
28 28 s.source = { :git => 'http://bj.gitlab.cnlive.com/ios-team/CNLiveImagePickerController.git', :tag => s.version.to_s }
29 29 # s.social_media_url = 'https://twitter.com/<TWITTER_USERNAME>'
30 30  
31   - s.ios.deployment_target = '9.0'
  31 + s.ios.deployment_target = '10.0'
32 32  
33 33 s.requires_arc = true
34 34 s.resources = "CNLiveImagePickerController/Classes/*.{png,bundle}"
... ...
CNLiveImagePickerController/Classes/TZImagePickerController.m
  View file @11aa35a
... ... @@ -921,7 +921,13 @@
921 921 return (CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(375, 812)) ||
922 922 CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(812, 375)) ||
923 923 CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(414, 896)) ||
924   - CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(896, 414)));
  924 + CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(896, 414)) ||
  925 + CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(360, 780)) ||
  926 + CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(780, 360)) ||
  927 + CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(390, 844)) ||
  928 + CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(844, 390)) ||
  929 + CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(428, 926)) ||
  930 + CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(926, 428)));
925 931  
926 932 }
927 933  
... ...
Example/CNLiveImagePickerController/Base.lproj/Main.storyboard
  View file @11aa35a
1 1 <?xml version="1.0" encoding="UTF-8"?>
2   -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="whP-gf-Uak">
3   - <device id="retina4_7" orientation="portrait">
4   - <adaptation id="fullscreen"/>
5   - </device>
  2 +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="whP-gf-Uak">
  3 + <device id="retina6_0" orientation="portrait" appearance="light"/>
6 4 <dependencies>
7 5 <deployment identifier="iOS"/>
8   - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
  6 + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
9 7 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
10 8 </dependencies>
11 9 <scenes>
12   - <!--View Controller-->
  10 + <!--Live View Controller-->
13 11 <scene sceneID="wQg-tq-qST">
14 12 <objects>
15 13 <viewController id="whP-gf-Uak" customClass="CNLiveViewController" sceneMemberID="viewController">
... ... @@ -18,14 +16,14 @@
18 16 <viewControllerLayoutGuide type="bottom" id="Mvr-aV-6Um"/>
19 17 </layoutGuides>
20 18 <view key="view" contentMode="scaleToFill" id="TpU-gO-2f1">
21   - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
  19 + <rect key="frame" x="0.0" y="0.0" width="390" height="844"/>
22 20 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
23 21 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
24 22 </view>
25 23 </viewController>
26 24 <placeholder placeholderIdentifier="IBFirstResponder" id="tc2-Qw-aMS" userLabel="First Responder" sceneMemberID="firstResponder"/>
27 25 </objects>
28   - <point key="canvasLocation" x="305" y="433"/>
  26 + <point key="canvasLocation" x="156" y="245"/>
29 27 </scene>
30 28 </scenes>
31 29 </document>
... ...
Example/CNLiveImagePickerController/CNLiveViewController.m
  View file @11aa35a
... ... @@ -159,7 +159,7 @@
159 159  
160 160  
161 161  
162   - TZImagePickerController *imagePickerVc = [[TZImagePickerController alloc] initWithMaxImagesCount:1 delegate:self];
  162 + CNImagePickerController *imagePickerVc = [[CNImagePickerController alloc] initWithMaxImagesCount:9 delegate:self];
163 163 imagePickerVc.modalPresentationStyle = UIModalPresentationFullScreen;
164 164 imagePickerVc.allowTakePicture = NO; // 在内部显示拍照按钮
165 165 imagePickerVc.allowPreview = NO;
... ...
Example/Podfile
  View file @11aa35a
... ... @@ -3,11 +3,16 @@ use_frameworks!
3 3 source 'http://bj.gitlab.cnlive.com/ios-team/CNLiveRepos.git'
4 4 source 'https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git'
5 5  
6   -platform :ios, '9.0'
  6 +platform :ios, '10.0'
7 7  
8 8 target 'CNLiveImagePickerController_Example' do
9 9 pod 'CNLiveImagePickerController', :path => '../'
10 10  
  11 +# pod 'CNLiveTripartiteManagement/SDAutoLayout'
  12 +# pod 'CNLiveTripartiteManagement/QMUIKit'
  13 +# pod 'CNLiveBaseKit'
  14 +# pod 'CNLiveUploadManager'
  15 +# pod 'CNLiveBusinessTools'
11 16 #依赖三方私有库,如果里面有.a的时候加上这个
12 17 pre_install do |installer| Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {}
13 18 end
... ...