查看合同的PDF显示

HappyWork/HappyWork.xcodeproj/project.pbxproj

@@ -96,6 +96,8 @@
 		71382916233A1E30007256F4 /* HWProgressHUD.m in Sources */ = {isa = PBXBuildFile; fileRef = 71382915233A1E30007256F4 /* HWProgressHUD.m */; };
 		713DE88323715A3200E0E5EA /* DemanHallEmptyCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 713DE88223715A3200E0E5EA /* DemanHallEmptyCell.m */; };
 		713E8DB02372662400EE66DC /* HWUpdateView.m in Sources */ = {isa = PBXBuildFile; fileRef = 713E8DAF2372662400EE66DC /* HWUpdateView.m */; };
+		714662B423A7783A004FBF7D /* NSObject+AutoCancelRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 714662B323A7783A004FBF7D /* NSObject+AutoCancelRequest.m */; };
+		714959EA23A9E4FB0070601D /* pdfjs in Resources */ = {isa = PBXBuildFile; fileRef = 714959E923A9E4FB0070601D /* pdfjs */; };
 		714D38D7238B7B80001E151A /* BaseWKWebView.m in Sources */ = {isa = PBXBuildFile; fileRef = 714D38D6238B7B80001E151A /* BaseWKWebView.m */; };
 		715DB801237401490042BFF6 /* 用户注册协议.html in Resources */ = {isa = PBXBuildFile; fileRef = 715DB800237401490042BFF6 /* 用户注册协议.html */; };
 		71A3B094234D6CB4004D73A5 /* DemanHallDetailSignUpView.m in Sources */ = {isa = PBXBuildFile; fileRef = 71A3B093234D6CB4004D73A5 /* DemanHallDetailSignUpView.m */; };
@@ -309,6 +311,9 @@
 		713DE88223715A3200E0E5EA /* DemanHallEmptyCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DemanHallEmptyCell.m; sourceTree = "<group>"; };
 		713E8DAE2372662400EE66DC /* HWUpdateView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HWUpdateView.h; sourceTree = "<group>"; };
 		713E8DAF2372662400EE66DC /* HWUpdateView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HWUpdateView.m; sourceTree = "<group>"; };
+		714662B223A7783A004FBF7D /* NSObject+AutoCancelRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSObject+AutoCancelRequest.h"; sourceTree = "<group>"; };
+		714662B323A7783A004FBF7D /* NSObject+AutoCancelRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSObject+AutoCancelRequest.m"; sourceTree = "<group>"; };
+		714959E923A9E4FB0070601D /* pdfjs */ = {isa = PBXFileReference; lastKnownFileType = folder; path = pdfjs; sourceTree = "<group>"; };
 		714D38D5238B7B80001E151A /* BaseWKWebView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BaseWKWebView.h; sourceTree = "<group>"; };
 		714D38D6238B7B80001E151A /* BaseWKWebView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BaseWKWebView.m; sourceTree = "<group>"; };
 		715DB800237401490042BFF6 /* 用户注册协议.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "用户注册协议.html"; sourceTree = "<group>"; };
@@ -626,6 +631,7 @@
 			isa = PBXGroup;
 			children = (
 				715DB800237401490042BFF6 /* 用户注册协议.html */,
+				714959E923A9E4FB0070601D /* pdfjs */,
 				712AF728233372FE00EBD542 /* HJCityPickerViewControllerSource.bundle */,
 			);
 			path = Resource;
@@ -1118,6 +1124,7 @@
 		7138290D233A1B09007256F4 /* AFHttpTool */ = {
 			isa = PBXGroup;
 			children = (
+				714662B123A7783A004FBF7D /* YRAutoCancelRequest */,
 				7138290E233A1B09007256F4 /* HWAFHttpTool.h */,
 				7138290F233A1B09007256F4 /* HWAFHttpTool.m */,
 			);
@@ -1151,6 +1158,15 @@
 			path = ProgressHUD;
 			sourceTree = "<group>";
 		};
