修改细节

ios/JianYuIOS/JianYuIOS.xcworkspace/xcuserdata/apple.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -16,21 +16,5 @@
             stopOnStyle = "0">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "120DB225-A73C-4685-8633-F090E5E00212"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "JianYuIOS/Classes&#xff08;&#x6a21;&#x5757;&#xff09;/JYNewSearchViewController.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "897"
-            endingLineNumber = "897"
-            landmarkName = "-jsGetCipherText:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

ios/JianYuIOS/JianYuIOS/BaseClass1/GlobalData.h

@@ -18,6 +18,9 @@
 @property (nonatomic,assign)BOOL isOpen;//是否打开-启动
 @property (nonatomic,assign)BOOL isPasteLogin;//是否登录粘贴板
 
+@property (nonatomic,copy)NSString *isSkipPath;//skip图片路径
+
+
 //Plist 表相关
 
 //获取所有数据

ios/JianYuIOS/JianYuIOS/BaseClass1/GlobalData.m

@@ -62,6 +62,7 @@
     self.isReLogin = NO;
     self.isOpen = NO;
     self.isPasteLogin = NO;
+    self.isSkipPath = @"";
 }
 
 -(NSString *)getPlistPath {

ios/JianYuIOS/JianYuIOS/BaseClass1/PrefixHeader.pch

@@ -135,6 +135,10 @@ _Pragma("clang diagnostic pop")\
 //内购
 #import <StoreKit/StoreKit.h>
 
+//加载图片
+#import <SDWebImage/UIButton+WebCache.h>
+#import "UIImageView+WebCache.h"
+
 //OCR
 #import <WBOCRService/WBOCRService.h>
 #import <WBCloudReflectionFaceVerify/WBFaceVerifyCustomerService.h>
@@ -160,11 +164,11 @@ _Pragma("clang diagnostic pop")\
 
 //#define kHost @"http://web-jydev-wky.jianyu360.cn/" //王凯悦
 
-//#define kHost @"http://web-jydev-zxl.jianyu360.cn/" //张鑫磊
+#define kHost @"http://web-jydev-zxl.jianyu360.cn/" //张鑫磊
 
 //#define kHost @"http://web-jydev-xzh.jianyu360.cn/" //徐志恒
 
-#define kHost @"http://app2-jytest.jianyu360.cn/"  //测试http
+//#define kHost @"http://app2-jytest.jianyu360.cn/"  //测试http
 
 //#define kHost @"http://app-i1.jianyu360.com/"   //新正式
 

ios/JianYuIOS/JianYuIOS/Classes（模块）/JYNewExpViewController.m

@@ -98,8 +98,8 @@ NSString *const new_AesKey_3 = @"mGlAgnIBB8bx2nch";
                            @"showRedSpotOnMenu",
                            @"wxPay",
                            @"aliPay",
-                           @"skipCamera",
-                           @"skipAlbum",
+                           @"skipCameraWithParam",
+                           @"skipAlbumWithParam",
                            @"openActivityPage",
                            @"callPhone",
                            @"openOtherAppLinks",
@@ -305,10 +305,10 @@ NSString *const new_AesKey_3 = @"mGlAgnIBB8bx2nch";
         [self jsWxPay:message.body];
     }else if ([message.name isEqualToString:@"aliPay"]) {
         [self jsAliPay:message.body];
-    }else if ([message.name isEqualToString:@"skipCamera"]) {
-       [self jsSkipCamera:message.body];
-    }else if ([message.name isEqualToString:@"skipAlbum"]) {
-       [self jsSkipAlbum:message.body];
+    }else if ([message.name isEqualToString:@"skipCameraWithParam"]) {
+       [self jsSkipCameraWithParam:message.body];
+    }else if ([message.name isEqualToString:@"skipAlbumWithParam"]) {
+       [self jsSkipAlbumWithParam:message.body];
     }else if ([message.name isEqualToString:@"openActivityPage"]) {
        [self jsOpenActivityPage:message.body];
     }else if ([message.name isEqualToString:@"callPhone"]) {
@@ -820,8 +820,9 @@ NSString *const new_AesKey_3 = @"mGlAgnIBB8bx2nch";
 
 
 //拍照上传图片
--(void)jsSkipCamera:(NSDictionary *)dict {
-    
+-(void)jsSkipCameraWithParam:(NSDictionary *)dict {
+    [GlobalData shareInstance].isSkipPath = [NSString stringWithFormat:@"%@",dict[@"type"]];
+
     UIImagePickerController *picker = [[UIImagePickerController alloc] init];
     picker.delegate = self;
     picker.allowsEditing = YES;
@@ -833,8 +834,9 @@ NSString *const new_AesKey_3 = @"mGlAgnIBB8bx2nch";
     
 }
 //相册选择照片
--(void)jsSkipAlbum:(NSDictionary *)dict {
-    
+-(void)jsSkipAlbumWithParam:(NSDictionary *)dict {
+    [GlobalData shareInstance].isSkipPath = [NSString stringWithFormat:@"%@",dict[@"type"]];
+
     UIImagePickerController *picker = [[UIImagePickerController alloc] init];
     picker.delegate = self;
     picker.allowsEditing = YES;
@@ -1210,18 +1212,22 @@ NSString *const new_AesKey_3 = @"mGlAgnIBB8bx2nch";
 //上传图片
 -(void)uploadPic:(NSData *)data
 {
-    NSDictionary * body = @{@"type":@"courseFile"};
+    NSString *isPath = @"courseFile";
+    if (![[GlobalData shareInstance].isSkipPath isEqualToString:@""]) {
+        isPath = [GlobalData shareInstance].isSkipPath;
+    }
+    NSDictionary * body = @{@"type":isPath};
     AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
     //ContentType设置
     manager.responseSerializer.acceptableContentTypes = [NSSet setWithObjects:@"application/json", @"text/html",@"image/jpeg",@"image/png",@"application/octet-stream",@"text/json",@"text/plain",nil];
     manager.responseSerializer= [AFHTTPResponseSerializer serializer];
     manager.requestSerializer = [AFHTTPRequestSerializer serializer];
     manager.requestSerializer.timeoutInterval = 15.0f;
-    [manager POST:[NSString stringWithFormat:@"%@filemanage/upload",kHost] parameters:body constructingBodyWithBlock:^(id<AFMultipartFormData>  _Nonnull formData) {
+    [manager POST:[NSString stringWithFormat:@"%@jyapp/filemanage/upload",kHost] parameters:body constructingBodyWithBlock:^(id<AFMultipartFormData>  _Nonnull formData) {
         //上传的参数(上传图片，以文件流的格式)
         [formData appendPartWithFileData:data
-                                    name:@"courseFile"
-                                fileName:@"courseFile.jpeg"
+                                    name:isPath
+                                fileName:[isPath stringByAppendingFormat:@".jpeg"]
                                 mimeType:@"image/jpeg"];
     } progress:^(NSProgress * _Nonnull uploadProgress) {
         

ios/JianYuIOS/JianYuIOS/Classes（模块）/JYNewMineViewController.m

@@ -112,8 +112,8 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
                            @"showRedSpotOnMenu",
                            @"wxPay",
                            @"aliPay",
-                           @"skipCamera",
-                           @"skipAlbum",
+                           @"skipCameraWithParam",
+                           @"skipAlbumWithParam",
                            @"openActivityPage",
                            @"callPhone",
                            @"openOtherAppLinks",
@@ -321,12 +321,10 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
         [self jsWxPay:message.body];
     }else if ([message.name isEqualToString:@"aliPay"]) {
         [self jsAliPay:message.body];
-    }else if ([message.name isEqualToString:@"skipCamera"]) {
-       [self jsSkipCamera:message.body];
-    }else if ([message.name isEqualToString:@"skipAlbum"]) {
-       [self jsSkipAlbum:message.body];
-    }else if ([message.name isEqualToString:@"skipAlbum"]) {
-       [self jsSkipAlbum:message.body];
+    }else if ([message.name isEqualToString:@"skipCameraWithParam"]) {
+       [self jsSkipCameraWithParam:message.body];
+    }else if ([message.name isEqualToString:@"skipAlbumWithParam"]) {
+       [self jsSkipAlbumWithParam:message.body];
     }else if ([message.name isEqualToString:@"openActivityPage"]) {
        [self jsOpenActivityPage:message.body];
     }else if ([message.name isEqualToString:@"callPhone"]) {
@@ -845,8 +843,9 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
 
 
 //拍照上传图片
--(void)jsSkipCamera:(NSDictionary *)dict {
-    
+-(void)jsSkipCameraWithParam:(NSDictionary *)dict {
+    [GlobalData shareInstance].isSkipPath = [NSString stringWithFormat:@"%@",dict[@"type"]];
+
     UIImagePickerController *picker = [[UIImagePickerController alloc] init];
     picker.delegate = self;
     picker.allowsEditing = YES;
@@ -858,7 +857,8 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
     
 }
 //相册选择照片
--(void)jsSkipAlbum:(NSDictionary *)dict {
+-(void)jsSkipAlbumWithParam:(NSDictionary *)dict {
+    [GlobalData shareInstance].isSkipPath = [NSString stringWithFormat:@"%@",dict[@"type"]];
     
     UIImagePickerController *picker = [[UIImagePickerController alloc] init];
     picker.delegate = self;
@@ -1246,18 +1246,22 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
 //上传图片
 -(void)uploadPic:(NSData *)data
 {
-    NSDictionary * body = @{@"type":@"courseFile"};
+    NSString *isPath = @"courseFile";
+    if (![[GlobalData shareInstance].isSkipPath isEqualToString:@""]) {
+        isPath = [GlobalData shareInstance].isSkipPath;
+    }
+    NSDictionary * body = @{@"type":isPath};
     AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
     //ContentType设置
     manager.responseSerializer.acceptableContentTypes = [NSSet setWithObjects:@"application/json", @"text/html",@"image/jpeg",@"image/png",@"application/octet-stream",@"text/json",@"text/plain",nil];
     manager.responseSerializer= [AFHTTPResponseSerializer serializer];
     manager.requestSerializer = [AFHTTPRequestSerializer serializer];
     manager.requestSerializer.timeoutInterval = 15.0f;
-    [manager POST:[NSString stringWithFormat:@"%@filemanage/upload",kHost] parameters:body constructingBodyWithBlock:^(id<AFMultipartFormData>  _Nonnull formData) {
+    [manager POST:[NSString stringWithFormat:@"%@jyapp/filemanage/upload",kHost] parameters:body constructingBodyWithBlock:^(id<AFMultipartFormData>  _Nonnull formData) {
         //上传的参数(上传图片，以文件流的格式)
         [formData appendPartWithFileData:data
-                                    name:@"courseFile"
-                                fileName:@"courseFile.jpeg"
+                                    name:isPath
+                                fileName:[isPath stringByAppendingFormat:@".jpeg"]
                                 mimeType:@"image/jpeg"];
     } progress:^(NSProgress * _Nonnull uploadProgress) {
         

ios/JianYuIOS/JianYuIOS/Classes（模块）/JYNewSearchViewController.m

@@ -118,8 +118,8 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
                            @"wxPay",
                            @"aliPay",
                            @"chooseTab",
-                           @"skipCamera",
-                           @"skipAlbum",
+                           @"skipCameraWithParam",
+                           @"skipAlbumWithParam",
                            @"openActivityPage",
                            @"callPhone",
                            @"openOtherAppLinks",
@@ -333,10 +333,10 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
         [self jsAliPay:message.body];
     }else if ([message.name isEqualToString:@"chooseTab"]) {
         [self jsChooseTab:message.body];
-    }else if ([message.name isEqualToString:@"skipCamera"]) {
-       [self jsSkipCamera:message.body];
-    }else if ([message.name isEqualToString:@"skipAlbum"]) {
-       [self jsSkipAlbum:message.body];
+    }else if ([message.name isEqualToString:@"skipCameraWithParam"]) {
+       [self jsSkipCameraWithParam:message.body];
+    }else if ([message.name isEqualToString:@"skipAlbumWithParam"]) {
+       [self jsSkipAlbumWithParam:message.body];
     }else if ([message.name isEqualToString:@"openActivityPage"]) {
        [self jsOpenActivityPage:message.body];
     }else if ([message.name isEqualToString:@"callPhone"]) {
@@ -1106,8 +1106,9 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
 }
 
 //拍照上传图片
--(void)jsSkipCamera:(NSDictionary *)dict {
-    
+-(void)jsSkipCameraWithParam:(NSDictionary *)dict {
+    [GlobalData shareInstance].isSkipPath = [NSString stringWithFormat:@"%@",dict[@"type"]];
+
     UIImagePickerController *picker = [[UIImagePickerController alloc] init];
     picker.delegate = self;
     picker.allowsEditing = YES;
@@ -1119,8 +1120,9 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
     
 }
 //相册选择照片
--(void)jsSkipAlbum:(NSDictionary *)dict {
-    
+-(void)jsSkipAlbumWithParam:(NSDictionary *)dict {
+    [GlobalData shareInstance].isSkipPath = [NSString stringWithFormat:@"%@",dict[@"type"]];
+
     UIImagePickerController *picker = [[UIImagePickerController alloc] init];
     picker.delegate = self;
     picker.allowsEditing = YES;
@@ -1609,18 +1611,22 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
 //上传图片
 -(void)uploadPic:(NSData *)data
 {
-    NSDictionary * body = @{@"type":@"courseFile"};
+    NSString *isPath = @"courseFile";
+    if (![[GlobalData shareInstance].isSkipPath isEqualToString:@""]) {
+        isPath = [GlobalData shareInstance].isSkipPath;
+    }
+    NSDictionary * body = @{@"type":isPath};
     AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
     //ContentType设置
     manager.responseSerializer.acceptableContentTypes = [NSSet setWithObjects:@"application/json", @"text/html",@"image/jpeg",@"image/png",@"application/octet-stream",@"text/json",@"text/plain",nil];
     manager.responseSerializer= [AFHTTPResponseSerializer serializer];
     manager.requestSerializer = [AFHTTPRequestSerializer serializer];
     manager.requestSerializer.timeoutInterval = 15.0f;
-    [manager POST:[NSString stringWithFormat:@"%@filemanage/upload",kHost] parameters:body constructingBodyWithBlock:^(id<AFMultipartFormData>  _Nonnull formData) {
+    [manager POST:[NSString stringWithFormat:@"%@jyapp/filemanage/upload",kHost] parameters:body constructingBodyWithBlock:^(id<AFMultipartFormData>  _Nonnull formData) {
         //上传的参数(上传图片，以文件流的格式)
         [formData appendPartWithFileData:data
-                                    name:@"courseFile"
-                                fileName:@"courseFile.jpeg"
+                                    name:isPath
+                                fileName:[isPath stringByAppendingFormat:@".jpeg"]
                                 mimeType:@"image/jpeg"];
     } progress:^(NSProgress * _Nonnull uploadProgress) {
         
@@ -1642,13 +1648,10 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
         
         NSLog(@"上传失败%@",error);
         [self uploadUrl:@""];
-        
         [[GlobalData shareInstance] addOnePlistData:@{
             @"detail":@"上传图片接口",
             @"reqTime":[NSNumber numberWithInt:0],
         }];
-        
-        
     }];
     
     

ios/JianYuIOS/JianYuIOS/Classes（模块）/JYNewSubViewController.m

@@ -107,8 +107,8 @@ NSString *const new_AesKey_2 = @"mGlAgnIBB8bx2nch";
                            @"showRedSpotOnMenu",
                            @"wxPay",
                            @"aliPay",
-                           @"skipCamera",
-                           @"skipAlbum",
+                           @"skipCameraWithParam",
+                           @"skipAlbumWithParam",
                            @"openActivityPage",
                            @"callPhone",
                            @"openOtherAppLinks",
@@ -309,10 +309,10 @@ NSString *const new_AesKey_2 = @"mGlAgnIBB8bx2nch";
         [self jsWxPay:message.body];
     }else if ([message.name isEqualToString:@"aliPay"]) {
         [self jsAliPay:message.body];
-    }else if ([message.name isEqualToString:@"skipCamera"]) {
-       [self jsSkipCamera:message.body];
-    }else if ([message.name isEqualToString:@"skipAlbum"]) {
-       [self jsSkipAlbum:message.body];
+    }else if ([message.name isEqualToString:@"skipCameraWithParam"]) {
+       [self jsSkipCameraWithParam:message.body];
+    }else if ([message.name isEqualToString:@"skipAlbumWithParam"]) {
+       [self jsSkipAlbumWithParam:message.body];
     }else if ([message.name isEqualToString:@"openActivityPage"]) {
        [self jsOpenActivityPage:message.body];
     }else if ([message.name isEqualToString:@"callPhone"]) {
@@ -833,8 +833,9 @@ NSString *const new_AesKey_2 = @"mGlAgnIBB8bx2nch";
 
 
 //拍照上传图片
--(void)jsSkipCamera:(NSDictionary *)dict {
-    
+-(void)jsSkipCameraWithParam:(NSDictionary *)dict {
+    [GlobalData shareInstance].isSkipPath = [NSString stringWithFormat:@"%@",dict[@"type"]];
+
     UIImagePickerController *picker = [[UIImagePickerController alloc] init];
     picker.delegate = self;
     picker.allowsEditing = YES;
@@ -846,8 +847,9 @@ NSString *const new_AesKey_2 = @"mGlAgnIBB8bx2nch";
     
 }
 //相册选择照片
--(void)jsSkipAlbum:(NSDictionary *)dict {
-    
+-(void)jsSkipAlbumWithParam:(NSDictionary *)dict {
+    [GlobalData shareInstance].isSkipPath = [NSString stringWithFormat:@"%@",dict[@"type"]];
+
     UIImagePickerController *picker = [[UIImagePickerController alloc] init];
     picker.delegate = self;
     picker.allowsEditing = YES;
@@ -1225,18 +1227,22 @@ NSString *const new_AesKey_2 = @"mGlAgnIBB8bx2nch";
 //上传图片
 -(void)uploadPic:(NSData *)data
 {
-    NSDictionary * body = @{@"type":@"courseFile"};
+    NSString *isPath = @"courseFile";
+    if (![[GlobalData shareInstance].isSkipPath isEqualToString:@""]) {
+        isPath = [GlobalData shareInstance].isSkipPath;
+    }
+    NSDictionary * body = @{@"type":isPath};
     AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
     //ContentType设置
     manager.responseSerializer.acceptableContentTypes = [NSSet setWithObjects:@"application/json", @"text/html",@"image/jpeg",@"image/png",@"application/octet-stream",@"text/json",@"text/plain",nil];
     manager.responseSerializer= [AFHTTPResponseSerializer serializer];
     manager.requestSerializer = [AFHTTPRequestSerializer serializer];
     manager.requestSerializer.timeoutInterval = 15.0f;
-    [manager POST:[NSString stringWithFormat:@"%@filemanage/upload",kHost] parameters:body constructingBodyWithBlock:^(id<AFMultipartFormData>  _Nonnull formData) {
+    [manager POST:[NSString stringWithFormat:@"%@jyapp/filemanage/upload",kHost] parameters:body constructingBodyWithBlock:^(id<AFMultipartFormData>  _Nonnull formData) {
         //上传的参数(上传图片，以文件流的格式)
         [formData appendPartWithFileData:data
-                                    name:@"courseFile"
-                                fileName:@"courseFile.jpeg"
+                                    name:isPath
+                                fileName:[isPath stringByAppendingFormat:@".jpeg"]
                                 mimeType:@"image/jpeg"];
     } progress:^(NSProgress * _Nonnull uploadProgress) {
         

ios/JianYuIOS/JianYuIOS/tool/ZKClipboardView.m

@@ -35,7 +35,7 @@
         
         UIView *contentView = [ZKControl createViewWithFrame:CGRectMake(0, 40, self.width, self.height-90) color:[UIColor whiteColor]];
         contentView.layer.masksToBounds = YES;
-        contentView.layer.cornerRadius = 10;
+        contentView.layer.cornerRadius = 8;
         [self addSubview:contentView];
         
         UIImageView *imageV = [ZKControl createImageViewFrame:CGRectMake(20, 20, 55, 55) imageName:@""];
@@ -49,12 +49,12 @@
         [contentView addSubview:titleLabel];
         self.titleLabel = titleLabel;
         
-        UILabel *subtitleLabel = [ZKControl createLabelWithFrame:CGRectMake(imageV.right+10, titleLabel.bottom+2, titleLabel.width, 25) font:13 text:@"" TextAlignment:NSTextAlignmentLeft TextColor:UIColorFromRGB(0x5F5E64) bgColor:nil];
+        UILabel *subtitleLabel = [ZKControl createLabelWithFrame:CGRectMake(imageV.right+10, titleLabel.bottom+3, titleLabel.width, 25) font:13 text:@"" TextAlignment:NSTextAlignmentLeft TextColor:UIColorFromRGB(0x5F5E64) bgColor:nil];
         [contentView addSubview:subtitleLabel];
         self.subtitleLabel = subtitleLabel;
         
         UIButton *button = [ZKControl createButtonWithFrame:CGRectMake(20, imageV.bottom+25, self.width-40, 40) title:@"" titleColor:UIColorFromRGB(0xF7F9FA) titleFont:15 imageName:nil bgImageName:nil target:self method:@selector(doneClick)];
-        button.layer.cornerRadius = 5;
+        button.layer.cornerRadius = 4;
         button.layer.masksToBounds = YES;
         button.backgroundColor = UIColorFromRGB(0x2ABED1);
         [contentView addSubview:button];
@@ -95,10 +95,7 @@
 }
 - (void)setImgUrl:(NSString *)imgUrl {
     _imgUrl = imgUrl;
-    NSURL *photourl = [NSURL URLWithString:[NSString stringWithFormat:@"%@%@",kHost,imgUrl]];
-    //url请求实在UI主线程中进行的
-    UIImage *images = [UIImage imageWithData:[NSData dataWithContentsOfURL:photourl]];//通过网络url获取uiimage
-    self.iconImageV.image = images;
+    [self.iconImageV sd_setImageWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@%@",kHost,imgUrl]] placeholderImage:[UIImage imageNamed:@"logo.png"]];
     
 }
 - (void)setAppUrl:(NSString *)appUrl {

ios/JianYuIOS/Podfile

@@ -8,7 +8,7 @@ pod 'UMengUShare/Social/ReducedWeChat'
 pod 'UMengUShare/Social/ReducedQQ'
 pod 'FMDB'
 pod 'WechatOpenSDK'
-
+pod 'SDWebImage'
 
 pod 'WBCloudReflectionFaceVerify_framework', :path => './WBCloudReflectionFaceVerify_framework'
 pod 'WBOCRService',:path => './OCR_private_pod' # 引入 OCR SDK

ios/JianYuIOS/Podfile.lock

@@ -21,6 +21,9 @@ PODS:
   - JPush (3.0.8):
     - JCore (~> 1.1.7)
   - MBProgressHUD (1.1.0)
+  - SDWebImage (5.8.4):
+    - SDWebImage/Core (= 5.8.4)
+  - SDWebImage/Core (5.8.4)
   - UMengUShare/Core (6.4.8.1):
     - UMengUShare/Network
   - UMengUShare/Network (6.4.8.1)
@@ -41,6 +44,7 @@ DEPENDENCIES:
   - FMDB
   - JPush
   - MBProgressHUD
+  - SDWebImage
   - UMengUShare/Social/ReducedQQ
   - UMengUShare/Social/ReducedWeChat
   - UMengUShare/UI
@@ -57,6 +61,8 @@ SPEC REPOS:
     - MBProgressHUD
     - UMengUShare
     - WechatOpenSDK
+  trunk:
+    - SDWebImage
 
 EXTERNAL SOURCES:
   WBCloudReflectionFaceVerify_framework:
@@ -70,11 +76,12 @@ SPEC CHECKSUMS:
   JCore: f7459c81c135281a874a6beafdd321666adcc834
   JPush: 9574d072cc37e93fa293ba69b43ce763c440943a
   MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9
+  SDWebImage: cf6922231e95550934da2ada0f20f2becf2ceba9
   UMengUShare: 9e2d22f32aeaf09702ca833ec530895aab995c4f
   WBCloudReflectionFaceVerify_framework: d7273337593c0c67b875a113bd0efd0ca056ae6b
   WBOCRService: 9c6b112d975e79aea9f2684681a72b84d7e0242a
   WechatOpenSDK: 676feec516a11173eafd1fe64b10d27babf28701
 
-PODFILE CHECKSUM: e8525ac83104f45cc97a36b9f8079cafc8469388
+PODFILE CHECKSUM: ec35b53bd6b234ef03976f51697c19693aa2b16b
 
 COCOAPODS: 1.9.1

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/NSBezierPath+SDRoundedCorners.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Private/NSBezierPath+SDRoundedCorners.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/NSButton+WebCache.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/NSButton+WebCache.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/NSData+ImageContentType.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/NSData+ImageContentType.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/NSImage+Compatibility.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/NSImage+Compatibility.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDAnimatedImage.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDAnimatedImage.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDAnimatedImagePlayer.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDAnimatedImagePlayer.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDAnimatedImageRep.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDAnimatedImageRep.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDAnimatedImageView+WebCache.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDAnimatedImageView+WebCache.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDAnimatedImageView.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDAnimatedImageView.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDAssociatedObject.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Private/SDAssociatedObject.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDAsyncBlockOperation.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Private/SDAsyncBlockOperation.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDDeviceHelper.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Private/SDDeviceHelper.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDDiskCache.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDDiskCache.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDDisplayLink.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Private/SDDisplayLink.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDFileAttributeHelper.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Private/SDFileAttributeHelper.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDGraphicsImageRenderer.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDGraphicsImageRenderer.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDImageAPNGCoder.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDImageAPNGCoder.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDImageAssetManager.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Private/SDImageAssetManager.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDImageCache.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDImageCache.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDImageCacheConfig.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDImageCacheConfig.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDImageCacheDefine.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDImageCacheDefine.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDImageCachesManager.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDImageCachesManager.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDImageCachesManagerOperation.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Private/SDImageCachesManagerOperation.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDImageCoder.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDImageCoder.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDImageCoderHelper.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDImageCoderHelper.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDImageCodersManager.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDImageCodersManager.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDImageFrame.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDImageFrame.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDImageGIFCoder.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDImageGIFCoder.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDImageGraphics.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDImageGraphics.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDImageHEICCoder.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDImageHEICCoder.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDImageHEICCoderInternal.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Private/SDImageHEICCoderInternal.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDImageIOAnimatedCoder.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDImageIOAnimatedCoder.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDImageIOAnimatedCoderInternal.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Private/SDImageIOAnimatedCoderInternal.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDImageIOCoder.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDImageIOCoder.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDImageLoader.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDImageLoader.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDImageLoadersManager.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDImageLoadersManager.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDImageTransformer.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDImageTransformer.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDInternalMacros.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Private/SDInternalMacros.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDMemoryCache.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDMemoryCache.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDWeakProxy.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Private/SDWeakProxy.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDWebImage.h

@@ -0,0 +1 @@
+../../../SDWebImage/WebImage/SDWebImage.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDWebImageCacheKeyFilter.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDWebImageCacheKeyFilter.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDWebImageCacheSerializer.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDWebImageCacheSerializer.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDWebImageCompat.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDWebImageCompat.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDWebImageDefine.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDWebImageDefine.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDWebImageDownloader.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDWebImageDownloader.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDWebImageDownloaderConfig.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDWebImageDownloaderConfig.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDWebImageDownloaderDecryptor.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDWebImageDownloaderDecryptor.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDWebImageDownloaderOperation.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDWebImageDownloaderOperation.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDWebImageDownloaderRequestModifier.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDWebImageDownloaderRequestModifier.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDWebImageDownloaderResponseModifier.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDWebImageDownloaderResponseModifier.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDWebImageError.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDWebImageError.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDWebImageIndicator.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDWebImageIndicator.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDWebImageManager.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDWebImageManager.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDWebImageOperation.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDWebImageOperation.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDWebImageOptionsProcessor.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDWebImageOptionsProcessor.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDWebImagePrefetcher.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDWebImagePrefetcher.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDWebImageTransition.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDWebImageTransition.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDWebImageTransitionInternal.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Private/SDWebImageTransitionInternal.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/SDmetamacros.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Private/SDmetamacros.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/UIButton+WebCache.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/UIButton+WebCache.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/UIColor+SDHexString.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Private/UIColor+SDHexString.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/UIImage+ExtendedCacheData.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/UIImage+ExtendedCacheData.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/UIImage+ForceDecode.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/UIImage+ForceDecode.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/UIImage+GIF.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/UIImage+GIF.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/UIImage+MemoryCacheCost.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/UIImage+MemoryCacheCost.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/UIImage+Metadata.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/UIImage+Metadata.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/UIImage+MultiFormat.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/UIImage+MultiFormat.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/UIImage+Transform.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/UIImage+Transform.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/UIImageView+HighlightedWebCache.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/UIImageView+HighlightedWebCache.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/UIImageView+WebCache.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/UIImageView+WebCache.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/UIView+WebCache.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/UIView+WebCache.h

ios/JianYuIOS/Pods/Headers/Private/SDWebImage/UIView+WebCacheOperation.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/UIView+WebCacheOperation.h

ios/JianYuIOS/Pods/Headers/Public/SDWebImage/NSButton+WebCache.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/NSButton+WebCache.h

ios/JianYuIOS/Pods/Headers/Public/SDWebImage/NSData+ImageContentType.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/NSData+ImageContentType.h

ios/JianYuIOS/Pods/Headers/Public/SDWebImage/NSImage+Compatibility.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/NSImage+Compatibility.h

ios/JianYuIOS/Pods/Headers/Public/SDWebImage/SDAnimatedImage.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDAnimatedImage.h

ios/JianYuIOS/Pods/Headers/Public/SDWebImage/SDAnimatedImagePlayer.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDAnimatedImagePlayer.h

ios/JianYuIOS/Pods/Headers/Public/SDWebImage/SDAnimatedImageRep.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDAnimatedImageRep.h

ios/JianYuIOS/Pods/Headers/Public/SDWebImage/SDAnimatedImageView+WebCache.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDAnimatedImageView+WebCache.h

ios/JianYuIOS/Pods/Headers/Public/SDWebImage/SDAnimatedImageView.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDAnimatedImageView.h

ios/JianYuIOS/Pods/Headers/Public/SDWebImage/SDDiskCache.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDDiskCache.h

ios/JianYuIOS/Pods/Headers/Public/SDWebImage/SDGraphicsImageRenderer.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDGraphicsImageRenderer.h

ios/JianYuIOS/Pods/Headers/Public/SDWebImage/SDImageAPNGCoder.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDImageAPNGCoder.h

ios/JianYuIOS/Pods/Headers/Public/SDWebImage/SDImageCache.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDImageCache.h

ios/JianYuIOS/Pods/Headers/Public/SDWebImage/SDImageCacheConfig.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDImageCacheConfig.h

ios/JianYuIOS/Pods/Headers/Public/SDWebImage/SDImageCacheDefine.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDImageCacheDefine.h

ios/JianYuIOS/Pods/Headers/Public/SDWebImage/SDImageCachesManager.h

@@ -0,0 +1 @@
+../../../SDWebImage/SDWebImage/Core/SDImageCachesManager.h