0.0.6

yinqiaojuan
1 parent 34b63968
Showing 17 changed files with 439 additions and 42 deletions
CNLiveDisease.podspec
CNLiveDisease/Classes/Controller/CNLiveDiseaseDescController.h
CNLiveDisease/Classes/Controller/CNLiveDiseaseDescController.m
CNLiveDisease/Classes/Controller/CNLiveDiseaseFailedController.h
CNLiveDisease/Classes/Controller/CNLiveDiseaseFailedController.m
CNLiveDisease/Classes/Controller/CNLiveFriutViewController.m
CNLiveDisease/Classes/Controller/CNLiveSelectedViewController.m
CNLiveDisease/Classes/View/CNLiveGetImage.h
CNLiveDisease/Classes/View/CNLiveGetImage.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
 Pod::Spec.new do |s|
   s.name             = 'CNLiveDisease'
-  s.version          = '0.0.5'
+  s.version          = '0.0.6'
   s.summary          = '智慧农业部分组件化'
-# This description is used to generate tags and improve search results.
-#   * Think: What does it do? Why did you write it? What is the focus?
-#   * Try to keep it short, snappy and to the point.
-#   * Write the description between the DESC delimiters below.
-#   * Finally, don't worry about the indent, CocoaPods strips it!
-
   s.description      = <<-DESC
 TODO: Add long description of the pod here.
                        DESC
@@ -39,4 +33,5 @@ TODO: Add long description of the pod here.
    s.dependency 'CNLiveAVCamera'
    # s.dependency 'CNLiveUploadManager'
   # s.ios.vendored_library = 'CNLiveUploadManager'
+   s.dependency 'FLAnimatedImage'
 end
@@ -11,6 +11,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface CNLiveDiseaseDescController : QMUICommonViewController
+@property (strong, nonatomic) NSDictionary * dataDict;
 @end
 NS_ASSUME_NONNULL_END
@@ -6,7 +6,281 @@
 //
 #import "CNLiveDiseaseDescController.h"
+#import <WebKit/WebKit.h>
+#import <FLAnimatedImage/FLAnimatedImageView.h>
+#import <CNLiveBaseKit/CNLiveBaseKit.h>
+#import <CNLiveCommonCategory/CNLiveCommonCategory.h>
+#define MJWeakSelf __weak typeof(self) weakSelf = self;
+@interface CNLiveDiseaseDescController ()<WKNavigationDelegate,WKUIDelegate>
+{
+    WKUserContentController *userContentController;
+}
+
+@property(nonatomic, strong) WKWebView *wkwebView;
+@property (strong, nonatomic) FLAnimatedImageView * tempImageView;
+@property (strong, nonatomic) NSMutableArray * imageMutArr;
+@property (strong, nonatomic) NSMutableArray * imageArr;
+@property (strong, nonatomic) UIProgressView *progressView;//这个是加载页面的进度条
+@end
 @implementation CNLiveDiseaseDescController