+		714662B123A7783A004FBF7D /* YRAutoCancelRequest */ = {
+			isa = PBXGroup;
+			children = (
+				714662B223A7783A004FBF7D /* NSObject+AutoCancelRequest.h */,
+				714662B323A7783A004FBF7D /* NSObject+AutoCancelRequest.m */,
+			);
+			path = YRAutoCancelRequest;
+			sourceTree = "<group>";
+		};
 		71FA53C92330C6780007094A = {
 			isa = PBXGroup;
 			children = (
@@ -1340,6 +1356,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				71FA53E22330C6780007094A /* LaunchScreen.storyboard in Resources */,
+				714959EA23A9E4FB0070601D /* pdfjs in Resources */,
 				712AF729233372FE00EBD542 /* HJCityPickerViewControllerSource.bundle in Resources */,
 				715DB801237401490042BFF6 /* 用户注册协议.html in Resources */,
 				71FA53DF2330C6780007094A /* Assets.xcassets in Resources */,
@@ -1527,6 +1544,7 @@
 				713828EF2339DC31007256F4 /* RegisterAgreementViewController.m in Sources */,
 				712AF7472334660B00EBD542 /* DemanHallPriceCell.m in Sources */,
 				71A3B0A7234DD9F0004D73A5 /* PaymentRecordModel.m in Sources */,
+				714662B423A7783A004FBF7D /* NSObject+AutoCancelRequest.m in Sources */,
 				712AF6F62333124400EBD542 /* MyLog.m in Sources */,
 				713828C02338AE07007256F4 /* HWRefreshFooterView.m in Sources */,
 				713829022339E964007256F4 /* ValuePickerView.m in Sources */,

HappyWork/HappyWork.xcodeproj/xcshareddata/xcschemes/HappyWork.xcscheme

@@ -73,7 +73,7 @@
       <EnvironmentVariables>
          <EnvironmentVariable
             key = "OS_ACTIVITY_MODE"
-            value = "disable"
+            value = ""
             isEnabled = "YES">
          </EnvironmentVariable>
       </EnvironmentVariables>

HappyWork/HappyWork/API/AFHttpTool/HWAFHttpTool.m

@@ -7,6 +7,7 @@
 //
 
 #import "HWAFHttpTool.h"
+#import "NSObject+AutoCancelRequest.h"
 
 static NSInteger const timeoutInterval = 20;
 
@@ -14,6 +15,10 @@ static AFHTTPSessionManager *Photomanager;
 
 @implementation HWAFHttpTool
 
+- (void)dealloc {
+
+//    DDLogDebug(@"--===---===-----===---==--=-");
+}
 /**字典转成Json字符串*/
 + (NSString*)dictionaryToJson:(NSDictionary *)dic
 {
@@ -47,6 +52,8 @@ static AFHTTPSessionManager *Photomanager;
  */
 + (void)getRequestWithURLStr:(NSString *)urlStr params:(NSDictionary *)params success:(void (^)(NSDictionary * responseDic))success failure:(void(^)(NSString* error))failure
 {
+    
+    __weak typeof(self) weakSelf = self;
     [UIApplication sharedApplication].networkActivityIndicatorVisible = YES;
     
     AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
@@ -54,7 +61,6 @@ static AFHTTPSessionManager *Photomanager;
     manager.requestSerializer = [AFJSONRequestSerializer serializer];
     manager.responseSerializer = [AFHTTPResponseSerializer serializer];
     [manager.requestSerializer setValue:@"application/json" forHTTPHeaderField:@"Content-Type"];
-//    manager.responseSerializer = [AFHTTPResponseSerializer serializer];
 
     NSString *newPath = [NSString stringWithFormat:@"%@",urlStr];
     
@@ -74,9 +80,10 @@ static AFHTTPSessionManager *Photomanager;
     } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
       
         [UIApplication sharedApplication].networkActivityIndicatorVisible = NO;
-        [self requestFailure:failure error:error];
+        [weakSelf requestFailure:failure error:error];
         
     }];
+//    [self autoCancelRequestOnDealloc:manager];
 }
 
 /*
@@ -85,6 +92,7 @@ static AFHTTPSessionManager *Photomanager;
  */
 + (void)postRequestWithURLStr:(NSString *)urlStr params:(NSDictionary *)params success:(void (^)(NSDictionary * responseDic))success failure:(void(^)(NSString* error))failure
 {
+    __weak typeof(self) weakSelf = self;
     dispatch_async(dispatch_get_main_queue(), ^{
         
         [UIApplication sharedApplication].networkActivityIndicatorVisible = YES;
@@ -92,15 +100,9 @@ static AFHTTPSessionManager *Photomanager;
     AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
     manager.requestSerializer.timeoutInterval = timeoutInterval;
     
-    //调出请求头
-    
-//    manager.responseSerializer = [AFJSONResponseSerializer serializer];
-    
-//    [manager.requestSerializer setValue:@"application/json" forHTTPHeaderField:@"Content-Type"];
     [manager.requestSerializer setValue:@"application/json" forHTTPHeaderField:@"Accept"];
-//    manager.responseSerializer.acceptableContentTypes = [NSSet setWithObjects:@"application/json", @"text/json", @"text/javascript",@"text/html",@"text/plain", nil];
-    
-   manager.requestSerializer = [AFJSONRequestSerializer serializer];
+
+    manager.requestSerializer = [AFJSONRequestSerializer serializer];
     NSString *newPath = [NSString stringWithFormat:@"%@",urlStr];
     [manager POST:newPath parameters:params constructingBodyWithBlock:^(id  _Nonnull formData) {
         
@@ -119,9 +121,9 @@ static AFHTTPSessionManager *Photomanager;
     } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
         
         [UIApplication sharedApplication].networkActivityIndicatorVisible = NO;
-        [self requestFailure:failure error:error];
-
+        [weakSelf requestFailure:failure error:error];
     }];
+//    [self autoCancelRequestOnDealloc:manager];
 }
 /*
  *  postJSON请求
@@ -129,6 +131,7 @@ static AFHTTPSessionManager *Photomanager;
  */
 + (void)postJSONRequestWithURLStr:(NSString *)urlStr params:(NSDictionary *)params success:(void (^)(NSDictionary * responseDic))success failure:(void(^)(NSString* error))failure {
     
+    __weak typeof(self) weakSelf = self;
     [UIApplication sharedApplication].networkActivityIndicatorVisible = YES;
     AFURLSessionManager *manager = [[AFURLSessionManager alloc] initWithSessionConfiguration:[NSURLSessionConfiguration defaultSessionConfiguration]];
     NSMutableURLRequest *request = [[AFJSONRequestSerializer serializer] requestWithMethod:@"POST" URLString:urlStr parameters:params error:nil];
@@ -153,11 +156,11 @@ static AFHTTPSessionManager *Photomanager;
         else
         {
             [UIApplication sharedApplication].networkActivityIndicatorVisible = NO;
-            [self requestFailure:failure error:error];
+            [weakSelf requestFailure:failure error:error];
         }
-        
     }];
     [task resume];
