diff --git a/box-Authorizer.xcodeproj/project.pbxproj b/box-Authorizer.xcodeproj/project.pbxproj index 189e8f8..42a139f 100644 --- a/box-Authorizer.xcodeproj/project.pbxproj +++ b/box-Authorizer.xcodeproj/project.pbxproj @@ -1479,7 +1479,7 @@ "$(PROJECT_DIR)/box-Authorizer/TheThird/OpenSSL/lib", "$(PROJECT_DIR)/box-Authorizer/globel/OpenSSL/include", ); - PRODUCT_BUNDLE_IDENTIFIER = "com.2se.box-Authorizerr"; + PRODUCT_BUNDLE_IDENTIFIER = "com.2se.box-Authorizer"; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -1515,7 +1515,7 @@ "$(PROJECT_DIR)/box-Authorizer/TheThird/OpenSSL/lib", "$(PROJECT_DIR)/box-Authorizer/globel/OpenSSL/include", ); - PRODUCT_BUNDLE_IDENTIFIER = "com.2se.box-Authorizerr"; + PRODUCT_BUNDLE_IDENTIFIER = "com.2se.box-Authorizer"; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = "1,2"; }; diff --git a/box-Authorizer.xcworkspace/xcuserdata/yuhuang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/box-Authorizer.xcworkspace/xcuserdata/yuhuang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index ff05449..d4233b0 100644 --- a/box-Authorizer.xcworkspace/xcuserdata/yuhuang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/box-Authorizer.xcworkspace/xcuserdata/yuhuang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -122,11 +122,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "box-Authorizer/CodeClass/InitAccount/Controllers/GenerateContractViewController.m" - timestampString = "545818103.626832" + timestampString = "546162896.31352" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "231" - endingLineNumber = "231" + startingLineNumber = "229" + endingLineNumber = "229" landmarkName = "-createView" landmarkType = "7"> @@ -138,11 +138,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "box-Authorizer/CodeClass/InitAccount/Controllers/GenerateContractViewController.m" - timestampString = "545818103.627156" + timestampString = "546162896.313584" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "243" - endingLineNumber = "243" + startingLineNumber = "241" + endingLineNumber = "241" landmarkName = "-createView" landmarkType = "7"> @@ -154,11 +154,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "box-Authorizer/CodeClass/InitAccount/Controllers/GenerateContractViewController.m" - timestampString = "545818103.627232" + timestampString = "546162896.313629" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "254" - endingLineNumber = "254" + startingLineNumber = "251" + endingLineNumber = "251" landmarkName = "-createView" landmarkType = "7"> @@ -170,94 +170,15 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "box-Authorizer/CodeClass/InitAccount/Views/PrivatePasswordView.m" - timestampString = "545048613.407091" + timestampString = "546162896.313674" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "172" - endingLineNumber = "172" + startingLineNumber = "170" + endingLineNumber = "170" landmarkName = "-confirmAction:" landmarkType = "7"> - - - - - - - - - - - - - - - - - - - - @@ -345,102 +250,7 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "box-Authorizer/CodeClass/InitAccount/Controllers/BackupViewController.m" - timestampString = "545818103.628203" - startingColumnNumber = "9223372036854775807" - endingColumnNumber = "9223372036854775807" - startingLineNumber = "146" - endingLineNumber = "146" - landmarkName = "-backupViewDelegate:" - landmarkType = "7"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -630,11 +361,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "box-Authorizer/CodeClass/InitAccount/Controllers/ServiceStartViewController.m" - timestampString = "545818103.6294121" + timestampString = "546162896.314036" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "376" - endingLineNumber = "376" + startingLineNumber = "372" + endingLineNumber = "372" landmarkName = "-requestData" landmarkType = "7"> @@ -646,11 +377,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "box-Authorizer/CodeClass/InitAccount/Controllers/ServiceStartViewController.m" - timestampString = "545818103.629473" + timestampString = "546162896.314078" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "389" - endingLineNumber = "389" + startingLineNumber = "385" + endingLineNumber = "385" landmarkName = "-requestData" landmarkType = "7"> @@ -662,11 +393,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "box-Authorizer/CodeClass/InitAccount/Controllers/ServiceStartViewController.m" - timestampString = "545818103.629528" + timestampString = "546162896.3141201" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "400" - endingLineNumber = "400" + startingLineNumber = "396" + endingLineNumber = "396" landmarkName = "-requestData" landmarkType = "7"> @@ -678,11 +409,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "box-Authorizer/CodeClass/InitAccount/Controllers/ServiceStartViewController.m" - timestampString = "545818103.62958" + timestampString = "546162896.31416" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "411" - endingLineNumber = "411" + startingLineNumber = "407" + endingLineNumber = "407" landmarkName = "-requestData" landmarkType = "7"> @@ -694,11 +425,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "box-Authorizer/CodeClass/InitAccount/Controllers/ServiceStartViewController.m" - timestampString = "545818103.629632" + timestampString = "546162896.3142" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "428" - endingLineNumber = "428" + startingLineNumber = "424" + endingLineNumber = "424" landmarkName = "-requestData" landmarkType = "7"> @@ -710,11 +441,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "box-Authorizer/CodeClass/InitAccount/Controllers/ServiceStartViewController.m" - timestampString = "545818103.629685" + timestampString = "546162896.314239" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "444" - endingLineNumber = "444" + startingLineNumber = "440" + endingLineNumber = "440" landmarkName = "-requestData" landmarkType = "7"> @@ -726,7 +457,7 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "box-Authorizer/CodeClass/HomePage/Controllers/HomepageViewController.m" - timestampString = "545818103.62974" + timestampString = "546162896.3142819" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "100" @@ -742,7 +473,7 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "box-Authorizer/CodeClass/HomePage/Controllers/HomepageViewController.m" - timestampString = "545818103.629971" + timestampString = "546162896.314652" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "107" @@ -758,7 +489,7 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "box-Authorizer/CodeClass/HomePage/Controllers/HomepageViewController.m" - timestampString = "545818103.630043" + timestampString = "546162896.31489" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "110" @@ -774,7 +505,7 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "box-Authorizer/CodeClass/HomePage/Controllers/HomepageViewController.m" - timestampString = "545818103.63011" + timestampString = "546162896.3151079" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "113" @@ -790,39 +521,7 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "box-Authorizer/CodeClass/HomePage/Controllers/HomepageViewController.m" - timestampString = "545818103.6301759" - startingColumnNumber = "9223372036854775807" - endingColumnNumber = "9223372036854775807" - startingLineNumber = "774" - endingLineNumber = "774" - landmarkName = "-seviceType:" - landmarkType = "7"> - - - - - - - - @@ -948,13 +647,13 @@ shouldBeEnabled = "Yes" ignoreCount = "0" continueAfterRunningActions = "No" - filePath = "box-Authorizer/CodeClass/HomePage/Controllers/HomepageViewController.m" - timestampString = "545818103.630623" + filePath = "box-Authorizer/globel/Bluetooth/HLPrinter/UIImage+Bitmap.m" + timestampString = "545815611.265522" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "750" - endingLineNumber = "750" - landmarkName = "-agentOperate:password:" + startingLineNumber = "176" + endingLineNumber = "176" + landmarkName = "-imageWithscaleMaxWidth:" landmarkType = "7"> @@ -964,13 +663,13 @@ shouldBeEnabled = "Yes" ignoreCount = "0" continueAfterRunningActions = "No" - filePath = "box-Authorizer/globel/Bluetooth/HLPrinter/UIImage+Bitmap.m" - timestampString = "545815611.265522" + filePath = "box-Authorizer/CodeClass/InitAccount/Controllers/GenerateContractViewController.m" + timestampString = "546162896.316439" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "176" - endingLineNumber = "176" - landmarkName = "-imageWithscaleMaxWidth:" + startingLineNumber = "403" + endingLineNumber = "403" + landmarkName = "-privateAction:" landmarkType = "7"> @@ -980,13 +679,13 @@ shouldBeEnabled = "Yes" ignoreCount = "0" continueAfterRunningActions = "No" - filePath = "box-Authorizer/CodeClass/InitAccount/Controllers/GenerateContractViewController.m" - timestampString = "545822233.423125" + filePath = "box-Authorizer/CodeClass/InitAccount/Controllers/ServiceStartViewController.m" + timestampString = "546162896.316488" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "414" - endingLineNumber = "414" - landmarkName = "-privateAction:" + startingLineNumber = "401" + endingLineNumber = "401" + landmarkName = "-requestData" landmarkType = "7"> diff --git a/box-Authorizer/Application/AppDelegate.m b/box-Authorizer/Application/AppDelegate.m index 68c370c..6176e15 100755 --- a/box-Authorizer/Application/AppDelegate.m +++ b/box-Authorizer/Application/AppDelegate.m @@ -13,7 +13,6 @@ #import "AwaitBackupViewController.h" #import "ServiceStartViewController.h" #import "BlueToothListViewController.h" - #import "HomepageViewController.h" #import "LeftMenuViewController.h" diff --git a/box-Authorizer/BaseClass/Models/BoxDataManager.m b/box-Authorizer/BaseClass/Models/BoxDataManager.m index 49e569d..892899f 100644 --- a/box-Authorizer/BaseClass/Models/BoxDataManager.m +++ b/box-Authorizer/BaseClass/Models/BoxDataManager.m @@ -93,7 +93,6 @@ -(void)saveDataWithCoding:(NSString *)coding codeValue:(NSString *)codeValue }else if ([coding isEqualToString:@"codePassWord"]){ self.codePassWord = codeValue; } - [defaults setObject:codeValue forKey: coding]; [defaults synchronize]; } diff --git a/box-Authorizer/BaseClass/Models/MenberInfoManager.m b/box-Authorizer/BaseClass/Models/MenberInfoManager.m index 9d97aca..6b238e0 100644 --- a/box-Authorizer/BaseClass/Models/MenberInfoManager.m +++ b/box-Authorizer/BaseClass/Models/MenberInfoManager.m @@ -31,7 +31,6 @@ - (instancetype)init{ return self; } - - (NSMutableArray *)loadMenberInfo:(NSString *)menberId { _menberInfoArray = [[NSMutableArray alloc] init]; diff --git a/box-Authorizer/BaseClass/Models/NewsInfoModel.m b/box-Authorizer/BaseClass/Models/NewsInfoModel.m index b86ac54..7e0bb25 100644 --- a/box-Authorizer/BaseClass/Models/NewsInfoModel.m +++ b/box-Authorizer/BaseClass/Models/NewsInfoModel.m @@ -13,8 +13,6 @@ @interface NewsInfoModel() @end - - @implementation NewsInfoModel +(instancetype)sharedManager{ @@ -33,7 +31,6 @@ - (instancetype)init{ return self; } - - (NSMutableArray *)loadNewsInfo { _newsInfoArray = [[NSMutableArray alloc] init]; diff --git a/box-Authorizer/CodeClass/HomePage/Controllers/LeftMenuViewController.m b/box-Authorizer/CodeClass/HomePage/Controllers/LeftMenuViewController.m index 4b0e3cc..09b1a2b 100644 --- a/box-Authorizer/CodeClass/HomePage/Controllers/LeftMenuViewController.m +++ b/box-Authorizer/CodeClass/HomePage/Controllers/LeftMenuViewController.m @@ -12,8 +12,6 @@ #import "AboutBoxViewController.h" #import "LanguageSwitchViewController.h" #import "ModifyServerAddressViewController.h" - - #define CellReuseIdentifier @"LeftMenu" #define TableViewCellHeight 55 @@ -37,13 +35,10 @@ - (void)viewDidLoad { _sourceArray = [[NSMutableArray alloc] init]; NSDictionary *dict = @{ @"data":@[ - @{@"titleName":@"语言切换"}, @{@"titleName":@"服务器地址"}, @{@"titleName":@"关于BOX"} ] }; - - for (NSDictionary *dataDic in dict[@"data"]) { LeftMenuModel *model = [[LeftMenuModel alloc] initWithDict:dataDic]; [_sourceArray addObject:model]; @@ -93,12 +88,8 @@ -(void)createView }]; [_tableView registerClass:[LeftMenuTableViewCell class] forCellReuseIdentifier:CellReuseIdentifier]; _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - - - } - - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{ return self.sourceArray.count; } @@ -107,7 +98,6 @@ - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPa return TableViewCellHeight; } - - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{ LeftMenuTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellReuseIdentifier forIndexPath:indexPath]; @@ -115,22 +105,16 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N cell.model = model; [cell setDataWithModel:model]; return cell; - } - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - if(indexPath.row == 0){ - LanguageSwitchViewController *languageSwitchVC = [[LanguageSwitchViewController alloc] init]; - [self.navigationController pushViewController:languageSwitchVC animated:YES]; - [self addNSNotificationCenter:languageSwitchVC]; - } - else if(indexPath.row == 1) { + if(indexPath.row == 0) { ModifyServerAddressViewController *modifyServerAdressVC = [[ModifyServerAddressViewController alloc] init]; [self.navigationController pushViewController:modifyServerAdressVC animated:YES]; [self.sidePanelController toggleRightPanel:nil]; [self addNSNotificationCenter:modifyServerAdressVC]; - }else if(indexPath.row == 2){ + }else if(indexPath.row == 1){ AboutBoxViewController *aboutBoxVC = [[AboutBoxViewController alloc] init]; [self.navigationController pushViewController:aboutBoxVC animated:YES]; [self addNSNotificationCenter:aboutBoxVC]; diff --git a/box-Authorizer/CodeClass/HomePage/Views/LeftMenuTableViewCell.m b/box-Authorizer/CodeClass/HomePage/Views/LeftMenuTableViewCell.m index 96cdac9..4eb7ff5 100644 --- a/box-Authorizer/CodeClass/HomePage/Views/LeftMenuTableViewCell.m +++ b/box-Authorizer/CodeClass/HomePage/Views/LeftMenuTableViewCell.m @@ -27,8 +27,6 @@ - (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSStr return self; } - - - (void)createView{ _titleLab = [[UILabel alloc]init]; @@ -47,24 +45,18 @@ - (void)createView{ _lineView.backgroundColor = [UIColor colorWithHexString:@"#222239"]; [self.contentView addSubview:_lineView]; [_lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.equalTo(self.contentView.mas_bottom).offset(-1); + make.bottom.equalTo(self.contentView.mas_bottom).offset(0); make.left.offset(0); make.right.offset(0); make.height.offset(1); }]; - - - } - (void)setDataWithModel:(LeftMenuModel *)model { _titleLab.text = model.titleName; - - } - - (void)awakeFromNib { [super awakeFromNib]; // Initialization code diff --git a/box-Authorizer/CodeClass/HomePage/Views/NewsTableViewCell.m b/box-Authorizer/CodeClass/HomePage/Views/NewsTableViewCell.m index 4104d5a..0b4966e 100644 --- a/box-Authorizer/CodeClass/HomePage/Views/NewsTableViewCell.m +++ b/box-Authorizer/CodeClass/HomePage/Views/NewsTableViewCell.m @@ -36,7 +36,6 @@ - (void)createView{ make.left.offset(15); make.left.equalTo(_leftLab.mas_right).offset(9); make.right.offset(-115); - }]; _rightLab = [[UILabel alloc]init]; @@ -49,7 +48,6 @@ - (void)createView{ make.bottom.offset(0); make.width.offset(100); make.right.offset(-15); - }]; } @@ -58,10 +56,8 @@ - (void)setDataWithModel:(NewsModel *)model { _leftLab.text = model.content; _rightLab.text = [TimeManeger getElapseTimeToStringHelp:[model.newsId integerValue] ]; - } - - (void)awakeFromNib { [super awakeFromNib]; // Initialization code diff --git a/box-Authorizer/CodeClass/InitAccount/Controllers/BackupViewController.m b/box-Authorizer/CodeClass/InitAccount/Controllers/BackupViewController.m index 89379ce..6d448c0 100644 --- a/box-Authorizer/CodeClass/InitAccount/Controllers/BackupViewController.m +++ b/box-Authorizer/CodeClass/InitAccount/Controllers/BackupViewController.m @@ -118,14 +118,13 @@ -(void)createView -(void)backupAction:(UIButton *)btn { -// if (_backupArray.count < 3) { -// [WSProgressHUD showErrorWithStatus:BackupVCWSProgressTwo]; -// return; -// } + if (_backupArray.count < 3) { + [WSProgressHUD showErrorWithStatus:BackupVCWSProgressTwo]; + return; + } _backupView = [[BackupView alloc] initWithFrame:[UIScreen mainScreen].bounds]; _backupView.delegate = self; [[UIApplication sharedApplication].keyWindow addSubview:_backupView]; - } #pragma mark ----- BackupViewDelegate 备份密码确认 ----- @@ -161,7 +160,6 @@ - (void)backupViewDelegate:(NSString *)passwordStr }]; } - - (void)didReceiveMemoryWarning { [super didReceiveMemoryWarning]; // Dispose of any resources that can be recreated. diff --git a/box-Authorizer/CodeClass/InitAccount/Controllers/BlueToothListViewController.m b/box-Authorizer/CodeClass/InitAccount/Controllers/BlueToothListViewController.m index dc0bffe..51fd291 100755 --- a/box-Authorizer/CodeClass/InitAccount/Controllers/BlueToothListViewController.m +++ b/box-Authorizer/CodeClass/InitAccount/Controllers/BlueToothListViewController.m @@ -86,11 +86,9 @@ - (void)viewDidLoad { [SVProgressHUD showInfoWithStatus:info ]; [SVProgressHUD dismissWithDelay:1.2]; }; - for (NSDictionary *dic in self.deviArray) { [self.deviceArray addObject:dic]; } - manager.discoverPeripheralBlcok = ^(CBCentralManager *central, CBPeripheral *peripheral, NSDictionary *advertisementData, NSNumber *RSSI) { if (peripheral.name.length <= 0) { return ; @@ -130,14 +128,11 @@ - (void)createBarItem{ //返回按钮 - (void)backButtonAction:(UIBarButtonItem *)buttonItem{ - //[self dismissViewControllerAnimated:YES completion:nil]; [self.navigationController popViewControllerAnimated:YES]; self.arrayListBlock(self.deviceArray); } - - #pragma mark - UITableViewDataSource - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { diff --git a/box-Authorizer/CodeClass/InitAccount/Controllers/GenerateContractViewController.m b/box-Authorizer/CodeClass/InitAccount/Controllers/GenerateContractViewController.m index f40b669..bced692 100644 --- a/box-Authorizer/CodeClass/InitAccount/Controllers/GenerateContractViewController.m +++ b/box-Authorizer/CodeClass/InitAccount/Controllers/GenerateContractViewController.m @@ -48,7 +48,6 @@ @interface GenerateContractViewController () - (void)captureOutput:(AVCaptureOutput *)captureOutput didOutputMetadataObjects:(NSArray *)metadataObjects fromConnection:(AVCaptureConnection *)connection { - NSString *stringValue; - //判断扫描是否有数据 if (metadataObjects != nil && [metadataObjects count] > 0) { - AVMetadataMachineReadableCodeObject *metadataObject = [metadataObjects objectAtIndex:0]; NSString *result; //判断的扫描的结果是否是二维码 @@ -439,23 +426,16 @@ - (void)captureOutput:(AVCaptureOutput *)captureOutput didOutputMetadataObjects: // 显示遮盖 [SVProgressHUD showWithStatus:@"正在处理"]; [SVProgressHUD setDefaultMaskType:SVProgressHUDMaskTypeClear]; - - // 当扫描到数据时，停止扫描 [ _session stopRunning]; // 将扫描的线从父控件中移除 [_scanImageView removeFromSuperview]; - result = metadataObject.stringValue; - // 当前延迟1.0秒 dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ // 隐藏遮盖 [SVProgressHUD dismiss]; - if (_fromFunction == fromInitAccount) { - // 将扫描后的结果显示在label上 - //self.scanResult.text = stringValue; PerfectInformationViewController *perferInVC = [[PerfectInformationViewController alloc] init]; perferInVC.scanResult = result; UINavigationController *perferInNC = [[UINavigationController alloc]initWithRootViewController:perferInVC]; @@ -464,32 +444,14 @@ - (void)captureOutput:(AVCaptureOutput *)captureOutput didOutputMetadataObjects: self.codeBlock(result); [self.navigationController popViewControllerAnimated:YES]; } - }); }else{ NSLog(@"不是二维码"); } - - //返回主线程，并将扫描的结果传回主线程 - //[self performSelectorOnMainThread:@selector(reportScanResult:) withObject:result waitUntilDone:NO]; } } -//http://aes.jypc.org/?p=37737 --(void)reportScanResult:(NSString *)result{ - - //扫描完毕，停止扫描 - //[self stopScanning]; - - //创建对话框，将扫描结果以对话框的形式呈现 - UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"提示" message:result preferredStyle:UIAlertControllerStyleAlert]; - UIAlertAction *action = [UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) { - }]; - [alert addAction:action]; - [self presentViewController:alert animated:YES completion:nil]; -} - #pragma mark - /** * 蒙板生成,需设置代理，并在退出页面时取消代理 @@ -504,8 +466,6 @@ -(void)drawLayer:(CALayer *)layer inContext:(CGContextRef)ctx{ } } - - - (void)didReceiveMemoryWarning { [super didReceiveMemoryWarning]; // Dispose of any resources that can be recreated. diff --git a/box-Authorizer/CodeClass/InitAccount/Controllers/ServiceStartViewController.m b/box-Authorizer/CodeClass/InitAccount/Controllers/ServiceStartViewController.m index ce5555c..332e73b 100644 --- a/box-Authorizer/CodeClass/InitAccount/Controllers/ServiceStartViewController.m +++ b/box-Authorizer/CodeClass/InitAccount/Controllers/ServiceStartViewController.m @@ -61,7 +61,6 @@ @interface ServiceStartViewController () - @property(nonatomic, strong)UIScrollView *contentView; /** 代币名称 */ @property (nonatomic,strong)UITextField *currencyNameTf; @@ -29,7 +28,6 @@ @interface EditCurrencyViewController ()CFBundlePackageType APPL CFBundleShortVersionString - 1.0.0 + 0.1.0 CFBundleVersion 1 LSRequiresIPhoneOS diff --git a/box-Authorizer/globel/ASE/FSAES128.m b/box-Authorizer/globel/ASE/FSAES128.m index 9d893eb..04f5336 100755 --- a/box-Authorizer/globel/ASE/FSAES128.m +++ b/box-Authorizer/globel/ASE/FSAES128.m @@ -9,8 +9,6 @@ #import "FSAES128.h" #import "NSData+AES128.h" -//#define IV @"1234567890654321" -//#define KEY @"16BytesLengthKey" #define count 16 @implementation FSAES128 diff --git a/box-Authorizer/globel/ManagerCommon/BoxNavigationController.m b/box-Authorizer/globel/ManagerCommon/BoxNavigationController.m index 5b7ca07..c14addc 100644 --- a/box-Authorizer/globel/ManagerCommon/BoxNavigationController.m +++ b/box-Authorizer/globel/ManagerCommon/BoxNavigationController.m @@ -76,7 +76,6 @@ - (void)navigationController:(UINavigationController *)navigationController -(BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer { - if ( gestureRecognizer == self.interactivePopGestureRecognizer ) { if ( self.viewControllers.count < 2 || self.visibleViewController == [self.viewControllers objectAtIndex:0] ) diff --git a/box-Authorizer/globel/ManagerCommon/LYButton.m b/box-Authorizer/globel/ManagerCommon/LYButton.m index 7c8a60f..3d1da56 100644 --- a/box-Authorizer/globel/ManagerCommon/LYButton.m +++ b/box-Authorizer/globel/ManagerCommon/LYButton.m @@ -21,7 +21,6 @@ - (void)drawRect:(CGRect)rect { - (void)awakeFromNib { [super awakeFromNib]; - //self.titleLabel.textAlignment = NSTextAlignmentCenter; } - (void)layoutSubviews @@ -30,10 +29,8 @@ - (void)layoutSubviews CGRect frame = self.imageView.frame; frame.origin.x = 0; frame.origin.y = (self.frame.size.height - frame.size.height)/2; - //frame.size.height = self.frame.size.height; self.imageView.frame = frame; - CGRect lableFrame = self.titleLabel.frame; lableFrame.origin.x = frame.size.width + 5; lableFrame.origin.y = 0; diff --git a/box-Authorizer/globel/ManagerCommon/ProgressHUD.m b/box-Authorizer/globel/ManagerCommon/ProgressHUD.m index 98e8880..6d291db 100644 --- a/box-Authorizer/globel/ManagerCommon/ProgressHUD.m +++ b/box-Authorizer/globel/ManagerCommon/ProgressHUD.m @@ -9,17 +9,9 @@ #import "ProgressHUD.h" #define NetWorkCode101 @"非法hash前缀" -#define NetWorkCode1002 @"您已提交注册申请，请耐心等待" -#define NetWorkCode2001 @"转账信息有误，请查验后重新提交" -#define NetWorkCode2002 @"未找到对应币种" -#define NetWorkCode2003 @"未找到对应的业务流程" -#define NetWorkCode2004 @"转账申请提交失败，请稍候重试" -#define NetWorkCode2005 @"签名信息错误" -#define NetWorkCode1004 @"指定账号不存在" -#define NetWorkCode1007 @"权限不足" -#define NetWorkCode3001 @"您的账号暂无权限创建审批流模板" -#define NetWorkCode3003 @"业务流模板名称重复" -#define NetWorkCode3004 @"创建审批流模板失败" +#define NetWorkCode11 @"JSON处理失败" +#define NetWorkCode12 @"leveldb处理失败" +#define NetWorkCode103 @"非法金额" @implementation ProgressHUD @@ -33,6 +25,12 @@ +(void)showStatus:(NSInteger)code { if(code == 101){ [WSProgressHUD showErrorWithStatus:NetWorkCode101]; + }else if (code == 11){ + [WSProgressHUD showErrorWithStatus:NetWorkCode11]; + }else if (code == 12){ + [WSProgressHUD showErrorWithStatus:NetWorkCode12]; + }else if (code == 103){ + [WSProgressHUD showErrorWithStatus:NetWorkCode103]; } } diff --git a/box-Authorizer/globel/ManagerCommon/TBButton.m b/box-Authorizer/globel/ManagerCommon/TBButton.m index 8b45fb7..cf06251 100644 --- a/box-Authorizer/globel/ManagerCommon/TBButton.m +++ b/box-Authorizer/globel/ManagerCommon/TBButton.m @@ -28,28 +28,11 @@ - (void)awakeFromNib - (void)layoutSubviews { [super layoutSubviews]; -// CGRect frame = self.imageView.frame; -// frame.origin.x = (self.frame.size.width - frame.size.width)/2; -// frame.origin.y = 10; -// //frame.size.width = self.frame.size.width; -// self.imageView.frame = frame; -// -// -// CGRect lableFrame = self.titleLabel.frame; -// lableFrame.origin.x = (self.frame.size.width - lableFrame.size.width)/2; -// lableFrame.origin.y = frame.size.height + 5; -// lableFrame.size.width = self.frame.size.width; -// self.titleLabel.textAlignment = NSTextAlignmentCenter; -// lableFrame.size.height = self.frame.size.height - self.imageView.frame.size.height - 10; -// self.titleLabel.frame = lableFrame; - CGRect frame = self.imageView.frame; frame.origin.x = (self.frame.size.width - frame.size.width)/2; frame.origin.y = 0; - //frame.size.width = self.frame.size.width; self.imageView.frame = frame; - CGRect lableFrame = self.titleLabel.frame; lableFrame.origin.x = 0; lableFrame.origin.y = frame.size.height + 5; diff --git a/box-Authorizer/globel/ManagerCommon/TimeManeger.m b/box-Authorizer/globel/ManagerCommon/TimeManeger.m index ed66139..e08611f 100644 --- a/box-Authorizer/globel/ManagerCommon/TimeManeger.m +++ b/box-Authorizer/globel/ManagerCommon/TimeManeger.m @@ -25,7 +25,6 @@ + (NSString *)minutesFormatString:(int)totalSeconds{ } } - //根据时间戳计算已过时间 + (NSString *)getElapseTimeToStringHelp:(NSInteger)second{ if (second <= 0) { diff --git a/box-Authorizer/globel/OpenSSLManager/DDRSAWrapper+openssl.m b/box-Authorizer/globel/OpenSSLManager/DDRSAWrapper+openssl.m index 9608a25..d87134d 100755 --- a/box-Authorizer/globel/OpenSSLManager/DDRSAWrapper+openssl.m +++ b/box-Authorizer/globel/OpenSSLManager/DDRSAWrapper+openssl.m @@ -23,7 +23,6 @@ + (BOOL)generateRSAKeyPairWithKeySize:(int)keySize publicKey:(RSA **)publicKey p } } } - return NO; } diff --git a/box-Authorizer/globel/RSA/DDRSAWrapper.h b/box-Authorizer/globel/RSA/DDRSAWrapper.h index 47b72a2..c2fb4c4 100755 --- a/box-Authorizer/globel/RSA/DDRSAWrapper.h +++ b/box-Authorizer/globel/RSA/DDRSAWrapper.h @@ -25,25 +25,12 @@ */ - (NSData *)encryptWithKey:(SecKeyRef)key plainData:(NSData *)plainData padding:(SecPadding)padding; - (NSData *)decryptWithKey:(SecKeyRef)key cipherData:(NSData *)cipherData padding:(SecPadding)padding; - - - (NSData *)encryptWithPrivateKey:(SecKeyRef)key plainData:(NSData *)plainData; - (NSData *)decryptWithPublicKey:(SecKeyRef)publicKey cipherData:(NSData *)cipherData; #pragma mark - 指数和模数 - (NSData *)getPublicKeyExp:(NSData *)pk; - (NSData *)getPublicKeyMod:(NSData *)pk ; -/* - 在 iOS9 以上的系统 模数前面要加 00，不然会转换失败 - - const char fixByte = 0; - NSMutableData * fixedModule = [NSMutableData dataWithBytes:&fixByte length:1]; - [fixedModule appendData:m]; - - https://github.com/StCredZero/SCZ-BasicEncodingRules-iOS/issues/6#issuecomment-136601437 - - */ - - (SecKeyRef)publicKeyDataWithMod:(NSData *)modBits exp:(NSData *)expBits; @end diff --git a/box-Authorizer/globel/RSA/DDRSAWrapper.m b/box-Authorizer/globel/RSA/DDRSAWrapper.m index 562970d..04a270b 100755 --- a/box-Authorizer/globel/RSA/DDRSAWrapper.m +++ b/box-Authorizer/globel/RSA/DDRSAWrapper.m @@ -1,5 +1,3 @@ - - #import "DDRSAWrapper.h" #import