+-(void)viewWillAppear:(BOOL)animated {
+    [super viewWillAppear:animated];
+    [self initProgressView];
+}
+-(void)viewDidAppear:(BOOL)animated {
+    [super viewDidAppear:animated];
+      [self.progressView removeFromSuperview];
+}
+-(void)viewDidLoad {
+    [super viewDidLoad];
+    self.title = @"诊断结果";
+    [self initWKWebView];
+}
+-(void)setDataDict:(NSDictionary *)dataDict
+{
+    _dataDict = dataDict;
+}
+#pragma mark 初始化webview
+-(void)initWKWebView
+{
+    
+    WKWebViewConfiguration * configuration = [[WKWebViewConfiguration alloc]init];//先实例化配置类 以前UIWebView的属性有的放到了这里
+    //注册供js调用的方法
+    userContentController =[[WKUserContentController alloc]init];
+    
+    configuration.userContentController = userContentController;
+    configuration.preferences.javaScriptEnabled = YES;//打开js交互
+    _wkwebView = [[WKWebView alloc] initWithFrame:CGRectMake(0, kNavigationBarHeight, KScreenWidth, KScreenHeight-kNavigationBarHeight) configuration:configuration];
+    [self.view addSubview:_wkwebView];
+    _wkwebView.backgroundColor = [UIColor whiteColor];
+    _wkwebView.allowsBackForwardNavigationGestures =YES;//打开网页间的 滑动返回
+    _wkwebView.scrollView.decelerationRate = UIScrollViewDecelerationRateNormal;
+    if (@available(iOS 9.0, *)) {
+        _wkwebView.allowsLinkPreview = NO;
+    }
+    _wkwebView.UIDelegate = self;
+    _wkwebView.navigationDelegate = self;
+    [_wkwebView addObserver:self forKeyPath:@"estimatedProgress" options:NSKeyValueObservingOptionNew context:nil];//注册observer 拿到加载进度
+    
+    MJWeakSelf
+    NSDictionary * tempDict = [_dataDict objectForKey:@"images"];
+    __block NSMutableString * imageStr = [[NSMutableString alloc] init];
+    if (tempDict) {
+        [tempDict enumerateKeysAndObjectsUsingBlock:^(id  _Nonnull key, id  _Nonnull obj, BOOL * _Nonnull stop) {
+            [weakSelf.imageMutArr addObject:[obj objectForKey:@"image"]];
+            [weakSelf.imageArr addObject:weakSelf.tempImageView];
+            [imageStr appendFormat:[weakSelf loadImageDocumentHTML],[obj objectForKey:@"image"],[obj objectForKey:@"caption"]];
+        }];
+    }else{
+        [imageStr appendString:@"<br />"];
+    }
+    
+    
+    NSMutableString * descStr = [[NSMutableString alloc] init];
+    // CNLiveStringIsEmpty([_dataDict objectForKey:@"symptom"])
+    if (![self isEmptyString:[_dataDict objectForKey:@"symptom"]]) {
+        [descStr appendFormat:[self loadDescDocumentHTML],@"症状",[_dataDict objectForKey:@"symptom"]];
+    }else{
+        [descStr appendString:@"<br />"];
+    }
+    // CNLiveStringIsEmpty([_dataDict objectForKey:@"pattern"])
+    
+    if (![self isEmptyString:[_dataDict objectForKey:@"pattern"]]) {
+        [descStr appendFormat:[self loadDescDocumentHTML],@"发病规律",[_dataDict objectForKey:@"pattern"]];
+    }else{
+        [descStr appendString:@"<br />"];
+    }
+    //CNLiveStringIsEmpty([_dataDict objectForKey:@"method"])
+    if (![self isEmptyString:[_dataDict objectForKey:@"method"]]) {
+        [descStr appendFormat:[self loadDescDocumentHTML],@"防治方法",[_dataDict objectForKey:@"method"]];
+    }else{
+        [descStr appendString:@"<br />"];
+    }
+    
+    NSString * nameStr = [NSString stringWithFormat:[self loadNameDocumentHTML],[_dataDict objectForKey:@"name"],[_dataDict objectForKey:@"introduction"]];
+    
+    NSString * htmls = [NSString stringWithFormat:[self loadDocumentHTML],nameStr,imageStr,descStr];
+    
+    [_wkwebView loadHTMLString:htmls baseURL:nil];
+}
+
+-(NSString *)loadDocumentHTML
+{
+    return @"<!DOCTYPE html>\n"
+    "<html> \n"
+    "<head> \n"
+    "<meta charset=\"utf-8\" name=\"viewport\" content=\"initial-scale=1.0, maximum-scale=1.0, user-scalable=no\"> \n"
+    "<style type=\"text/css\"> \n"
+    "body {font-weight: bold;line-height: 0 auto-pos;text-align: center;} \n"
+    "h2 {text-align: center;font-size: 30px;height: 0 auto;margin-bottom: 5px;} \n"
+    ".nameDesc {margin-left: 10px;margin-right: 10px;font-size: 15px;text-align: left;} \n"
+    ".textDesc {margin-left: 10px;margin-right: 10px;font-size: 12px;text-align: left;} \n"
+    "img {margin-bottom: 5px;margin-top: 10px;margin-left: 30px;margin-right: 30px;height: 200px;} \n"
+    ".imageDesc {color: red;font-size: 14px;text-align: center;margin-top: 5px;margin-bottom: 30px;} \n"
+    "</style> \n"
+    "</head> \n"
+    "<body> \n"
+    "%@"
+    "%@"
+    "%@"
+    "</body> \n"
+    "</html> \n";
+}
+-(NSString *)loadNameDocumentHTML
+{
+    return @"<div class=\"nameDiv\">\n"
+    "<h2>%@</h2> \n"
+    "<p class=\"nameDesc\">%@</p> \n"
+    "</div> \n";
+}
+-(NSString *)loadImageDocumentHTML
+{
+    return @"<div class=\"imageDiv\"> \n"
+    "<img src=\"%@\" /> \n"
+    "<br /> \n"
+    "<p class=\"imageDesc\">%@</p> \n"
+    "</div> \n";
+}
+-(NSString *)loadDescDocumentHTML
+{
+    return @"<div class=\"nameDiv\"> \n"
+    "<h2>%@</h2> \n"
+    "<p class=\"textDesc\">%@</p> \n"
+    "</div> \n";
+}
+#pragma mark --这个就是设置的上面的那个加载的进度
+-(void)initProgressView
+{
+    CGFloat progressBarHeight = 3.0f;
+    CGRect navigaitonBarBounds = self.navigationController.navigationBar.bounds;
+    //        CGRect barFrame = CGRectMake(0, navigaitonBarBounds.size.height - progressBarHeight-0.5, navigaitonBarBounds.size.width, progressBarHeight);
+    CGRect barFrame = CGRectMake(0, navigaitonBarBounds.size.height, navigaitonBarBounds.size.width, progressBarHeight);
+    if (!_progressView || !_progressView.superview) {
+        _progressView =[[UIProgressView alloc]initWithFrame:barFrame];
+        _progressView.tintColor = UIColorMake(0, 194, 0);
+        _progressView.trackTintColor = [UIColor clearColor];
+        
+        [self.navigationController.navigationBar addSubview:self.progressView];
+    }
+}
+//检测进度条，显示完成之后，进度条就隐藏了
+-(void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSString *,id> *)change context:(void *)context{
+    
+    if (object == self.wkwebView && [keyPath isEqualToString:@"estimatedProgress"]) {
+        CGFloat newprogress = [[change objectForKey:NSKeyValueChangeNewKey] doubleValue];
+        if (newprogress == 1) {
+            self.progressView.hidden = YES;
+            [self.progressView setProgress:0 animated:NO];
+        }else {
+            self.progressView.hidden = NO;
+            [self.progressView setProgress:newprogress animated:YES];
+        }
+    }
+}
+#pragma mark - ——————— WKNavigationDelegate ————————
+// 页面开始加载时调用
+-(void)webView:(WKWebView *)webView didStartProvisionalNavigation:(WKNavigation *)navigation{
+    [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:YES];
+}
+// 当内容开始返回时调用
+-(void)webView:(WKWebView *)webView didCommitNavigation:(WKNavigation *)navigation{
+    
+}
+// 页面加载完成之后调用
+-(void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation{
+    [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO];
+    [webView evaluateJavaScript: @"function assignImageClickAction(){var imgs=document.getElementsByTagName('img');var length=imgs.length;for(var i=0; i < length;i++){img=imgs[i];if(\"ad\" ==img.getAttribute(\"flag\")){var parent = this.parentNode;if(parent.nodeName.toLowerCase() != \"a\")return;}img.onclick=function(){window.location.href='image-preview:'+this.src}}}"
+              completionHandler: ^(id object, NSError *error) {}];
+    
+    [webView evaluateJavaScript: @"assignImageClickAction();"
+              completionHandler: ^(id object, NSError *error) {}];
+}
+- (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler{
+    
+    MJWeakSelf
+    if ([navigationAction.request.URL.scheme isEqualToString: @"image-preview"]) {
+        
+        if (self.imageMutArr.count != 0) {
+            
+            NSString* imageUrlStr = [navigationAction.request.URL.absoluteString
+                                     substringFromIndex:14];
+            
+            NSUInteger index = [self.imageMutArr indexOfObject:imageUrlStr];
+            
+//            [CNCustomImageTool sharedCNCustomImageTool].formVC = weakSelf;
+//            [[CNCustomImageTool sharedCNCustomImageTool] initWithImageArray:weakSelf.imageArr SourceUrl:self.imageMutArr SelectImageView:weakSelf.tempImageView isCollect:NO CurrentIndex:index FromVC:weakSelf];
+        }
+    }
+    decisionHandler(WKNavigationActionPolicyAllow);
+}
+// 页面加载失败时调用
+-(void)webView:(WKWebView *)webView didFailProvisionalNavigation:(WKNavigation *)navigation{
+    
+}
+-(NSMutableArray *)imageArr
+{
+    if (!_imageArr) {
+        _imageArr = [[NSMutableArray alloc] init];
+    }
+    return _imageArr;
+}
+-(NSMutableArray *)imageMutArr
+{
+    if (!_imageMutArr) {
+        _imageMutArr = [[NSMutableArray alloc] init];
+    }
+    return _imageMutArr;
+}
+-(FLAnimatedImageView *)tempImageView
+{
+    if (!_tempImageView) {
+        _tempImageView = [[FLAnimatedImageView alloc] initWithFrame: CGRectMake(KScreenWidth/2, KScreenHeight/2, 0, 0)];
+        _tempImageView.image = [UIImage imageWithColor:kBlackColor];
+    }
+    return _tempImageView;
+}
+-(void)dealloc{
+    [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO];
+    [self.wkwebView removeObserver:self forKeyPath:@"estimatedProgress"];
+    self.wkwebView.UIDelegate = nil;
+    self.wkwebView.navigationDelegate = nil;
+    [self clearWebCache];
+}
+- (void)clearWebCache {
+    if ([[UIDevice currentDevice].systemVersion floatValue] >= 9.0) {
+        
+        NSSet *websiteDataTypes = [NSSet setWithArray:@[
+                                                        WKWebsiteDataTypeDiskCache,
+                                                        //WKWebsiteDataTypeOfflineWebApplicationCache,
+                                                        //WKWebsiteDataTypeMemoryCache,
+                                                        //WKWebsiteDataTypeLocalStorage,
+                                                        //WKWebsiteDataTypeCookies,
+                                                        //WKWebsiteDataTypeSessionStorage,
+                                                        //WKWebsiteDataTypeIndexedDBDatabases,
+                                                        //WKWebsiteDataTypeWebSQLDatabases
+                                                        ]];
+        NSDate *dateFrom = [NSDate dateWithTimeIntervalSince1970:0];
+        [[WKWebsiteDataStore defaultDataStore] removeDataOfTypes:websiteDataTypes modifiedSince:dateFrom completionHandler:^{
+        }];
+    } else {
+        NSString *libraryPath = [NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSUserDomainMask, YES) objectAtIndex:0];
+        
+        NSString *cookiesFolderPath = [libraryPath stringByAppendingString:@"/Cookies"];
+        
+        NSError *errors;
+        
+        [[NSFileManager defaultManager] removeItemAtPath:cookiesFolderPath error:&errors];
+    }
+}
+
+//判断是否为空字符串
+- (BOOL)isEmptyString:(NSString *)string
+{
+    if (!string || ![string isKindOfClass:[NSString class]] || string.length == 0 || [string stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]].length == 0) {
+        return YES;
+    }
+    return NO;
+}
 @end