+//    [self autoCancelRequestOnDealloc:manager];
 }
 
 /*
@@ -165,6 +168,7 @@ static AFHTTPSessionManager *Photomanager;
  */
 + (void)postRequestWithURLStr:(NSString *)urlStr params:(NSDictionary *)params ImageDataArray:(NSMutableArray *)imageArray IsSingleImg:(BOOL)isSingle success:(void (^)(NSDictionary * responseDic))success failure:(void(^)(NSString* error))failure
 {
+    __weak typeof(self) weakSelf = self;
     [UIApplication sharedApplication].networkActivityIndicatorVisible = YES;
     AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
     manager.responseSerializer = [AFHTTPResponseSerializer serializer];
@@ -200,17 +204,18 @@ static AFHTTPSessionManager *Photomanager;
         }
         
     } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
-        [UIApplication sharedApplication].networkActivityIndicatorVisible = NO;
-        
-        [self requestFailure:failure error:error];
         
+        [UIApplication sharedApplication].networkActivityIndicatorVisible = NO;
+        [weakSelf requestFailure:failure error:error];
     }];
+//    [self autoCancelRequestOnDealloc:manager];
 }
 
 #pragma mark - 上传图片
 
 + (void)uploadImage:(UIImage *)successImage URL:(NSString *)URLString parameters:(id)parameters success:(void (^)(id responseDic))complete
 {
+    
     AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
     manager.responseSerializer = [AFHTTPResponseSerializer serializer];
     
@@ -226,13 +231,11 @@ static AFHTTPSessionManager *Photomanager;
             imgWidth = successImage.size.width/4;
             imgHieght = successImage.size.height/4;
         }
-        
         if(imgWidth >= 1000)
         {
             imgWidth = successImage.size.width/3;
             imgHieght = successImage.size.height/3;
         }
-        
     }
     else     //宽 < 高
     {
@@ -241,7 +244,6 @@ static AFHTTPSessionManager *Photomanager;
             imgWidth = successImage.size.width/5;
             imgHieght = successImage.size.height/5;
         }
-        
         if (imgHieght >= 1500)
         {
             imgWidth = successImage.size.width/3;
@@ -249,7 +251,6 @@ static AFHTTPSessionManager *Photomanager;
         }
     }
     
-    
     UIImage * compressImg = [self imageWithImageSimple:successImage scaledToSize:CGSizeMake(imgWidth, imgHieght)];
     
     DDLogDebug(@"原本尺寸:(%f,%f)   裁剪尺寸:(%f,%f)",successImage.size.width,successImage.size.height,imgWidth,imgHieght);
@@ -284,6 +285,7 @@ static AFHTTPSessionManager *Photomanager;
         [HWProgressHUD fb_dismiss];
         DDLogDebug(@"%@",error);
     }];
+//    [self autoCancelRequestOnDealloc:manager];
 }
 
 //压缩图片

HappyWork/HappyWork/API/AFHttpTool/YRAutoCancelRequest/NSObject+AutoCancelRequest.h

@@ -0,0 +1,23 @@
+//
+//  NSObject+AutoCancelRequest.m
+//
+//  Created by YueRuo on 2017/3/3.
+//  Copyright © 2017年 YueRuo. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+/*!
+ *	@brief	help to auto cancel request when vc or manager destoryed
+ *
+ */
+@interface NSObject (AutoCancelRequest)
+
+/*!
+ *	@brief  add request to auto cancel when obj dealloc
+ *  @note   will call request's cancel method , so the request must have cancel method..
+ */
+- (void)autoCancelRequestOnDealloc:(id)request;
+
+
+@end

HappyWork/HappyWork/API/AFHttpTool/YRAutoCancelRequest/NSObject+AutoCancelRequest.m

@@ -0,0 +1,95 @@
+//
+//  NSObject+AutoCancelRequest.m
+//
+//  Created by YueRuo on 2017/3/3.
+//  Copyright © 2017年 YueRuo. All rights reserved.
+//
+
+#import "NSObject+AutoCancelRequest.h"
+#import <objc/runtime.h>
+
+@interface YRWeakRequest : NSObject
+
+@property (weak, nonatomic) id request;
+
+@end
+
+@implementation YRWeakRequest
+
+@end
+
+@interface YRDeallocRequests : NSObject
+
+@property (strong, nonatomic) NSMutableArray<YRWeakRequest*> *weakRequests;
+@property (strong, nonatomic) NSLock *lock;
+
+@end
+
+@implementation YRDeallocRequests
+
+- (instancetype)init {
+    
+    if (self = [super init])
+    {
+        _weakRequests = [NSMutableArray arrayWithCapacity:20];
+        _lock = [[NSLock alloc]init];
+    }
+    return self;
+}
+- (void)addRequest:(YRWeakRequest*)request {
+    
+    if (!request||!request.request)
+    {
+        return;
+    }
+    [_lock lock];
+    [self.weakRequests addObject:request];
+    [_lock unlock];
+}
+
+- (void)clearDeallocRequest {
+    
+    [_lock lock];
+    NSInteger count = self.weakRequests.count;
+    for (NSInteger i=count-1; i>0; i--)
+    {
+        YRWeakRequest *weakRequest = self.weakRequests[i];
+        if (!weakRequest.request)
+        {
+            [self.weakRequests removeObject:weakRequest];
+        }
+    }
+    [_lock unlock];
+}
+- (void)dealloc {
+    
+    DDLogDebug(@"---------取消了取消了取消了-----------");
+    for (YRWeakRequest *weakRequest in _weakRequests)
+    {
+        [weakRequest.request cancel];
+    }
+}
+@end
+
+@implementation NSObject (YRRequest)
+
+- (YRDeallocRequests *)deallocRequests {
+    
+    YRDeallocRequests *requests = objc_getAssociatedObject(self, _cmd);
+    if (!requests)
+    {
+        requests = [[YRDeallocRequests alloc]init];
+        objc_setAssociatedObject(self, _cmd, requests, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+    }
+    return requests;
+}
+
+- (void)autoCancelRequestOnDealloc:(id)request {
+    
+    [[self deallocRequests] clearDeallocRequest];
+    YRWeakRequest *weakRequest = [[YRWeakRequest alloc] init];
+    weakRequest.request = request;
+    [[self deallocRequests] addRequest:weakRequest];
+}
+
+@end

HappyWork/HappyWork/Class/PersonalCenter/View/PersonalCenterHeaderCell.m

@@ -63,7 +63,7 @@
         make.bottom.equalTo(self.contentView.mas_bottom).offset(-37);
     }];
     self.nameLabel.text = @"名字";
