add 题目

GIGA/Modules/Mask/View/MaskTimeCircularProgressView.m

@@ -52,6 +52,12 @@
     _isMoving = NO;
     self.countLabel.frame = CGRectMake(_lineWidth, self.frame.size.height /2 - 15 , self.frame.size.width - _lineWidth*2, 30);
     [self addSubview:self.countLabel];
+    UILabel *minlabel = [[UILabel alloc] init];
+    minlabel.frame = CGRectMake(CGRectGetMidX(self.countLabel.frame) - (18/2) , CGRectGetMaxY(self.countLabel.frame) + 8, 18, 14);
+    minlabel.text = @"min";
+    minlabel.textColor = [UIColor whiteColor];
+    minlabel.font = [UIFont fontWithName:GIGA_FONTNAME size:10];
+    [self addSubview:minlabel];
     
 }
 
@@ -204,8 +210,7 @@
     
     self.countLabel.text = [NSString stringWithFormat:@"%02ld:%02ld",minute,second];
     if (hour == 0 && minute == 0 && second == 0) {
-        //面膜结束
-        //[self maskTimeEnd];
+        
         [self.timer destoryTimer];
         [self.playTimer invalidate];
         self.playTimer = nil;

GIGA/Modules/Mask/View/MaskViewBootomWaringView.m

@@ -46,7 +46,7 @@
     [self addSubview:dismisBtn];
     
     [dismisBtn mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.right.mas_equalTo(self.mas_right).offset(10);
+        make.right.mas_equalTo(self.mas_right).offset(-10);
         make.centerY.mas_equalTo(self.mas_centerY);
         make.width.and.height.mas_equalTo(40);
         
@@ -59,7 +59,7 @@
         
         [UIView animateWithDuration:0.4 animations:^{
         
-            self.frame = CGRectMake(0, KMainH, KMainW, 60);
+            self.frame = CGRectMake(0, KMainH, KMainW, 44);
             
         } completion:^(BOOL finished) {
             [self removeFromSuperview];