@@ -10,7 +10,8 @@
 NS_ASSUME_NONNULL_BEGIN
 @interface CNLiveDiseaseFailedController : QMUICommonViewController
-
+@property (nonatomic, copy) NSString *name;
+@property (nonatomic, copy) NSString *introduction;
 @end
 NS_ASSUME_NONNULL_END
@@ -6,7 +6,100 @@
 //
 #import "CNLiveDiseaseFailedController.h"
+#import <Masonry/Masonry.h>
+#import <CNLiveBaseKit/CNLiveBaseKit.h>
+#import "CNLiveGetImage.h"
+#define MJWeakSelf __weak typeof(self) weakSelf = self;
+@interface CNLiveDiseaseFailedController ()
+@property (nonatomic, strong) UIImageView * showImageV;
+@property (nonatomic, strong) UILabel *nameLabel;
+@property (nonatomic, strong) UILabel *introductionL;
+@property (nonatomic, strong) UIButton *retryBtn;
+@end
 @implementation CNLiveDiseaseFailedController
-
+-(void)viewDidLoad {
+    [super viewDidLoad];
+    self.title = @"识别错误";
+    [self setupViews];
+    self.nameLabel.text = self.name;
+    self.introductionL.text = self.introduction;
+}
+-(void)setupViews {
+    [self.view addSubview:self.showImageV];
+    [self.view addSubview:self.nameLabel];
+    [self.view addSubview:self.introductionL];
+    [self.view addSubview:self.retryBtn];
+    [self setUpLayout];
+}
+-(void)setUpLayout {
+    MJWeakSelf;
+    [_showImageV mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.mas_equalTo(weakSelf.view).offset(kNavigationBarHeight + 120);
+        make.centerX.mas_equalTo(weakSelf.view.mas_centerX);
+        make.height.with.mas_equalTo(80);
+    }];
+    [_nameLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.mas_equalTo(weakSelf.showImageV.mas_bottom).offset(35);
+        make.left.mas_equalTo(weakSelf.view.mas_left).offset(80);
+        make.right.mas_equalTo(weakSelf.view.mas_right).offset(-80);
+        make.height.mas_equalTo(16);
+    }];
+    [_introductionL mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.mas_equalTo(weakSelf.nameLabel.mas_bottom).offset(14);
+        make.left.mas_equalTo(weakSelf.view.mas_left).offset(58);
+        make.right.mas_equalTo(weakSelf.view.mas_right).offset(-58);
+    }];
+    [_retryBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.mas_equalTo(weakSelf.introductionL.mas_bottom).offset(50);
+        make.centerX.mas_equalTo(weakSelf.view.mas_centerX);
+        make.width.mas_equalTo(132);
+        make.height.mas_equalTo(45);
+    }];
+}
+-(void)retryBtnClick {
+//    [[AppDelegate sharedAppDelegate]popViewControllerWithoutAnimation];
+    [self dismissViewControllerAnimated:YES completion:nil];
+}
+-(UIImageView *)showImageV{
+    if (!_showImageV) {
+        _showImageV = [[UIImageView alloc]init];
+        _showImageV.contentMode = UIViewContentModeScaleAspectFit;
+//        _showImageV.image = [UIImage imageNamed:@"result_icon_fail"];
+        _showImageV.image = [CNLiveGetImage getImageName:[NSString stringWithFormat:@"result_icon_fail"]];
+    }
+    return _showImageV;
+}
+-(UILabel *)nameLabel {
+    if (!_nameLabel) {
+        _nameLabel = [[UILabel alloc]init];
+        _nameLabel.font = UIFontCNMake(17.0f);
+        _nameLabel.textColor = RGBA(102, 102, 102, 1);
+        _nameLabel.textAlignment = NSTextAlignmentCenter;
+    }
+    return _nameLabel;
+}
+-(UILabel *)introductionL {
+    if (!_introductionL) {
+        _introductionL = [[UILabel alloc]init];
+        _introductionL.font = UIFontCNMake(13);
+        _introductionL.textColor = RGBA(153, 153, 153, 1);
+        _introductionL.textAlignment = NSTextAlignmentCenter;
+        _introductionL.numberOfLines = 0;
+    }
+    return _introductionL;
+}
+-(UIButton *)retryBtn {
+    if (!_retryBtn) {
+        _retryBtn = [[UIButton alloc]init];
+        [_retryBtn setBackgroundColor:RGBA(35, 212, 20, 1)];
+        _retryBtn.layer.cornerRadius = 22.5 ;
+        _retryBtn.titleLabel.textColor = RGBA(255, 255, 255, 1);
+        [_retryBtn setTitle:@"再试一次" forState:UIControlStateNormal];
+        _retryBtn.titleLabel.font = [UIFont systemFontOfSize:15.0f];
+        [_retryBtn addTarget:self action:@selector(retryBtnClick) forControlEvents:UIControlEventTouchUpInside];
+        
+    }
+    return _retryBtn;
+}
 @end