-    self.authLabel.text = @"认证用户";
+    self.authLabel.text = @"未认证";
     
 }
 

HappyWork/HappyWork/Class/PersonalCenter/ViewController/PersonalCenterViewController.m

@@ -32,6 +32,7 @@ HWConfirmPanelViewDelegate
 
 - (void)dealloc {
     
+    DDLogDebug(@"--------------------------------");
     [[NSNotificationCenter defaultCenter] removeObserver:self name:changeHeadPortrait object:nil];
 }
 
@@ -52,6 +53,7 @@ HWConfirmPanelViewDelegate
     [self.viewModel requestPersonalCenterData];
     //添加登录刷新通知
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(chageHeadPortraitRefresh:) name:changeHeadPortrait object:nil];
+
 }
 
 #pragma mark – init
@@ -64,13 +66,13 @@ HWConfirmPanelViewDelegate
     [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
        
         make.left.right.top.offset(0);
-        make.bottom.equalTo(self.logoutBtn.mas_top).offset(0);
+        make.bottom.equalTo(weakSlef.logoutBtn.mas_top).offset(0);
     }];
     
     [self.logoutBtn mas_makeConstraints:^(MASConstraintMaker *make) {
         
         make.left.right.offset(0);
-        make.bottom.equalTo(self.view.mas_bottomMargin).offset(0);
+        make.bottom.equalTo(weakSlef.view.mas_bottomMargin).offset(0);
         make.height.mas_equalTo(50);
     }];
     
@@ -119,7 +121,6 @@ HWConfirmPanelViewDelegate
 - (void)chageHeadPortraitRefresh:(NSNotification *)notification {
     
     [self.viewModel requestPersonalCenterData];
-    
 }
 
 #pragma mark - UITableViewDelegate 

HappyWork/HappyWork/Class/PersonalCenter/ViewModel/PersonalCenterViewModel.m

