0.0.4

yinqiaojuan
1 parent a6847c99
Showing 29 changed files with 375 additions and 146 deletions
.gitignore
CNLiveDisease.podspec
CNLiveDisease/Classes/Controller/CNLiveDiseaseController.m
CNLiveDisease/Classes/Controller/CNLiveFriutViewController.m
CNLiveDisease/Classes/Controller/CNLiveSelectedViewController.h
CNLiveDisease/Classes/Controller/CNLiveSelectedViewController.m
Example/CNLiveDisease.xcodeproj/project.pbxproj
Example/CNLiveDisease.xcworkspace/xcuserdata/yinqiaojuan.xcuserdatad/UserInterfaceState.xcuserstate
Example/CNLiveDisease/CNLiveAppDelegate.m
Example/CNLiveDisease/CNLiveViewController.m
Example/Podfile
Example/Podfile.lock
Example/Pods/Local Podspecs/CNLiveDisease.podspec.json
Example/Pods/Manifest.lock
Example/Pods/Masonry/Masonry/MASCompositeConstraint.m
Example/Pods/Masonry/Masonry/MASConstraint.h
Example/Pods/Masonry/Masonry/MASConstraint.m
Example/Pods/Masonry/Masonry/MASConstraintMaker.h
Example/Pods/Masonry/Masonry/MASConstraintMaker.m
Example/Pods/Masonry/Masonry/MASViewAttribute.h
+*~
+.DS_Store
+*.xcuserstate
+*.xcworkspace
+xcuserdata
+*.lock
+Pods
 \ No newline at end of file
 Pod::Spec.new do |s|
   s.name             = 'CNLiveDisease'
-  s.version          = '0.0.3'
+  s.version          = '0.0.4'
   s.summary          = '智慧农业部分组件化'
 # This description is used to generate tags and improve search results.
@@ -25,9 +25,9 @@ TODO: Add long description of the pod here.
   s.source_files = 'CNLiveDisease/Classes/**/*'
-  # s.resource_bundles = {
-  #   'CNLiveDisease' => ['CNLiveDisease/Assets/*.png']
-  # }
+   s.resource_bundles = {
+     'CNLiveDisease' => ['CNLiveDisease/Assets/Assets.xcassets']
+   }
   # s.public_header_files = 'Pod/Classes/**/*.h'
    s.frameworks = 'UIKit', 'Foundation'
@@ -35,4 +35,8 @@ TODO: Add long description of the pod here.
    s.dependency 'Masonry'
    s.dependency 'QMUIKit', '~> 3.1.0'
    s.dependency 'CNLiveCommonCategory'
+   s.dependency 'CNLiveImagePickerController'
+   s.dependency 'CNLiveAVCamera'
+   # s.dependency 'CNLiveUploadManager'
+  # s.ios.vendored_library = 'CNLiveUploadManager'
 end
@@ -9,11 +9,13 @@
 #import "CNLiveDiseaseSegment.h"
 #import <CNLiveCommonCategory/UIColor+CNLiveExtension.h>
 #import <CNLiveBaseKit/CNLiveBaseKit.h>
+#import "CNLiveFriutViewController.h"
 #define TotalTitleCount 3
 #define Segment_Height  53
 @interface CNLiveDiseaseController ()<UIScrollViewDelegate,CNLiveDiseaseSegmentDelegate>
 @property (nonatomic, strong) UIScrollView *scrollView;
 @property (nonatomic, strong) CNLiveDiseaseSegment *segmentView;
+@property (nonatomic, assign) BOOL isAppReview;
 @end
 @implementation CNLiveDiseaseController
@@ -23,7 +25,35 @@
     self.view.backgroundColor = [UIColor whiteColor];
     [self setUpSegment];
     [self.view addSubview:self.scrollView];
-   
+    CGFloat width = KScreenWidth;
+    CGFloat height = KScreenHeight - kNavigationBarHeight - Segment_Height;
+    CNLiveFriutViewController *vc = [[CNLiveFriutViewController alloc]init];
+    [vc setIndex:0];
+    self.isAppReview = YES;
+    if (self.isAppReview) {
+        vc.imageArray = [NSArray arrayWithObjects:@"pingguo",@"yingtao",@"putao",@"tao",@"xing",@"caomei",@"yangmei",@"lizhi",@"xigua",@"mugua",@"mangguo",@"hamigua",@"xiangjiao",@"zao",@"mihoutao",@"li", nil];
+        vc.titleArray = [NSArray arrayWithObjects:@"苹果",@"樱桃",@"葡萄",@"桃子",@"杏子",@"草莓",@"杨梅",@"荔枝",@"西瓜",@"木瓜",@"芒果",@"哈密瓜",@"香蕉",@"枣",@"猕猴桃",@"梨", nil];
+    }else {
+        vc.imageArray = [NSArray arrayWithObjects:@"pingguo",@"yingtao",@"putao",@"tao",@"xing",@"zao",@"mihoutao",@"li",nil];
+        vc.titleArray = [NSArray arrayWithObjects:@"苹果",@"樱桃",@"葡萄",@"桃子",@"杏子",@"枣",@"猕猴桃",@"梨",nil];
+    }
+    [self addChildViewController:vc];
+    vc.view.frame = CGRectMake(0, 0, width, height);
+    [self.scrollView addSubview:vc.view];
+    CNLiveFriutViewController *fieldVc = [[CNLiveFriutViewController alloc]init];
+    [fieldVc setIndex:1];
+    fieldVc.imageArray = [NSArray arrayWithObjects:@"xiaomai",@"yumi",@"dadou",@"huasheng",@"xiangrikui",@"mianhua",@"youcai",@"ganzhe", nil];
+    fieldVc.titleArray = [NSArray arrayWithObjects:@"小麦",@"玉米",@"大豆",@"花生",@"向日葵",@"棉花",@"油菜",@"甘蔗", nil];
+    [self addChildViewController:fieldVc];
+    fieldVc.view.frame = CGRectMake(width, 0, width, height);
+    [self.scrollView addSubview:fieldVc.view];
+    CNLiveFriutViewController *vegetableVc = [[CNLiveFriutViewController alloc]init];
+    [vegetableVc setIndex:2];
+    vegetableVc.imageArray = [NSArray arrayWithObjects:@"huanggua",@"lajiao",@"jiucai",@"qiezi",@"xihongshi",@"biandou",@"dabaicai",@"nangua",@"donggua",@"luobo",@"malingshu",@"bocai", nil];
+    vegetableVc.titleArray = [NSArray arrayWithObjects:@"黄瓜",@"辣椒",@"韭菜",@"茄子",@"西红柿",@"扁豆",@"大白菜",@"南瓜",@"冬瓜",@"萝卜",@"马铃薯",@"菠菜", nil];
+    [self addChildViewController:vegetableVc];
+    vegetableVc.view.frame = CGRectMake(width *2, 0, width, height);
+    [self.scrollView addSubview:vegetableVc.view];
 }
 - (void)setUpSegment {
     self.segmentView = [[CNLiveDiseaseSegment alloc]initWithFrame:CGRectMake(0, kNavigationBarHeight, KScreenWidth, Segment_Height)];
@@ -23,6 +23,7 @@ static NSString *cellID = @&quot;Cell&quot;;
 }
 -(void)setIndex:(NSInteger)index {
+    self.isAppReview = YES;
     if (index == 0) {
         [self setUpCollectionView];
     }else if (index == 1) {
@@ -77,7 +78,9 @@ static NSString *cellID = @&quot;Cell&quot;;
         cell = [[CNDiseaseViewCell alloc]init];
     }
     //    cell.backgroundColor = [UIColor cyanColor];
-    cell.showImageV.image = [UIImage imageNamed:self.imageArray[indexPath.row]];
+//    cell.showImageV.image = [UIImage imageNamed:self.imageArray[indexPath.row]];
+    cell.showImageV.image = [self getImageName:self.imageArray[indexPath.row]];
+    
     cell.titleLabel.text = self.titleArray[indexPath.row];
     return cell;
 }