@@ -10,6 +10,8 @@
 #import "CNDiseaseType.h"
 #import <CNLiveBaseKit/CNLiveBaseKit.h>
 #import <QMUIKit/QMUIKit.h>
+#import "CNLiveSelectedViewController.h"
+#import "CNLiveGetImage.h"
 static NSString *cellID = @"Cell";
 @interface CNLiveFriutViewController ()<UICollectionViewDataSource,UICollectionViewDelegate>
@@ -23,6 +25,7 @@ static NSString *cellID = @&quot;Cell&quot;;
 }
 -(void)setIndex:(NSInteger)index {
+    
     self.isAppReview = YES;
     if (index == 0) {
         [self setUpCollectionView];
@@ -77,10 +80,10 @@ static NSString *cellID = @&quot;Cell&quot;;
     if (cell ==nil) {
         cell = [[CNDiseaseViewCell alloc]init];
     }
-    //    cell.backgroundColor = [UIColor cyanColor];
+//        cell.backgroundColor = [UIColor cyanColor];
 //    cell.showImageV.image = [UIImage imageNamed:self.imageArray[indexPath.row]];
-    cell.showImageV.image = [self getImageName:self.imageArray[indexPath.row]];
-    
+    cell.showImageV.image = [CNLiveGetImage getImageName:self.imageArray[indexPath.row]];
+    NSLog(@"打印这个图片%@",self.imageArray);
     cell.titleLabel.text = self.titleArray[indexPath.row];
     return cell;
 }
@@ -92,10 +95,12 @@ static NSString *cellID = @&quot;Cell&quot;;
         [QMUITips showInfo:@"功能开发中..." inView:self.view hideAfterDelay:1.5f];
         return;
     }