@@ -30,11 +30,12 @@
 
 - (void)appUpdateRequirement {
     
+    __weak typeof(self) weakSelf = self;
     [HWAFHttpTool getRequestWithURLStr:check_Version params:@{@"version":BUNDLE_SHORTVERSION,@"app_system":@"1"} success:^(NSDictionary *responseDic) {
         
         if ([responseDic[@"errcode"] integerValue] == 0)
         {
-            self.updateDataBlock(responseDic);
+            weakSelf.updateDataBlock(responseDic);
         }
         else
         {
@@ -95,7 +96,6 @@
 }
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
     
-
     if (indexPath.section == 0)
     {
         static  NSString *headerCell = @"headerCell";
@@ -109,8 +109,19 @@
         PersonalCenterModel *model = [PersonalCenterModel mj_objectWithKeyValues:self.userDict];
         
         cell.nameLabel.text = model.name;
-//        [cell.headerBtn sd_setBackgroundImageWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@",model.avatar]] forState:(UIControlState)UIControlStateNormal placeholderImage:[UIImage imageNamed:@"personalCenter_icon"]];
-        [cell.headerBtn sd_setImageWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@",model.avatar]] forState:(UIControlState)UIControlStateNormal placeholderImage:[UIImage imageNamed:@"personalCenter_icon"]];
+        [cell.headerBtn sd_setImageWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@",model.avatar]] forState:UIControlStateNormal placeholderImage:[UIImage imageNamed:@"personalCenter_icon"]];
+        if ([model.authenticationStatus integerValue] == 0)
+        {
+            cell.authLabel.text = @"未认证";
+        }
+        if ([model.authenticationStatus integerValue] == 1)
+        {
+            cell.authLabel.text = @"已认证";
+        }
+        if ([model.authenticationStatus integerValue] == 2)
+        {
+            cell.authLabel.text = @"认证不通过";
+        }
         return cell;
     }
     else

HappyWork/HappyWork/Class/PersonalCenter/我的订单_order/ViewController/MyOrderDetailViewController.m

@@ -32,11 +32,8 @@ FBScrollLayoutViewDelegate
 
 @implementation MyOrderDetailViewController
 
-- (void)viewWillAppear:(BOOL)animated {
-    
-    [super viewWillAppear:animated];
-   
-}
+#pragma mark - life
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     
@@ -45,7 +42,6 @@ FBScrollLayoutViewDelegate
     [self initSubViews];
     [self requestDetailData];
     [self.view.errorView.refreshButton addTarget:self action:@selector(refreshButtonClicked:) forControlEvents:UIControlEventTouchUpInside];
-    
 }
 
 #pragma mark – init
@@ -69,7 +65,6 @@ FBScrollLayoutViewDelegate
     {
         [self.makesureBtn az_setGradientBackgroundWithColors:@[[UIColor colorFromHexString:@"5568F0"], [UIColor colorFromHexString:@"823BFF"]] locations:@[@(0.0),@(1.0f)] startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 0)];
     }
-    
 }
 
 #pragma mark - private method
@@ -111,6 +106,7 @@ FBScrollLayoutViewDelegate
         
         [weakSelf.view showErrorView];
         [HWProgressHUD fb_showFailureWithStatus:error];
+        
     }];
 }
 
@@ -159,6 +155,7 @@ FBScrollLayoutViewDelegate
         make.edges.equalTo(footerView).with.insets(UIEdgeInsetsMake(10, HJHorizontalScale(135), 10, 15));
     }];
 }
+
 #pragma mark - event response
 
 - (void)refreshButtonClicked:(UIButton *)btn {

HappyWork/HappyWork/Class/PersonalCenter/我的订单_order/ViewController/MyOrderViewController.m

@@ -37,6 +37,7 @@
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(confirmationOrderRefresh:) name:confirmationOrderNotification object:nil];
 }
 #pragma mark - private metnod