@@ -100,5 +103,12 @@ static NSString *cellID = @&quot;Cell&quot;;
     [self.emptyView setTextLabelTextColor:UIColorMake(102, 102, 102)];
     self.emptyView.imageViewInsets = UIEdgeInsetsMake(0, 0, 36, 0);
 }
-
+- (UIImage *)getImageName:(NSString *)imageName{
+    NSBundle *bundle = [NSBundle bundleForClass:[self class]];
+    NSURL *url = [bundle URLForResource:@"CNLiveDisease" withExtension:@"bundle"];
+    NSBundle *targetBundle = [NSBundle bundleWithURL:url];
+    UIImage *image = [UIImage imageNamed:imageName inBundle:targetBundle compatibleWithTraitCollection:nil];
+    return image;
+    
+}
 @end
+//
+//  CNLiveSelectedViewController.h
+//  CNLiveDisease
+//
+//  Created by 殷巧娟 on 2019/1/24.
+//
+
+#import <QMUIKit/QMUIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface CNLiveSelectedViewController : QMUICommonViewController
+@property (nonatomic, copy) NSString *imageName;
+@property (nonatomic, copy) NSString *titleName;
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  CNLiveSelectedViewController.m
+//  CNLiveDisease
+//
+//  Created by 殷巧娟 on 2019/1/24.
+//
+
+#import "CNLiveSelectedViewController.h"
+#import <AssetsLibrary/AssetsLibrary.h>
+#import <Photos/Photos.h>
+#import <CNLiveImagePickerController/TZImagePickerController.h>
+#import "CNDiseaseType.h"
+#import <CNLiveAVCamera/XFCameraController.h>
+#import "CNDiseaseType.h"
+#import <Masonry/Masonry.h>
+#import <CNLiveBaseKit/CNLiveBaseKit.h>
+#import <CNLiveImagePickerController/CNImagePickerManager.h>
+#define MJWeakSelf __weak typeof(self) weakSelf = self;
+@interface CNLiveSelectedViewController () <TZImagePickerControllerDelegate>
+@property (nonatomic, strong) UIImageView *selectImageV;
+@property (nonatomic, strong) UIButton *photoBtn;
+@property (nonatomic, strong) UIImageView *backImageV;
+@end
+
+@implementation CNLiveSelectedViewController
+-(void)viewDidLoad {
+    [super viewDidLoad];
+     self.selectImageV.image = [UIImage imageNamed:self.imageName];
+    self.title = self.titleName;
+}
+-(void)setUPViews {
+    [self.view addSubview:self.backImageV];
+    [self.backImageV addSubview:self.selectImageV];
+    [self.backImageV addSubview:self.photoBtn];
+    [self setUpLayout];
+}
+
+-(void)photoBtnClick {
+    MJWeakSelf;
+    [self.view createAlertViewTitleArray:@[@"拍照",@"从手机相册选择"] subTitleArr:@[@"",@""] textColor:UIColorMake(11, 190, 0) subTitleColor:[UIColor whiteColor] firstFont:UIFontMake(18.0f) font:UIFontMake(18.0f) subFont:UIFontMake(18.0f) cancelTitle:@"取消" cancelFont:UIFontMake(18.0f) cancelTitleColor:UIColorMake(102, 102, 102) actionBlock:^(UIButton *button, NSInteger didRow) {
+        switch (didRow) {
+            case 0:{
+                [weakSelf takeToXFPhoto];
+            }
+                break;
+            case 1:{
+                [weakSelf pushTZImagePickerController];
+            }
+                break;
+            default:
+                break;
+        }
+    }];
+}
+
+#pragma mark - 跳转到自定义相机
+-(void)takeToXFPhoto {
+    XFCameraController *cameraController = [[XFCameraController alloc]init];
+    
+    cameraController.isCanShootVideo = NO;
+    __weak XFCameraController *weakCameraController = cameraController;
+    cameraController.takePhotosCompletionBlock = ^(UIImage *image, NSError *error) {
+        if (!error) {
+            [self didFinishSelectPhotoWithImage:image];
+        }
+
+        dispatch_async(dispatch_get_main_queue(), ^{
+        [weakCameraController dismissViewControllerAnimated:YES completion:nil];
+        });
+    };
+    [self presentViewController:cameraController animated:YES completion:nil];
+}
+
+#pragma mark -- 照相选中图片
+-(void)didFinishSelectPhotoWithImage:(UIImage *)finalImage {
+    
+    TZImagePickerController *tzImagePickerVc = [[TZImagePickerController alloc]initWithMaxImagesCount:1 delegate:self];
+    tzImagePickerVc.sortAscendingByModificationDate = YES;
+    [tzImagePickerVc showProgressHUD];
+    UIImage *image = finalImage;
+    // 保存图片,获取到asset
+    
+    [[TZImageManager manager] savePhotoWithImage:image location:nil completion:^(NSError *error) {
+        if (error) {
+            [tzImagePickerVc hideProgressHUD];
+            NSLog(@"图片保存失败 %@",error);
+        } else {
+            [[TZImageManager manager] getCameraRollAlbum:NO allowPickingImage:YES needFetchAssets:YES completion:^(TZAlbumModel *model) {
+                [[TZImageManager manager]getAssetsFromFetchResult:model.result allowPickingVideo:NO allowPickingImage:YES completion:^(NSArray<TZAssetModel *> *models) {
+                    [tzImagePickerVc hideProgressHUD];
+                    TZAssetModel *assetModel = [models firstObject];
+                    if (tzImagePickerVc.sortAscendingByModificationDate) {
+                        assetModel = [models lastObject];
+                    }
+                    dispatch_async(dispatch_get_main_queue(), ^{
+                         self.selectImageV.image = image;
+                    });
+                    [self getUpFieldList:image];
+                    
+                }];
+            }];
+        }
+    }];
+}
+#pragma maek -从相册选择
+-(void)pushTZImagePickerController {
+    [CNImagePickerManager ImagePickerWithMaxImagesCount:1 columnNumber:4 delegate:self pushPhotoPickerVc:YES isSelectOriginalPhoto:YES selectedAssets:nil enterType:CNImagePickerEnterTypeOther pickingPhotosHandle:^(NSArray<UIImage *> *photos, NSArray *assets, BOOL isSelectOriginalPhoto) {
+        dispatch_async(dispatch_get_main_queue(), ^{
+           self.selectImageV.image = [photos firstObject];
+        });
+
+//        [self getUpFieldList:[photos firstObject]];
+
+
+    }];
+}
+
+-(void)getUpFieldList:(UIImage *)image {
+    
+//    NSString *url = @"https://xcx.aiphsn.com/recognition.php";
+//    [QMUITips showLoading:@"正在识别中" inView:AppKeyWindow];
+//
+//    NSDictionary *param = @{@"type":[CNDiseaseType showType:self.titleName]};
+//    [CNLiveUploadManager uploadRequestType:CNLiveUploadTypeThird url:url dic:param image:image isOriginal:NO limitType:(AppPhototLimitType)AppPhototLimitTypeFriendsCircle progress:^(float progress) {
+//
+//    } success:^(CNLiveUploadModel *uploadModel) {
+//        NSLog(@"f打印啊啊啊啊啊%@",uploadModel.responseObject);
+//        [QMUITips hideAllTipsInView:AppKeyWindow];
+//        NSDictionary *dic = [uploadModel.responseObject objectForKey:@"disease"];
+//        if ([[dic objectForKey:@"name"] isEqualToString:@"抱歉图片不能识别"]) {
+//            CNDiseaseFailedController *failVc = [[CNDiseaseFailedController alloc]init];
+//            failVc.name = [dic objectForKey:@"name"];
+//            failVc.introduction = [dic objectForKey:@"introduction"];
+//            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+//                [[AppDelegate sharedAppDelegate]pushViewController:failVc withBackTitle:@""];
+//            });
+//        }else {
+//            CNLiveDiseaseDescController * diseaseView = [[CNLiveDiseaseDescController alloc] init];
+//            diseaseView.dataDict = [uploadModel.responseObject objectForKey:@"disease"];
+//            [[AppDelegate sharedAppDelegate] pushViewController:diseaseView withBackTitle:@""];
+//        }
+//    } failure:^(CNLiveUploadModel *uploadModel, NSError *error) {
+//        NSLog(@"打印error%@",error);
+//        [QMUITips hideAllTipsInView:AppKeyWindow];
+//        if (error.code == -1009) {
+//            [QMUITips showError:@"似乎已断开与互联网的连接" inView:AppKeyWindow hideAfterDelay:1.5f];
+//        }else {
+//            [QMUITips showError:@"识别错误,请重新识别" inView:AppKeyWindow hideAfterDelay:1.5f];
+//        }
+//    }];
+}
+
+-(void)setUpLayout {
+    MJWeakSelf;
+    [_backImageV mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.left.right.bottom.mas_equalTo(self.view);
+    }];
+    [_selectImageV mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.centerX.mas_equalTo(weakSelf.view.mas_centerX);
+        make.height.width.mas_equalTo(127);
+        make.top.mas_equalTo(kNavigationBarHeight +125);
+    }];
+    [_photoBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.mas_equalTo(weakSelf.selectImageV.mas_bottom).offset(30);
+        make.centerX.mas_equalTo(weakSelf.view.mas_centerX);
+        make.width.mas_equalTo(170);
+        make.height.mas_equalTo(40);
+    }];
+}
+-(UIImageView *)selectImageV {
+    if (!_selectImageV) {
+        _selectImageV = [[UIImageView alloc]init];
+        _selectImageV.contentMode = UIViewContentModeScaleAspectFill;
+        _selectImageV.clipsToBounds = YES;
+    }
+    return _selectImageV;
+}
+-(UIButton *)photoBtn {
+    if (!_photoBtn) {
+        _photoBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+        [_photoBtn setImage:[UIImage imageNamed:@"farming_release"] forState:UIControlStateNormal];
+        [_photoBtn addTarget:self action:@selector(photoBtnClick) forControlEvents:UIControlEventTouchUpInside];
+    }
+    return _photoBtn;
+}
+-(UIImageView *)backImageV {
+    if (!_backImageV) {
+        _backImageV = [[UIImageView alloc]init];
+        _backImageV.image = [UIImage imageNamed:@"farming_bg"];
+        _backImageV.contentMode = UIViewContentModeScaleAspectFill;
+        _backImageV.clipsToBounds = YES;
+        _backImageV.userInteractionEnabled = YES;
+    }
+    return _backImageV;
+}
+@end
@@ -307,9 +307,11 @@
 			);
 			inputPaths = (
 				"${SRCROOT}/Pods/Target Support Files/Pods-CNLiveDisease_Example/Pods-CNLiveDisease_Example-frameworks.sh",
+				"${BUILT_PRODUCTS_DIR}/CNLiveAVCamera/CNLiveAVCamera.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveBaseKit/CNLiveBaseKit.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveDisease/CNLiveDisease.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveImagePickerController/CNLiveImagePickerController.framework",
 				"${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework",
 				"${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework",
 				"${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework",
@@ -319,9 +321,11 @@
 			outputFileListPaths = (
 			);
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveAVCamera.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonCategory.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveDisease.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveImagePickerController.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework",
@@ -341,8 +345,10 @@
 			);
 			inputPaths = (
 				"${SRCROOT}/Pods/Target Support Files/Pods-CNLiveDisease_Tests/Pods-CNLiveDisease_Tests-frameworks.sh",
+				"${BUILT_PRODUCTS_DIR}/CNLiveAVCamera/CNLiveAVCamera.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveBaseKit/CNLiveBaseKit.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveImagePickerController/CNLiveImagePickerController.framework",
 				"${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework",
 				"${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework",
 				"${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework",
@@ -352,8 +358,10 @@
 			outputFileListPaths = (
 			);
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveAVCamera.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonCategory.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveImagePickerController.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework",
@@ -14,8 +14,10 @@
 {
     UIWindow *window = [[UIWindow alloc]initWithFrame:[UIScreen mainScreen].bounds];
     window.backgroundColor = [UIColor whiteColor];
-    [window makeKeyAndVisible];
-    window.rootViewController = [[CNLiveViewController alloc]init];
+    UIViewController *vc = [[CNLiveViewController alloc]init];
+    UINavigationController *nav =[[UINavigationController alloc]initWithRootViewController:vc];
+    window.rootViewController = nav;
+      [window makeKeyAndVisible];
     // Override point for customization after application launch.
     return YES;
 }
@@ -21,6 +21,7 @@
     [super viewDidLoad];
     self.view.backgroundColor = [UIColor whiteColor];
     [self.view addSubview:self.testButton];
+    self.title = @"哈哈哈";
 	// Do any additional setup after loading the view, typically from a nib.
 }
 - (UIButton *)testButton {
@@ -36,6 +37,7 @@
     CNLiveDiseaseController *vc = [[CNLiveDiseaseController alloc]init];
     vc.view.backgroundColor = [UIColor whiteColor];
     [self presentViewController:vc animated:YES completion:nil];
+//    [self.navigationController pushViewController:vc animated:YES];
 }
 - (void)didReceiveMemoryWarning
 {
 source 'https://github.com/CocoaPods/Specs.git'
 source ‘http://bj.gitlab.cnlive.com/ios-team/CNLiveRepos.git’
+
 use_frameworks!
 platform :ios, '9.0'
@@ -11,12 +12,18 @@ target &#39;CNLiveDisease_Example&#39; do
   pod 'Masonry'
   pod 'QMUIKit', '~> 3.1.0'
   pod 'CNLiveCommonCategory'
+  pod 'CNLiveImagePickerController'
+  pod 'CNLiveAVCamera'
+  # pod 'CNLiveUploadManager'
   target 'CNLiveDisease_Tests' do
     inherit! :search_paths
   pod 'CNLiveBaseKit'
   pod 'Masonry'
   pod 'QMUIKit', '~> 3.1.0'
   pod 'CNLiveCommonCategory'
+  pod 'CNLiveImagePickerController'
+  pod 'CNLiveAVCamera'
+  # pod 'CNLiveUploadManager'
   end
 end
 PODS:
+  - CNLiveAVCamera (0.1.1):
+    - Masonry (~> 1.0.2)
   - CNLiveBaseKit (0.1.8):
     - MJExtension (~> 3.0.15.1)
   - CNLiveCommonCategory (0.2.5):
     - SDWebImage (~> 4.4.2)
-  - CNLiveDisease (0.0.2):
+  - CNLiveDisease (0.0.3):
+    - CNLiveAVCamera
     - CNLiveBaseKit
     - CNLiveCommonCategory
+    - CNLiveImagePickerController
     - Masonry
     - QMUIKit (~> 3.1.0)
-  - Masonry (1.1.0)
+  - CNLiveImagePickerController (0.0.2)
+  - Masonry (1.0.2)
   - MJExtension (3.0.15.1)
   - QMUIKit (3.1.0):
     - QMUIKit/QMUIComponents (= 3.1.0)
@@ -281,16 +286,20 @@ PODS:
   - SDWebImage/Core (4.4.3)
 DEPENDENCIES:
+  - CNLiveAVCamera
   - CNLiveBaseKit
   - CNLiveCommonCategory
   - CNLiveDisease (from `../`)
+  - CNLiveImagePickerController
   - Masonry
   - QMUIKit (~> 3.1.0)
 SPEC REPOS:
   http://bj.gitlab.cnlive.com/ios-team/CNLiveRepos.git:
+    - CNLiveAVCamera
     - CNLiveBaseKit
     - CNLiveCommonCategory
+    - CNLiveImagePickerController
   https://github.com/cocoapods/specs.git:
     - Masonry
     - MJExtension
@@ -302,14 +311,16 @@ EXTERNAL SOURCES:
     :path: "../"
 SPEC CHECKSUMS:
+  CNLiveAVCamera: 7f3eba8eb1827f6e7a5047b0bb9f9f0bf19d1451
   CNLiveBaseKit: 09a97c3411a91270fb68bfe20a1df2cdbcd2c524
   CNLiveCommonCategory: 57cb8422ccf17ba5cc8fffe76851fa828c367d06
-  CNLiveDisease: a760655ec1b3a66b241e2e1e9287182c71290724
-  Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
+  CNLiveDisease: 8d80c9163497b37cbd2838898bb7c477868a158d
+  CNLiveImagePickerController: 2be3ac0a75563f5945101ee6e0a787ad2fc15549
+  Masonry: 7c429b56da9d4ee0bbb3ed77a5ea710d6a5df39e
   MJExtension: 19bc33ce2eee2d319760f5622562cf581a6ff756
   QMUIKit: 33959d093f48bb64f754ad696c310887a0768c49
   SDWebImage: c5594f1a19c48d526d321e548902b56b479cd508
-PODFILE CHECKSUM: 54d7d686ae6622396bd465729ac9cb652ae1294b
+PODFILE CHECKSUM: 441d26e990ff01b086d84ccbd3d0027e04e6ea1a
 COCOAPODS: 1.5.3
 {
   "name": "CNLiveDisease",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "summary": "智慧农业部分组件化",
   "description": "TODO: Add long description of the pod here.",
   "homepage": "http://bj.gitlab.cnlive.com/ios-team/CNLiveDisease",
@@ -13,12 +13,17 @@
   },
   "source": {
     "git": "http://bj.gitlab.cnlive.com/ios-team/CNLiveDisease.git",
-    "tag": "0.0.2"
+    "tag": "0.0.3"
   },
   "platforms": {
     "ios": "9.0"
   },
   "source_files": "CNLiveDisease/Classes/**/*",
+  "resource_bundles": {
+    "CNLiveDisease": [
+      "CNLiveDisease/Assets/Assets.xcassets"
+    ]
+  },
   "frameworks": [
     "UIKit",
     "Foundation"
@@ -35,6 +40,12 @@
     ],
     "CNLiveCommonCategory": [
+    ],
+    "CNLiveImagePickerController": [
+
+    ],
+    "CNLiveAVCamera": [
+
     ]
   }
 }
 PODS:
+  - CNLiveAVCamera (0.1.1):
+    - Masonry (~> 1.0.2)
   - CNLiveBaseKit (0.1.8):
     - MJExtension (~> 3.0.15.1)
   - CNLiveCommonCategory (0.2.5):
     - SDWebImage (~> 4.4.2)
-  - CNLiveDisease (0.0.2):
+  - CNLiveDisease (0.0.3):
+    - CNLiveAVCamera
     - CNLiveBaseKit
     - CNLiveCommonCategory
+    - CNLiveImagePickerController
     - Masonry
     - QMUIKit (~> 3.1.0)
-  - Masonry (1.1.0)
+  - CNLiveImagePickerController (0.0.2)
+  - Masonry (1.0.2)
   - MJExtension (3.0.15.1)
   - QMUIKit (3.1.0):
     - QMUIKit/QMUIComponents (= 3.1.0)
@@ -281,16 +286,20 @@ PODS:
   - SDWebImage/Core (4.4.3)
 DEPENDENCIES:
+  - CNLiveAVCamera
   - CNLiveBaseKit
   - CNLiveCommonCategory
   - CNLiveDisease (from `../`)
+  - CNLiveImagePickerController
   - Masonry
   - QMUIKit (~> 3.1.0)
 SPEC REPOS:
   http://bj.gitlab.cnlive.com/ios-team/CNLiveRepos.git:
+    - CNLiveAVCamera
     - CNLiveBaseKit
     - CNLiveCommonCategory
+    - CNLiveImagePickerController
   https://github.com/cocoapods/specs.git:
     - Masonry
     - MJExtension
@@ -302,14 +311,16 @@ EXTERNAL SOURCES:
     :path: "../"
 SPEC CHECKSUMS:
+  CNLiveAVCamera: 7f3eba8eb1827f6e7a5047b0bb9f9f0bf19d1451
   CNLiveBaseKit: 09a97c3411a91270fb68bfe20a1df2cdbcd2c524
   CNLiveCommonCategory: 57cb8422ccf17ba5cc8fffe76851fa828c367d06
-  CNLiveDisease: a760655ec1b3a66b241e2e1e9287182c71290724
-  Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
+  CNLiveDisease: 8d80c9163497b37cbd2838898bb7c477868a158d
+  CNLiveImagePickerController: 2be3ac0a75563f5945101ee6e0a787ad2fc15549
+  Masonry: 7c429b56da9d4ee0bbb3ed77a5ea710d6a5df39e
   MJExtension: 19bc33ce2eee2d319760f5622562cf581a6ff756
   QMUIKit: 33959d093f48bb64f754ad696c310887a0768c49
   SDWebImage: c5594f1a19c48d526d321e548902b56b479cd508