-//    CNSelectedViewController *selectVc = [[CNSelectedViewController alloc]init];
-//    selectVc.titleName = self.titleArray[indexPath.row];
-//    selectVc.imageName = self.imageArray[indexPath.row];
-//    [[AppDelegate sharedAppDelegate] pushViewController:selectVc withBackTitle:@""];
+    CNLiveSelectedViewController *selectVc = [[CNLiveSelectedViewController alloc]init];
+    selectVc.titleName = self.titleArray[indexPath.row];
+    selectVc.imageName = self.imageArray[indexPath.row];
+    selectVc.view.backgroundColor = [UIColor whiteColor];
+    [self presentViewController:selectVc animated:YES completion:nil];
+//    [self.navigationController pushViewController:selectVc animated:YES];
 }
 -(void)setCNNoDataEmptyView {
@@ -103,12 +108,6 @@ 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
@@ -15,6 +15,7 @@
 #import <Masonry/Masonry.h>
 #import <CNLiveBaseKit/CNLiveBaseKit.h>
 #import <CNLiveImagePickerController/CNImagePickerManager.h>
+#import "CNLiveGetImage.h"
 #define MJWeakSelf __weak typeof(self) weakSelf = self;
 @interface CNLiveSelectedViewController () <TZImagePickerControllerDelegate>
 @property (nonatomic, strong) UIImageView *selectImageV;
@@ -150,6 +151,8 @@
 //    }];
 }