+
 /* 处理请求结果*/
 - (void)dealWithRequestResult {
     
@@ -95,6 +96,7 @@
 
 #pragma mark - MyOrderViewModelDelegate
 
+/* 查看合同 */
 - (void)contractIndexPath:(NSInteger)index {
     
     MyOrderWebViewController *web = [[MyOrderWebViewController alloc]init];
@@ -115,18 +117,6 @@
     MyOrderWebECOViewController *web = [[MyOrderWebECOViewController alloc]init];
     web.webUrl = url;
     [self.navigationController pushViewController:web animated:YES];
-    
-//    if (@available(iOS 10.0, *))
-//    {
-//        [[UIApplication sharedApplication]openURL:[NSURL URLWithString:url] options:@{} completionHandler:^(BOOL success) {
-//
-//        }];
-//    }
-//    else
-//    {
-//        NSURL *URL = [NSURL URLWithString:url];
-//        [[UIApplication sharedApplication]openURL:URL];
-//    }
 }
 
 #pragma mark - setter and getter

HappyWork/HappyWork/Class/PersonalCenter/我的订单_order/ViewController/MyOrderWebECOViewController.m

@@ -11,7 +11,7 @@
 
 @interface MyOrderWebECOViewController ()
 
-@property (nonatomic, strong) BaseWKWebView *webView;
+@property (nonatomic, strong) UIWebView *webView;
 
 @end
 
@@ -22,14 +22,14 @@
     
     self.navigationItem.title = @"电子合同";
     self.view.backgroundColor = [UIColor whiteColor];
-    self.webView  = [[BaseWKWebView alloc]init];
+    self.webView  = [[UIWebView alloc]init];
     [self.view addSubview:self.webView];
     [self.webView mas_makeConstraints:^(MASConstraintMaker *make) {
        
         make.left.right.top.bottom.equalTo(self.view).offset(0);
     }];
 
-    [self.webView.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@",self.webUrl]]]];
+    [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@",self.webUrl]]]];
         
 }
 

HappyWork/HappyWork/Class/PersonalCenter/我的订单_order/ViewController/MyOrderWebViewController.m

@@ -11,7 +11,8 @@
 
 @interface MyOrderWebViewController ()
 
-@property (nonatomic, strong) BaseWKWebView      *webView;
+@property (nonatomic, strong) UIWebView    *uiWebView;
+@property (nonatomic, strong) BaseWKWebView *webView;
 
 @end
 
@@ -25,9 +26,12 @@
     self.navigationItem.title = @"查看合同";
     self.view.backgroundColor = [UIColor whiteColor];
     [self initViews];
-   
+
     [self downloadFile:self.webUrl];
     
+//    NSLog(@"%@",self.webUrl);
+    self.uiWebView.hidden = YES;
+    self.webView.hidden = YES;
 }
 
 #pragma mark  - init
@@ -35,11 +39,15 @@
 - (void)initViews {
     
     [self.view addSubview:self.webView];
+    [self.view addSubview:self.uiWebView];
     [self.webView mas_makeConstraints:^(MASConstraintMaker *make) {
+        
         make.left.right.top.bottom.equalTo(self.view).offset(0);
+    }];
+    [self.uiWebView mas_makeConstraints:^(MASConstraintMaker *make) {
         
+        make.left.right.top.bottom.equalTo(self.view).offset(0);
     }];
-    
 }
 
 #pragma mark - private methods
@@ -53,7 +61,7 @@
     
     NSURLSessionDownloadTask *downTask = [manager downloadTaskWithRequest:request progress:^(NSProgress * _Nonnull downloadProgress) {
         
-        NSLog(@"---------%f",1.0 * downloadProgress.completedUnitCount/downloadProgress.totalUnitCount);
+//        NSLog(@"---------%f",1.0 * downloadProgress.completedUnitCount/downloadProgress.totalUnitCount);
         
     } destination:^NSURL * _Nonnull(NSURL * _Nonnull targetPath, NSURLResponse * _Nonnull response) {
 
@@ -63,8 +71,21 @@
 
     } completionHandler:^(NSURLResponse * _Nonnull response, NSURL * _Nullable filePath, NSError * _Nullable error) {
 
-        NSURLRequest *request = [NSURLRequest requestWithURL:filePath];
-        [self.webView.webView loadRequest:request];
+        if (IOSSYS > 12.0)
+        {
+            self.webView.hidden = NO;
+            NSURLRequest *request = [NSURLRequest requestWithURL:filePath];
+            [self.webView.webView loadRequest:request];
+        }
+        else
+        {
+            self.uiWebView.hidden = NO;
+            NSString *viwerPath = [[NSBundle mainBundle] pathForResource:@"viewer" ofType:@"html" inDirectory:@"pdfjs/web"];
+            NSString *urlStr = [NSString stringWithFormat:@"%@?file=%@#page=1",viwerPath,filePath];
+            urlStr = [urlStr stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
+            NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:urlStr]];
+            [self.uiWebView loadRequest:request];
+        }
     }];
     
     [downTask resume];
@@ -73,6 +94,14 @@
 
 #pragma mark - getter and setter
 
