add files

GIGA/Modules/Mask/Controller/GiGaAppGaurdVC.m

@@ -39,7 +39,6 @@
         make.centerX.mas_equalTo(self.view.mas_centerX);
         make.top.mas_equalTo(self.view.mas_top).offset(200);
     }];
-    
     dismisBtn.layer.masksToBounds = YES;
     dismisBtn.layer.cornerRadius = 15;
     
@@ -47,7 +46,6 @@
 
 -(void)dismisBtnAction{
     
-    
     [self dismissViewControllerAnimated:YES completion:^{
         NC_POST_NAME_OBJECT(APP_GUARD_DISSMISS, nil);
     }];
@@ -58,14 +56,4 @@
     // Dispose of any resources that can be recreated.
 }
 
-/*
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
-    // Get the new view controller using [segue destinationViewController].
-    // Pass the selected object to the new view controller.
-}
-*/
-
 @end

GIGA/Modules/Mask/Controller/GiGaMaskTaskViewController.m

@@ -35,10 +35,10 @@
 //@property (nonatomic,strong) GiGaFlyingCommitInputView *commitInputView;
 @property(nonatomic,strong) UIImageView *maskImageView;
 @property(nonatomic,strong) UIImageView *faceView;
-@property(nonatomic,strong) UIDynamicAnimator *animator;
-@property(nonatomic,strong) UIAttachmentBehavior *attachmentBehavior;
+//@property(nonatomic,strong) UIDynamicAnimator *animator;
+//@property(nonatomic,strong) UIAttachmentBehavior *attachmentBehavior;
 @property(nonatomic) CGPoint attachPoint;
-@property(nonatomic) UISnapBehavior *snapBehavior;
+//@property(nonatomic) UISnapBehavior *snapBehavior;
 
 @end
 
@@ -167,11 +167,31 @@
 -(void)viewWillAppear:(BOOL)animated{
     [super viewWillAppear:animated];
     
+    
+}
+
+-(void)viewDidAppear:(BOOL)animated{
+    [super viewDidAppear:animated];
+    if([self.navigationController respondsToSelector:@selector(interactivePopGestureRecognizer)]) {
+        self.navigationController.interactivePopGestureRecognizer.enabled = NO;
+    }
+    
+    BOOL showAppGaurd  = [GiGaUserDefault isShowedAppGaurd];
+    if (showAppGaurd == NO) {
+        [self showAPPappGaurdView];
+    }
+}
+-(void)viewWillDisappear:(BOOL)animated{
+    [super viewWillDisappear:animated];
+    if([self.navigationController respondsToSelector:@selector(interactivePopGestureRecognizer)]) {
+        self.navigationController.interactivePopGestureRecognizer.enabled = YES;
+    }
 }
 
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
+    
     [self setUpNav];
     [self initUI];
     [self addNotify];
@@ -185,7 +205,7 @@
      [self.view bringSubviewToFront:self.maskImageView];
      [self.view addSubview:self.countLabel];
     
-     self.animator = [[UIDynamicAnimator alloc] initWithReferenceView:self.view];
+     //self.animator = [[UIDynamicAnimator alloc] initWithReferenceView:self.view];
     
     //face
     [self.faceView  mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -361,7 +381,6 @@
     
     if (isUserLogin) {
         
-        //GIGA_ShowToast(@"userLogin!");
         GiGaQuestionVC *questionVC = [[GiGaQuestionVC alloc] init];
         [self.navigationController pushViewController:questionVC animated:YES];
         
@@ -372,15 +391,7 @@
     }
 }
 
--(void)viewDidAppear:(BOOL)animated{
-    [super viewDidAppear:animated];
-    
-    BOOL showAppGaurd  = [GiGaUserDefault isShowedAppGaurd];
-    
-    if (!showAppGaurd) {
-        [self showAPPappGaurdView];
-    }
-}
+
 
 -(void)addNotify{
     
@@ -405,7 +416,7 @@
 -(void)appGauardViewDissmiss{
     //出现新手引导
     BOOL isshowGaurd = [GiGaUserDefault isShowedGaurd];
-    if (!isshowGaurd) {
+    if (isshowGaurd == NO) {
         NSLog(@"%d",(int)isshowGaurd );
         [self showUserGaurdView];
     }
@@ -434,6 +445,7 @@
 
 #pragma mark App引导页
 -(void)showAPPappGaurdView{
+    
     GiGaAppGaurdVC *gaurdVC = [[GiGaAppGaurdVC alloc] init];
     [self presentViewController:gaurdVC animated:YES completion:nil];
 }