+
+
 -(void)setUpLayout {
     MJWeakSelf;
     [_backImageV mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -178,7 +181,8 @@
 -(UIButton *)photoBtn {
     if (!_photoBtn) {
         _photoBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        [_photoBtn setImage:[UIImage imageNamed:@"farming_release"] forState:UIControlStateNormal];
+//        [_photoBtn setImage:[UIImage imageNamed:@"farming_release"] forState:UIControlStateNormal];
+        [_photoBtn setImage:[CNLiveGetImage getImageName:[NSString stringWithFormat:@"farming_release"]] forState:UIControlStateNormal];
         [_photoBtn addTarget:self action:@selector(photoBtnClick) forControlEvents:UIControlEventTouchUpInside];
     }
     return _photoBtn;
@@ -186,11 +190,13 @@
 -(UIImageView *)backImageV {
     if (!_backImageV) {
         _backImageV = [[UIImageView alloc]init];
-        _backImageV.image = [UIImage imageNamed:@"farming_bg"];
+//        _backImageV.image = [UIImage imageNamed:@"farming_bg"];
+        _backImageV.image = [CNLiveGetImage getImageName:[NSString stringWithFormat:@"farming_bg"]];
         _backImageV.contentMode = UIViewContentModeScaleAspectFill;
         _backImageV.clipsToBounds = YES;
         _backImageV.userInteractionEnabled = YES;
     }
     return _backImageV;
 }
+
 @end
@@ -10,7 +10,7 @@
 NS_ASSUME_NONNULL_BEGIN
 @interface CNLiveGetImage : NSObject
-
++ (UIImage *)getImageName:(NSString *)imageName;
 @end
 NS_ASSUME_NONNULL_END
@@ -9,4 +9,13 @@
 @implementation CNLiveGetImage
++ (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
@@ -312,6 +312,7 @@
 				"${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveDisease/CNLiveDisease.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveImagePickerController/CNLiveImagePickerController.framework",
+				"${BUILT_PRODUCTS_DIR}/FLAnimatedImage/FLAnimatedImage.framework",
 				"${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework",
 				"${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework",
 				"${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework",
@@ -326,6 +327,7 @@
 				"${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}/FLAnimatedImage.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",
@@ -349,6 +351,7 @@
 				"${BUILT_PRODUCTS_DIR}/CNLiveBaseKit/CNLiveBaseKit.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveImagePickerController/CNLiveImagePickerController.framework",
+				"${BUILT_PRODUCTS_DIR}/FLAnimatedImage/FLAnimatedImage.framework",
 				"${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework",
 				"${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework",
 				"${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework",
@@ -362,6 +365,7 @@
 				"${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}/FLAnimatedImage.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",
@@ -12,12 +12,12 @@
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
-    UIWindow *window = [[UIWindow alloc]initWithFrame:[UIScreen mainScreen].bounds];
-    window.backgroundColor = [UIColor whiteColor];
-    UIViewController *vc = [[CNLiveViewController alloc]init];
-    UINavigationController *nav =[[UINavigationController alloc]initWithRootViewController:vc];
-    window.rootViewController = nav;
-      [window makeKeyAndVisible];
+//    UIWindow *window = [[UIWindow alloc]initWithFrame:[UIScreen mainScreen].bounds];
+//    window.backgroundColor = [UIColor whiteColor];
+//    UIViewController *vc = [[CNLiveViewController alloc]init];
+////    UINavigationController *nav =[[UINavigationController alloc]initWithRootViewController:vc];
+//    window.rootViewController = vc;
+//      [window makeKeyAndVisible];
     // Override point for customization after application launch.
     return YES;
 }
@@ -37,7 +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
 {
@@ -15,6 +15,7 @@ target &#39;CNLiveDisease_Example&#39; do
   pod 'CNLiveImagePickerController'
   pod 'CNLiveAVCamera'
   # pod 'CNLiveUploadManager'
+  pod 'FLAnimatedImage'
   target 'CNLiveDisease_Tests' do
     inherit! :search_paths
   pod 'CNLiveBaseKit'
@@ -24,6 +25,7 @@ target &#39;CNLiveDisease_Example&#39; do
   pod 'CNLiveImagePickerController'
   pod 'CNLiveAVCamera'
   # pod 'CNLiveUploadManager'
+  pod 'FLAnimatedImage'
   end
 end
@@ -5,14 +5,16 @@ PODS:
     - MJExtension (~> 3.0.15.1)
   - CNLiveCommonCategory (0.2.5):
     - SDWebImage (~> 4.4.2)
-  - CNLiveDisease (0.0.3):
+  - CNLiveDisease (0.0.5):
     - CNLiveAVCamera
     - CNLiveBaseKit
     - CNLiveCommonCategory
     - CNLiveImagePickerController
+    - FLAnimatedImage
     - Masonry
     - QMUIKit (~> 3.1.0)
   - CNLiveImagePickerController (0.0.2)
+  - FLAnimatedImage (1.0.12)
   - Masonry (1.0.2)
   - MJExtension (3.0.15.1)
   - QMUIKit (3.1.0):
@@ -291,6 +293,7 @@ DEPENDENCIES:
   - CNLiveCommonCategory
   - CNLiveDisease (from `../`)
   - CNLiveImagePickerController
+  - FLAnimatedImage
   - Masonry
   - QMUIKit (~> 3.1.0)
@@ -301,6 +304,7 @@ SPEC REPOS:
     - CNLiveCommonCategory
     - CNLiveImagePickerController
   https://github.com/cocoapods/specs.git:
+    - FLAnimatedImage
     - Masonry
     - MJExtension
     - QMUIKit
@@ -314,13 +318,14 @@ SPEC CHECKSUMS:
   CNLiveAVCamera: 7f3eba8eb1827f6e7a5047b0bb9f9f0bf19d1451
   CNLiveBaseKit: 09a97c3411a91270fb68bfe20a1df2cdbcd2c524
   CNLiveCommonCategory: 57cb8422ccf17ba5cc8fffe76851fa828c367d06
-  CNLiveDisease: 8d80c9163497b37cbd2838898bb7c477868a158d
+  CNLiveDisease: 021cc3d2127bf9fb4198d7e569d12b638a8e5d23
   CNLiveImagePickerController: 2be3ac0a75563f5945101ee6e0a787ad2fc15549
+  FLAnimatedImage: 4a0b56255d9b05f18b6dd7ee06871be5d3b89e31
   Masonry: 7c429b56da9d4ee0bbb3ed77a5ea710d6a5df39e
   MJExtension: 19bc33ce2eee2d319760f5622562cf581a6ff756
   QMUIKit: 33959d093f48bb64f754ad696c310887a0768c49
   SDWebImage: c5594f1a19c48d526d321e548902b56b479cd508
-PODFILE CHECKSUM: 441d26e990ff01b086d84ccbd3d0027e04e6ea1a
+PODFILE CHECKSUM: 1914bf259da01d29bb52accd3589a566adee9132
 COCOAPODS: 1.5.3
 {
   "name": "CNLiveDisease",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "summary": "智慧农业部分组件化",
   "description": "TODO: Add long description of the pod here.",
   "homepage": "http://bj.gitlab.cnlive.com/ios-team/CNLiveDisease",
@@ -13,7 +13,7 @@
   },
   "source": {
     "git": "http://bj.gitlab.cnlive.com/ios-team/CNLiveDisease.git",
-    "tag": "0.0.3"
+    "tag": "0.0.5"
   },
   "platforms": {
     "ios": "9.0"
@@ -46,6 +46,9 @@
     ],
     "CNLiveAVCamera": [
+    ],
+    "FLAnimatedImage": [
+
     ]
   }
 }
@@ -5,14 +5,16 @@ PODS:
     - MJExtension (~> 3.0.15.1)
   - CNLiveCommonCategory (0.2.5):
     - SDWebImage (~> 4.4.2)
-  - CNLiveDisease (0.0.3):
+  - CNLiveDisease (0.0.5):
     - CNLiveAVCamera
     - CNLiveBaseKit
     - CNLiveCommonCategory
     - CNLiveImagePickerController
+    - FLAnimatedImage
     - Masonry
     - QMUIKit (~> 3.1.0)
   - CNLiveImagePickerController (0.0.2)
+  - FLAnimatedImage (1.0.12)
   - Masonry (1.0.2)
   - MJExtension (3.0.15.1)
   - QMUIKit (3.1.0):
@@ -291,6 +293,7 @@ DEPENDENCIES:
   - CNLiveCommonCategory
   - CNLiveDisease (from `../`)
   - CNLiveImagePickerController
+  - FLAnimatedImage
   - Masonry
   - QMUIKit (~> 3.1.0)
@@ -301,6 +304,7 @@ SPEC REPOS:
     - CNLiveCommonCategory
     - CNLiveImagePickerController
   https://github.com/cocoapods/specs.git:
+    - FLAnimatedImage
     - Masonry
     - MJExtension
     - QMUIKit
@@ -314,13 +318,14 @@ SPEC CHECKSUMS:
   CNLiveAVCamera: 7f3eba8eb1827f6e7a5047b0bb9f9f0bf19d1451
   CNLiveBaseKit: 09a97c3411a91270fb68bfe20a1df2cdbcd2c524
   CNLiveCommonCategory: 57cb8422ccf17ba5cc8fffe76851fa828c367d06
-  CNLiveDisease: 8d80c9163497b37cbd2838898bb7c477868a158d
+  CNLiveDisease: 021cc3d2127bf9fb4198d7e569d12b638a8e5d23
   CNLiveImagePickerController: 2be3ac0a75563f5945101ee6e0a787ad2fc15549
+  FLAnimatedImage: 4a0b56255d9b05f18b6dd7ee06871be5d3b89e31
   Masonry: 7c429b56da9d4ee0bbb3ed77a5ea710d6a5df39e
   MJExtension: 19bc33ce2eee2d319760f5622562cf581a6ff756
   QMUIKit: 33959d093f48bb64f754ad696c310887a0768c49
   SDWebImage: c5594f1a19c48d526d321e548902b56b479cd508
-PODFILE CHECKSUM: 441d26e990ff01b086d84ccbd3d0027e04e6ea1a
+PODFILE CHECKSUM: 1914bf259da01d29bb52accd3589a566adee9132
 COCOAPODS: 1.5.3