+- (UIWebView *)uiWebView {
+    
+    if (_uiWebView == nil)
+    {
+        _uiWebView = [[UIWebView alloc]init];
+    }
+    return _uiWebView;
+}
 - (BaseWKWebView *)webView {
     
     if (_webView == nil)

HappyWork/HappyWork/Class/PersonalCenter/我的订单_order/ViewModel/MyOrderViewModel.m

@@ -102,7 +102,7 @@
     cell.makeSureBtnBlock = ^{
         
         if ([model.contractType integerValue] == 2)
-        {
+        {//电子合同
             [self makeconfirmECOrdersIndexpath:indexPath];
         }
         else

HappyWork/HappyWork/Class/PersonalCenter/设置_set/View/SetCell.m

@@ -9,7 +9,10 @@
 #import "SetCell.h"
 
 @implementation SetCell
-
+- (void)dealloc {
+    
+//    DDLogDebug(@"------dddd----");
+}
 - (void)awakeFromNib {
     [super awakeFromNib];
     // Initialization code

HappyWork/HappyWork/Class/PersonalCenter/设置_set/ViewController/SetViewController.m

@@ -19,11 +19,18 @@
 
 @implementation SetViewController
 
+- (void)dealloc {
+    
+//    DDLogDebug(@"---------------------------");
+}
 - (void)viewDidLoad {
     [super viewDidLoad];
     
+    self.view.backgroundColor = [UIColor whiteColor];
     self.navigationItem.title = @"基本信息";
     [self initSubViews];
+//    HWAFHttpTool *HW = [[HWAFHttpTool alloc]init];
+//    DDLogDebug(@"HW:::%@",HW);
 }
 
 #pragma mark - init
@@ -38,7 +45,6 @@
     }];
     
     self.viewModel.userDict = self.userDict;
-    
 }
 
 #pragma mark - UITableViewDelegate
@@ -108,6 +114,8 @@
 /* 更改头像 */
 - (void)changeUserHeadPortrait {
     
+    __weak typeof(self) weakSelf = self;
+    
     TZImagePickerController *imagePickerVc = [[TZImagePickerController alloc] initWithMaxImagesCount:1 delegate:nil];
     imagePickerVc.didFinishPickingPhotosHandle = ^(NSArray<UIImage *> *photos, NSArray *assets, BOOL isSelectOriginalPhoto) {
         
@@ -117,7 +125,7 @@
                 
                 if ([responseDic[@"errcode"] integerValue] == 0)
                 {
-                    self.viewModel.headerImageV.image = photos[0];
+                    weakSelf.viewModel.headerImageV.image = photos[0];
                     //登录通知刷新
                     [[NSNotificationCenter defaultCenter] postNotificationName:changeHeadPortrait object:nil];
                 }

HappyWork/HappyWork/Class/PersonalCenter/设置_set/ViewModel/SetViewModel.m

@@ -12,7 +12,10 @@
 
 @implementation SetViewModel
 
-
+- (void)dealloc {
+    
+//    DDLogDebug(@"------dealloc-----");
+}
 #pragma mark -  UITableViewDataSource
 
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {

HappyWork/HappyWork/Resource/pdfjs/LICENSE

@@ -0,0 +1,177 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS

HappyWork/HappyWork/Resource/pdfjs/web/cmaps/CNS2-V.bcmap

@@ -0,0 +1,3 @@
+àRCopyright 1990-2009 Adobe Systems Incorporated.
+All rights reserved.
+See ./LICENSEáCNS2-H

HappyWork/HappyWork/Resource/pdfjs/web/cmaps/ETenms-B5-H.bcmap

@@ -0,0 +1,3 @@
+àRCopyright 1990-2009 Adobe Systems Incorporated.
+All rights reserved.
+See ./LICENSEá	ETen-B5-H`
 ^

HappyWork/HappyWork/Resource/pdfjs/web/cmaps/GB-H.bcmap

@@ -0,0 +1,4 @@
+àRCopyright 1990-2009 Adobe Systems Incorporated.
+All rights reserved.
+See ./LICENSE

!!�º]aX!!]`�21�>	�p�z�$]‚�"R‚d�-Uƒ7�*„
4„%�+ „Z „{�/…%…<�9K…b�1]†.�"‡‰`]‡,�"]ˆ
+�"]ˆh�"]‰F�"]Š$�"]‹�"]‹`�"]Œ>�"]��"]�z�"]ŽX�"]�6�"]��"]�r�"]‘P�"]’.�"]“�"]“j�"]”H�"]•&�"]–�"]–b�"]—@�"]˜�"]˜|�"]™Z�"]š8�"]›�"]›t�"]œR�"]�0�"]ž�"]žl�"]ŸJ�"] (�"]¡�"]¡d�"]¢B�"]£ �"X£~�']¤W�"]¥5�"]¦�"]¦q�"]§O�"]¨-�"]©�"]©i�"]ªG�"]«%�"]¬�"]¬a�"]­?�"]®�"]®{�"]¯Y�"]°7�"]±�"]±s�"]²Q�"]³/�"]´
�"]´k�"]µI�"]¶'�"]·�"]·c�"]¸A�"]¹�"]¹}�"]º[�"]»9