This commit is contained in:
lianxiang
2018-09-21 18:27:32 +08:00
parent f2729d343e
commit db1740e72b
573 changed files with 53631 additions and 3597 deletions
@@ -32,6 +32,7 @@
#import "GiGaUserManager.h"
#import "GiGaBaseAPiRequest.h"
#import "MaskTestResultVC.h"
#import "GIGaMaskShareViewController.h"
@interface GiGaMaskTaskViewController ()<MaskCirCularProGressViewDelegate>
@@ -488,18 +489,20 @@
#pragma mark 开始测试
-(void)testBtnAcion:(UIButton *)btn{
NSDictionary *dic = @{
@"dryness":@"0.41",
@"drynessPercent":@"41%",
@"mask":@"",
@"minute":@"19",
@"oiliness":@"0.59",
@"oilinessPercent":@"59%"
};
MaskTestResult *model =[[MaskTestResult alloc] initWithDictionary:dic error:nil];
MaskTestResultVC *resultVC = [[MaskTestResultVC alloc] init];
resultVC.model = model;
[self.navigationController pushViewController:resultVC animated:YES];
// NSDictionary *dic = @{
// @"dryness":@"0.41",
// @"drynessPercent":@"41%",
// @"mask":@"",
// @"minute":@"19",
// @"oiliness":@"0.59",
// @"oilinessPercent":@"59%"
// };
// MaskTestResult *model =[[MaskTestResult alloc] initWithDictionary:dic error:nil];
// MaskTestResultVC *resultVC = [[MaskTestResultVC alloc] init];
// resultVC.model = model;
// [self.navigationController pushViewController:resultVC animated:YES];
[self showAlertGoShareMaskTime];
return;
GiGaQuestionVC *questionVC = [[GiGaQuestionVC alloc] init];
@@ -696,4 +699,23 @@
}
#pragma mark 去分享
-(void)showAlertGoShareMaskTime{
[self jxt_showAlertWithTitle:@"面膜时间" message:@"去分享我的面膜时间" appearanceProcess:^(JXTAlertController * _Nonnull alertMaker) {
alertMaker.addActionCancelTitle(@"下次");
alertMaker.addActionDefaultTitle(@"去分享");
} actionsBlock:^(NSInteger buttonIndex, UIAlertAction * _Nonnull action, JXTAlertController * _Nonnull alertSelf) {
if (buttonIndex == 1) {
GIGaMaskShareViewController *shareVC = [[GIGaMaskShareViewController alloc] init];
[self.navigationController pushViewController:shareVC animated:YES];;
}
}];
}
@end