-PODFILE CHECKSUM: 54d7d686ae6622396bd465729ac9cb652ae1294b
+PODFILE CHECKSUM: 441d26e990ff01b086d84ccbd3d0027e04e6ea1a
 COCOAPODS: 1.5.3
@@ -129,12 +129,6 @@
     }
 }
-- (void)setInset:(CGFloat)inset {
-    for (MASConstraint *constraint in self.childConstraints) {
-        constraint.inset = inset;
-    }
-}
-
 - (void)setOffset:(CGFloat)offset {
     for (MASConstraint *constraint in self.childConstraints) {
         constraint.offset = offset;
@@ -27,13 +27,6 @@
 /**
  *	Modifies the NSLayoutConstraint constant,
  *  only affects MASConstraints in which the first item's NSLayoutAttribute is one of the following
- *  NSLayoutAttributeTop, NSLayoutAttributeLeft, NSLayoutAttributeBottom, NSLayoutAttributeRight
- */
-- (MASConstraint * (^)(CGFloat inset))inset;
-
-/**
- *	Modifies the NSLayoutConstraint constant,
- *  only affects MASConstraints in which the first item's NSLayoutAttribute is one of the following
  *  NSLayoutAttributeWidth, NSLayoutAttributeHeight
  */
 - (MASConstraint * (^)(CGSize offset))sizeOffset;
@@ -73,17 +66,17 @@
 /**
  *	Sets the NSLayoutConstraint priority to MASLayoutPriorityLow
  */
-- (MASConstraint * (^)(void))priorityLow;
+- (MASConstraint * (^)())priorityLow;
 /**
  *	Sets the NSLayoutConstraint priority to MASLayoutPriorityMedium
  */
-- (MASConstraint * (^)(void))priorityMedium;
+- (MASConstraint * (^)())priorityMedium;
 /**
  *	Sets the NSLayoutConstraint priority to MASLayoutPriorityHigh
  */
-- (MASConstraint * (^)(void))priorityHigh;
+- (MASConstraint * (^)())priorityHigh;
 /**
  *	Sets the constraint relation to NSLayoutRelationEqual
@@ -141,7 +134,7 @@
 #endif
-#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000)
+#if TARGET_OS_IPHONE || TARGET_OS_TV
 - (MASConstraint *)leftMargin;
 - (MASConstraint *)rightMargin;
@@ -173,13 +166,6 @@
 /**
  *	Modifies the NSLayoutConstraint constant,
  *  only affects MASConstraints in which the first item's NSLayoutAttribute is one of the following
- *  NSLayoutAttributeTop, NSLayoutAttributeLeft, NSLayoutAttributeBottom, NSLayoutAttributeRight
- */
-- (void)setInset:(CGFloat)inset;
-
-/**
- *	Modifies the NSLayoutConstraint constant,
- *  only affects MASConstraints in which the first item's NSLayoutAttribute is one of the following
  *  NSLayoutAttributeWidth, NSLayoutAttributeHeight
  */
 - (void)setSizeOffset:(CGSize)sizeOffset;
@@ -62,21 +62,21 @@
 #pragma mark - MASLayoutPriority proxies
-- (MASConstraint * (^)(void))priorityLow {
+- (MASConstraint * (^)())priorityLow {
     return ^id{
         self.priority(MASLayoutPriorityDefaultLow);
         return self;
     };
 }
-- (MASConstraint * (^)(void))priorityMedium {
+- (MASConstraint * (^)())priorityMedium {
     return ^id{
         self.priority(MASLayoutPriorityDefaultMedium);
         return self;
     };
 }
-- (MASConstraint * (^)(void))priorityHigh {
+- (MASConstraint * (^)())priorityHigh {
     return ^id{
         self.priority(MASLayoutPriorityDefaultHigh);
         return self;
@@ -92,13 +92,6 @@
     };
 }
-- (MASConstraint * (^)(CGFloat))inset {
-    return ^id(CGFloat inset){
-        self.inset = inset;
-        return self;
-    };
-}
-
 - (MASConstraint * (^)(CGSize))sizeOffset {
     return ^id(CGSize offset) {
         self.sizeOffset = offset;
@@ -226,7 +219,7 @@
 #endif
-#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000)
+#if TARGET_OS_IPHONE || TARGET_OS_TV
 - (MASConstraint *)leftMargin {
     return [self addConstraintWithLayoutAttribute:NSLayoutAttributeLeftMargin];
@@ -276,8 +269,6 @@
 - (void)setInsets:(MASEdgeInsets __unused)insets { MASMethodNotImplemented(); }
-- (void)setInset:(CGFloat __unused)inset { MASMethodNotImplemented(); }
-
 - (void)setSizeOffset:(CGSize __unused)sizeOffset { MASMethodNotImplemented(); }
 - (void)setCenterOffset:(CGPoint __unused)centerOffset { MASMethodNotImplemented(); }
 //
-//  MASConstraintMaker.h
+//  MASConstraintBuilder.h
 //  Masonry
 //
 //  Created by Jonas Budelmann on 20/07/13.
@@ -29,7 +29,7 @@ typedef NS_OPTIONS(NSInteger, MASAttribute) {
 #endif
-#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000)
+#if TARGET_OS_IPHONE || TARGET_OS_TV
     MASAttributeLeftMargin = 1 << NSLayoutAttributeLeftMargin,
     MASAttributeRightMargin = 1 << NSLayoutAttributeRightMargin,
@@ -74,7 +74,7 @@ typedef NS_OPTIONS(NSInteger, MASAttribute) {
 #endif
-#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000)
+#if TARGET_OS_IPHONE || TARGET_OS_TV
 @property (nonatomic, strong, readonly) MASConstraint *leftMargin;
 @property (nonatomic, strong, readonly) MASConstraint *rightMargin;
@@ -128,7 +128,7 @@ typedef NS_OPTIONS(NSInteger, MASAttribute) {
 /**
  *	initialises the maker with a default view
  *
- *	@param	view	any MASConstraint are created with this view as the first item
+ *	@param	view	any MASConstrait are created with this view as the first item
  *
  *	@return	a new MASConstraintMaker
  */
 //
-//  MASConstraintMaker.m
+//  MASConstraintBuilder.m
 //  Masonry
 //
 //  Created by Jonas Budelmann on 20/07/13.
@@ -81,7 +81,7 @@
 #if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000) || (__MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
                                           | MASAttributeFirstBaseline | MASAttributeLastBaseline
 #endif
-#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000)
+#if TARGET_OS_IPHONE || TARGET_OS_TV
                                           | MASAttributeLeftMargin | MASAttributeRightMargin | MASAttributeTopMargin | MASAttributeBottomMargin
                                           | MASAttributeLeadingMargin | MASAttributeTrailingMargin | MASAttributeCenterXWithinMargins
                                           | MASAttributeCenterYWithinMargins
@@ -111,7 +111,7 @@
 #endif
-#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000)
+#if TARGET_OS_IPHONE || TARGET_OS_TV
     if (attrs & MASAttributeLeftMargin) [attributes addObject:self.view.mas_leftMargin];
     if (attrs & MASAttributeRightMargin) [attributes addObject:self.view.mas_rightMargin];
@@ -205,7 +205,7 @@
 #endif
-#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000)
+#if TARGET_OS_IPHONE || TARGET_OS_TV
 - (MASConstraint *)leftMargin {
     return [self addConstraintWithLayoutAttribute:NSLayoutAttributeLeftMargin];
 //
-//  MASViewAttribute.h
+//  MASAttribute.h
 //  Masonry
 //
 //  Created by Jonas Budelmann on 21/07/13.
 //
-//  MASViewAttribute.m
+//  MASAttribute.m
 //  Masonry
 //
 //  Created by Jonas Budelmann on 21/07/13.
 //
-//  MASViewConstraint.h
+//  MASConstraint.h
 //  Masonry
 //
 //  Created by Jonas Budelmann on 20/07/13.
 //
-//  MASViewConstraint.m
+//  MASConstraint.m
 //  Masonry
 //
 //  Created by Jonas Budelmann on 20/07/13.
@@ -254,10 +254,6 @@ static char kInstalledConstraintsKey;
     }
 }
-- (void)setInset:(CGFloat)inset {
-    [self setInsets:(MASEdgeInsets){.top = inset, .left = inset, .bottom = inset, .right = inset}];
-}
-
 - (void)setOffset:(CGFloat)offset {
     self.layoutConstant = offset;
 }
@@ -25,7 +25,7 @@ typedef NS_ENUM(NSUInteger, MASAxisType) {
  *
  *  @return Array of created MASConstraints
  */
-- (NSArray *)mas_makeConstraints:(void (NS_NOESCAPE ^)(MASConstraintMaker *make))block;
+- (NSArray *)mas_makeConstraints:(void (^)(MASConstraintMaker *make))block;
 /**
  *  Creates a MASConstraintMaker with each view in the callee.
@@ -36,7 +36,7 @@ typedef NS_ENUM(NSUInteger, MASAxisType) {
  *
  *  @return Array of created/updated MASConstraints
  */
-- (NSArray *)mas_updateConstraints:(void (NS_NOESCAPE ^)(MASConstraintMaker *make))block;
+- (NSArray *)mas_updateConstraints:(void (^)(MASConstraintMaker *make))block;
 /**
  *  Creates a MASConstraintMaker with each view in the callee.
@@ -47,7 +47,7 @@ typedef NS_ENUM(NSUInteger, MASAxisType) {
  *
  *  @return Array of created/updated MASConstraints
  */
-- (NSArray *)mas_remakeConstraints:(void (NS_NOESCAPE ^)(MASConstraintMaker *make))block;
+- (NSArray *)mas_remakeConstraints:(void (^)(MASConstraintMaker *make))block;
 /**
  *  distribute with fixed spacing
@@ -49,7 +49,7 @@
             @(NSLayoutAttributeLastBaseline) : @"lastBaseline",
 #endif
-#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000)
+#if TARGET_OS_IPHONE || TARGET_OS_TV
             @(NSLayoutAttributeLeftMargin)           : @"leftMargin",
             @(NSLayoutAttributeRightMargin)          : @"rightMargin",
             @(NSLayoutAttributeTopMargin)            : @"topMargin",
@@ -39,7 +39,7 @@
 #endif
-#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000)
+#if TARGET_OS_IPHONE || TARGET_OS_TV
 @property (nonatomic, strong, readonly) MASViewAttribute *mas_leftMargin;
 @property (nonatomic, strong, readonly) MASViewAttribute *mas_rightMargin;
@@ -52,16 +52,6 @@
 #endif
-#if (__IPHONE_OS_VERSION_MAX_ALLOWED >= 110000) || (__TV_OS_VERSION_MAX_ALLOWED >= 110000)
-
-@property (nonatomic, strong, readonly) MASViewAttribute *mas_safeAreaLayoutGuide API_AVAILABLE(ios(11.0),tvos(11.0));
-@property (nonatomic, strong, readonly) MASViewAttribute *mas_safeAreaLayoutGuideTop API_AVAILABLE(ios(11.0),tvos(11.0));
-@property (nonatomic, strong, readonly) MASViewAttribute *mas_safeAreaLayoutGuideBottom API_AVAILABLE(ios(11.0),tvos(11.0));
-@property (nonatomic, strong, readonly) MASViewAttribute *mas_safeAreaLayoutGuideLeft API_AVAILABLE(ios(11.0),tvos(11.0));
-@property (nonatomic, strong, readonly) MASViewAttribute *mas_safeAreaLayoutGuideRight API_AVAILABLE(ios(11.0),tvos(11.0));
-
-#endif
-
 /**
  *	a key to associate with this view
  */
@@ -84,7 +74,7 @@
  *
  *  @return Array of created MASConstraints
  */
-- (NSArray *)mas_makeConstraints:(void(NS_NOESCAPE ^)(MASConstraintMaker *make))block;
+- (NSArray *)mas_makeConstraints:(void(^)(MASConstraintMaker *make))block;
 /**
  *  Creates a MASConstraintMaker with the callee view.
@@ -95,7 +85,7 @@
  *
  *  @return Array of created/updated MASConstraints
  */
-- (NSArray *)mas_updateConstraints:(void(NS_NOESCAPE ^)(MASConstraintMaker *make))block;
+- (NSArray *)mas_updateConstraints:(void(^)(MASConstraintMaker *make))block;
 /**
  *  Creates a MASConstraintMaker with the callee view.
@@ -106,6 +96,6 @@
  *
  *  @return Array of created/updated MASConstraints
  */
-- (NSArray *)mas_remakeConstraints:(void(NS_NOESCAPE ^)(MASConstraintMaker *make))block;
+- (NSArray *)mas_remakeConstraints:(void(^)(MASConstraintMaker *make))block;
 @end
@@ -98,7 +98,7 @@
 #endif
-#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000)
+#if TARGET_OS_IPHONE || TARGET_OS_TV
 - (MASViewAttribute *)mas_leftMargin {
     return [[MASViewAttribute alloc] initWithView:self layoutAttribute:NSLayoutAttributeLeftMargin];
@@ -134,26 +134,6 @@
 #endif
-#if (__IPHONE_OS_VERSION_MAX_ALLOWED >= 110000) || (__TV_OS_VERSION_MAX_ALLOWED >= 110000)
-
-- (MASViewAttribute *)mas_safeAreaLayoutGuide {
-    return [[MASViewAttribute alloc] initWithView:self item:self.safeAreaLayoutGuide layoutAttribute:NSLayoutAttributeBottom];
-}
-- (MASViewAttribute *)mas_safeAreaLayoutGuideTop {
-    return [[MASViewAttribute alloc] initWithView:self item:self.safeAreaLayoutGuide layoutAttribute:NSLayoutAttributeTop];
-}
-- (MASViewAttribute *)mas_safeAreaLayoutGuideBottom {
-    return [[MASViewAttribute alloc] initWithView:self item:self.safeAreaLayoutGuide layoutAttribute:NSLayoutAttributeBottom];
-}
-- (MASViewAttribute *)mas_safeAreaLayoutGuideLeft {
-    return [[MASViewAttribute alloc] initWithView:self item:self.safeAreaLayoutGuide layoutAttribute:NSLayoutAttributeLeft];
-}
-- (MASViewAttribute *)mas_safeAreaLayoutGuideRight {
-    return [[MASViewAttribute alloc] initWithView:self item:self.safeAreaLayoutGuide layoutAttribute:NSLayoutAttributeRight];
-}
-
-#endif
-
 #pragma mark - associated properties
 - (id)mas_key {
@@ -36,7 +36,7 @@
 #endif
-#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000)
+#if TARGET_OS_IPHONE || TARGET_OS_TV
 @property (nonatomic, strong, readonly) MASViewAttribute *leftMargin;
 @property (nonatomic, strong, readonly) MASViewAttribute *rightMargin;
@@ -49,15 +49,6 @@
 #endif
-#if (__IPHONE_OS_VERSION_MAX_ALLOWED >= 110000) || (__TV_OS_VERSION_MAX_ALLOWED >= 110000)
-
-@property (nonatomic, strong, readonly) MASViewAttribute *safeAreaLayoutGuideTop API_AVAILABLE(ios(11.0),tvos(11.0));
-@property (nonatomic, strong, readonly) MASViewAttribute *safeAreaLayoutGuideBottom API_AVAILABLE(ios(11.0),tvos(11.0));
-@property (nonatomic, strong, readonly) MASViewAttribute *safeAreaLayoutGuideLeft API_AVAILABLE(ios(11.0),tvos(11.0));
-@property (nonatomic, strong, readonly) MASViewAttribute *safeAreaLayoutGuideRight API_AVAILABLE(ios(11.0),tvos(11.0));
-
-#endif
-
 - (NSArray *)makeConstraints:(void(^)(MASConstraintMaker *make))block;
 - (NSArray *)updateConstraints:(void(^)(MASConstraintMaker *make))block;
 - (NSArray *)remakeConstraints:(void(^)(MASConstraintMaker *make))block;
@@ -90,7 +81,7 @@ MAS_ATTR_FORWARD(lastBaseline);
 #endif
-#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000)
+#if TARGET_OS_IPHONE || TARGET_OS_TV
 MAS_ATTR_FORWARD(leftMargin);
 MAS_ATTR_FORWARD(rightMargin);
@@ -103,28 +94,19 @@ MAS_ATTR_FORWARD(centerYWithinMargins);
 #endif
-#if (__IPHONE_OS_VERSION_MAX_ALLOWED >= 110000) || (__TV_OS_VERSION_MAX_ALLOWED >= 110000)
-
-MAS_ATTR_FORWARD(safeAreaLayoutGuideTop);
-MAS_ATTR_FORWARD(safeAreaLayoutGuideBottom);
-MAS_ATTR_FORWARD(safeAreaLayoutGuideLeft);
-MAS_ATTR_FORWARD(safeAreaLayoutGuideRight);
-
-#endif
-
 - (MASViewAttribute *(^)(NSLayoutAttribute))attribute {
     return [self mas_attribute];
 }
-- (NSArray *)makeConstraints:(void(NS_NOESCAPE ^)(MASConstraintMaker *))block {
+- (NSArray *)makeConstraints:(void(^)(MASConstraintMaker *))block {
     return [self mas_makeConstraints:block];
 }
-- (NSArray *)updateConstraints:(void(NS_NOESCAPE ^)(MASConstraintMaker *))block {
+- (NSArray *)updateConstraints:(void(^)(MASConstraintMaker *))block {
     return [self mas_updateConstraints:block];
 }
-- (NSArray *)remakeConstraints:(void(NS_NOESCAPE ^)(MASConstraintMaker *))block {
+- (NSArray *)remakeConstraints:(void(^)(MASConstraintMaker *))block {
     return [self mas_remakeConstraints:block];
 }
-# Masonry [![Build Status](https://travis-ci.org/SnapKit/Masonry.svg?branch=master)](https://travis-ci.org/SnapKit/Masonry) [![Coverage Status](https://img.shields.io/coveralls/SnapKit/Masonry.svg?style=flat-square)](https://coveralls.io/r/SnapKit/Masonry) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) ![Pod Version](https://img.shields.io/cocoapods/v/Masonry.svg?style=flat)
+#Masonry [![Build Status](https://travis-ci.org/SnapKit/Masonry.svg?branch=master)](https://travis-ci.org/SnapKit/Masonry) [![Coverage Status](https://img.shields.io/coveralls/SnapKit/Masonry.svg?style=flat-square)](https://coveralls.io/r/SnapKit/Masonry) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) ![Pod Version](https://img.shields.io/cocoapods/v/Masonry.svg?style=flat)
 **Masonry is still actively maintained, we are committed to fixing bugs and merging good quality PRs from the wider community. However if you're using Swift in your project, we recommend using [SnapKit](https://github.com/SnapKit/SnapKit) as it provides better type safety with a simpler API.**
@@ -389,17 +389,11 @@ Get busy Masoning
 Copy the included code snippets to ``~/Library/Developer/Xcode/UserData/CodeSnippets`` to write your masonry blocks at lightning speed!
-`mas_make` -> ` [<#view#> mas_makeConstraints:^(MASConstraintMaker *make) {
-     <#code#>
- }];`
+`mas_make` -> `[<view> mas_makeConstraints:^(MASConstraintMaker *make){<code>}];`
-`mas_update` -> ` [<#view#> mas_updateConstraints:^(MASConstraintMaker *make) {
-     <#code#>
- }];`
+`mas_update` -> `[<view> mas_updateConstraints:^(MASConstraintMaker *make){<code>}];`
-`mas_remake` -> ` [<#view#> mas_remakeConstraints:^(MASConstraintMaker *make) {
-     <#code#>
- }];`
+`mas_remake` -> `[<view> mas_remakeConstraints:^(MASConstraintMaker *make){<code>}];`
 ## Features
 * Not limited to subset of Auto Layout. Anything NSLayoutConstraint can do, Masonry can do too!