Commit 4e998a20 authored by lmj_521aiau@163.com's avatar lmj_521aiau@163.com

no message

parent 8eb1cc0f
...@@ -63,6 +63,35 @@ ...@@ -63,6 +63,35 @@
self.function1Label.text = ICLocalized(@"RemoveUnwantFile");//@"超快去除无用文件"; self.function1Label.text = ICLocalized(@"RemoveUnwantFile");//@"超快去除无用文件";
self.function2Label.text = ICLocalized(@"SecurelyData");//@"安全隐藏敏感数据"; self.function2Label.text = ICLocalized(@"SecurelyData");//@"安全隐藏敏感数据";
self.function3Label.text = ICLocalized(@"ForgetAdvert");//@"忘掉广告和限制"; self.function3Label.text = ICLocalized(@"ForgetAdvert");//@"忘掉广告和限制";
CAKeyframeAnimation *animation = [CAKeyframeAnimation animation];
animation.keyPath = @"transform.scale";
animation.duration = 1.6;
animation.repeatCount = CGFLOAT_MAX;
animation.values = @[@(1),@(1.05),@(0.96),@(1),@(1.08),@(0.98),@(1)];
animation.keyTimes = @[@(0),@(0.13),@(0.26),@(0.39),@(0.52),@(0.9),@(1)];
animation.timingFunctions = @[[CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionLinear],
[CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionLinear],
[CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionLinear],
[CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionLinear],
[CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionLinear],
[CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionLinear],
[CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseOut]];
[self.yearContentView.layer addAnimation:animation forKey:nil];
// CABasicAnimation * animation = [[CABasicAnimation alloc] init];
// animation.duration = 1.f;
// animation.beginTime = 0.f;
// animation.fromValue = @(0.95);
// animation.toValue = @(1.05);
// animation.keyPath = @"transform.scale";
// animation.timingFunction = [CAMediaTimingFunction functionWithName: kCAMediaTimingFunctionEaseInEaseOut];
// animation.autoreverses = true;
// animation.repeatCount = MAXFLOAT;
// [self.yearContentView.layer addAnimation:animation forKey: @"transform.scale"];
} }
-(void)getIpaList { -(void)getIpaList {
......
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
#import "ICContactManageViewCell.h" #import "ICContactManageViewCell.h"
#import "ICPhotoManageHeaderView.h" #import "ICPhotoManageHeaderView.h"
#import "WKClearPhotoManager.h" #import "WKClearPhotoManager.h"
#import "MBProgressHUD.h"
#import "WKSimilarPhotoViewController.h" #import "WKSimilarPhotoViewController.h"
#import "ICNormalPhotoViewController.h" #import "ICNormalPhotoViewController.h"
#import "ICPhotoLocationViewController.h" #import "ICPhotoLocationViewController.h"
...@@ -122,13 +121,13 @@ ...@@ -122,13 +121,13 @@
return; return;
} }
__weak typeof(self) weakSelf = self; __weak typeof(self) weakSelf = self;
[MBProgressHUD showLoading:@"正在查询,请稍后..." toView:self.view]; // [MBProgressHUD showLoading:@"正在查询,请稍后..." toView:self.view];
[self.photoMgr loadLocationPhotoWithProcess:^(NSInteger current, NSInteger total) { [self.photoMgr loadLocationPhotoWithProcess:^(NSInteger current, NSInteger total) {
NSLog(@"loadLocationPhotoWithProcess %ld", (long)current); NSLog(@"loadLocationPhotoWithProcess %ld", (long)current);
cell.progressView.strokeStart = ((CGFloat)current / (CGFloat)(total / 4)); cell.progressView.strokeStart = ((CGFloat)current / (CGFloat)(total / 4));
cell.countLabel.text = [NSString stringWithFormat:@"%lu", (unsigned long)weakSelf.photoMgr.locationArray.count]; cell.countLabel.text = [NSString stringWithFormat:@"%lu", (unsigned long)weakSelf.photoMgr.locationArray.count];
} completionHandler:^(BOOL success, NSError *error) { } completionHandler:^(BOOL success, NSError *error) {
[MBProgressHUD hideHUDForView:self.view]; // [MBProgressHUD hideHUDForView:self.view];
cell.progressView.strokeStart = 0; cell.progressView.strokeStart = 0;
}]; }];
} }
...@@ -272,7 +271,7 @@ ...@@ -272,7 +271,7 @@
- (void)loadPhotoData: (BOOL)isFirstLoad { - (void)loadPhotoData: (BOOL)isFirstLoad {
[self.tableView reloadData]; [self.tableView reloadData];
[MBProgressHUD showLoading:@"正在查询,请稍后..." toView:self.view]; // [MBProgressHUD showLoading:@"正在查询,请稍后..." toView:self.view];
if (self.photoMgr.currentIndex <= 0) { if (self.photoMgr.currentIndex <= 0) {
self.photoMgr.pauseAction = false; self.photoMgr.pauseAction = false;
__weak typeof(self) weakSelf = self; __weak typeof(self) weakSelf = self;
...@@ -327,7 +326,7 @@ ...@@ -327,7 +326,7 @@
self.screenshotArray = self.photoMgr.snapshotArray; self.screenshotArray = self.photoMgr.snapshotArray;
self.similarPhotoArray = self.photoMgr.similarArray; self.similarPhotoArray = self.photoMgr.similarArray;
self.similarLiveArray = self.photoMgr.similarLiveArray; self.similarLiveArray = self.photoMgr.similarLiveArray;
[MBProgressHUD hideHUDForView:self.view]; // [MBProgressHUD hideHUDForView:self.view];
[self loadLocationAssets]; [self loadLocationAssets];
[self.tableView reloadData]; [self.tableView reloadData];
}]; }];
...@@ -367,7 +366,7 @@ ...@@ -367,7 +366,7 @@
self.screenshotArray = self.photoMgr.snapshotArray; self.screenshotArray = self.photoMgr.snapshotArray;
self.similarPhotoArray = self.photoMgr.similarArray; self.similarPhotoArray = self.photoMgr.similarArray;
self.similarLiveArray = self.photoMgr.similarLiveArray; self.similarLiveArray = self.photoMgr.similarLiveArray;
[MBProgressHUD hideHUDForView:self.view]; // [MBProgressHUD hideHUDForView:self.view];
[self loadLocationAssets]; [self loadLocationAssets];
[self.tableView reloadData]; [self.tableView reloadData];
return; return;
...@@ -431,7 +430,7 @@ ...@@ -431,7 +430,7 @@
self.screenshotArray = self.photoMgr.snapshotArray; self.screenshotArray = self.photoMgr.snapshotArray;
self.similarPhotoArray = self.photoMgr.similarArray; self.similarPhotoArray = self.photoMgr.similarArray;
self.similarLiveArray = self.photoMgr.similarLiveArray; self.similarLiveArray = self.photoMgr.similarLiveArray;
[MBProgressHUD hideHUDForView:self.view]; // [MBProgressHUD hideHUDForView:self.view];
[self loadLocationAssets]; [self loadLocationAssets];
[self.tableView reloadData]; [self.tableView reloadData];
}]; }];
......
...@@ -66,6 +66,10 @@ static ICUserManager * manager; ...@@ -66,6 +66,10 @@ static ICUserManager * manager;
// return self.model.isMember; // return self.model.isMember;
//#endif //#endif
// } // }
if (!dateString) {
Data * data = [[Data alloc] init];
dateString = [NSString stringWithFormat:@"%@ 23:59", [[data Read] objectForKey:@"memberEndTime"]];
}
NSDateFormatter *formatter = [[NSDateFormatter alloc] init]; NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
formatter.dateFormat = @"yyyy-MM-dd HH:mm"; formatter.dateFormat = @"yyyy-MM-dd HH:mm";
...@@ -128,9 +132,11 @@ static ICUserManager * manager; ...@@ -128,9 +132,11 @@ static ICUserManager * manager;
NSLog(@"%@", response); NSLog(@"%@", response);
NSString *uid = response[@"result"][@"data"][@"uid"]; NSString *uid = response[@"result"][@"data"][@"uid"];
NSString *token = response[@"result"][@"data"][@"token"]; NSString *token = response[@"result"][@"data"][@"token"];
NSString *memberEndTime = response[@"result"][@"data"][@"memberEndTime"];
Data * data = [[Data alloc] init]; Data * data = [[Data alloc] init];
[data WirteDic:uid Key:@"uid"]; [data WirteDic:uid Key:@"uid"];
[data WirteDic:token Key:@"token"]; [data WirteDic:token Key:@"token"];
[data WirteDic:memberEndTime Key:@"memberEndTime"];
ZTUserInfoModel *model = [ZTUserInfoModel modelWithDic: response[@"result"][@"data"]]; ZTUserInfoModel *model = [ZTUserInfoModel modelWithDic: response[@"result"][@"data"]];
self.model = model; self.model = model;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment