add

2018-09-20 23:00:59 +08:00
parent 309cae4ab2
commit f2729d343e
45 changed files with 976 additions and 14 deletions
@@ -31,6 +31,7 @@
 #import "GiGaUser.h"
 #import "GiGaUserManager.h"
 #import "GiGaBaseAPiRequest.h"
+#import "MaskTestResultVC.h"


@interface GiGaMaskTaskViewController ()<MaskCirCularProGressViewDelegate>
@@ -394,7 +395,6 @@
        make.height.and.width.mas_equalTo(136);
        make.centerX.mas_equalTo(self.view.mas_centerX);
    }];
-    
 }

 #pragma mark 面膜时间背景音乐
@@ -488,7 +488,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];
    
+    return;
    GiGaQuestionVC *questionVC = [[GiGaQuestionVC alloc] init];
    [self.navigationController pushViewController:questionVC animated:YES];