我的页面新人优惠充值入口优化

xplan-ios/Assets.xcassets/NewUserRecharge/new_user_recharge_close.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "new_user_recharge_close@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "new_user_recharge_close@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

xplan-ios/Main/Mine/View/SubViews/XPMineNewUserRechargeView.m

@@ -55,18 +55,9 @@
     UIPanGestureRecognizer *pan = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(roomMiniTag:)];
     pan.delaysTouchesBegan = YES;
     [self addGestureRecognizer:pan];
-    
-    UITapGestureRecognizer *enterRoomTag = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(enterRomRecognizer:)];
-    [self addGestureRecognizer:enterRoomTag];
 }
 
 #pragma mark - events
-- (void)enterRomRecognizer:(UITapGestureRecognizer *)tap {
-//    if (self.currentRoomUid > 0 && self.controller) {
-//        [XPRoomViewController openMiniRoom:self.currentRoomUid viewController:self.controller];
-//    }
-}
-
 - (void)roomMiniTag:(UIPanGestureRecognizer*)p {
     UIWindow *appWindow = [UIApplication sharedApplication].delegate.window;
     CGPoint panPoint = [p locationInView:appWindow];
@@ -100,13 +91,13 @@
         }
         
         if (minSpace == left) {
-            newCenter = CGPointMake(15+touchWidth/2.0, targetY);
+            newCenter = CGPointMake(touchWidth/2.0, targetY);
         }else if (minSpace == right) {
-            newCenter = CGPointMake(screenWidth - touchWidth/2.0 - 15, targetY);
+            newCenter = CGPointMake(touchWidth/2.0, targetY);
         }else if (minSpace == top) {
-            newCenter = CGPointMake(panPoint.x, touchWidth / 3);
+            newCenter = CGPointMake(touchWidth/2.0, touchWidth / 3);
         }else {
-            newCenter = CGPointMake(panPoint.x, screenHeight - touchWidth / 3);
+            newCenter = CGPointMake(touchWidth/2.0, screenHeight - touchWidth / 3);
         }
         [UIView animateWithDuration:0.25 animations:^{
             if (newCenter.y + self.frame.size.height / 2 > KScreenHeight - kSafeAreaBottomHeight - 44) {

xplan-ios/Main/Tabbar/View/NewUserRecharge/XPNewUserRechargeViewController.m

@@ -112,7 +112,7 @@
     [self.closeBtn mas_makeConstraints:^(MASConstraintMaker *make) {
         make.bottom.mas_equalTo(self.backImageView.mas_top);
         make.width.height.mas_equalTo(21);
-        make.right.mas_equalTo(self.backImageView).mas_offset(8);
+        make.right.mas_equalTo(self.backImageView).mas_offset(-8);
     }];
     [self.countDownLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.mas_equalTo(self.backImageView).mas_offset(87);
@@ -323,7 +323,8 @@
 - (UIButton *)closeBtn {
     if (!_closeBtn) {
         _closeBtn = [[UIButton alloc] init];
-        [_closeBtn setImage:[UIImage imageNamed:@""] forState:UIControlStateNormal];
+        [_closeBtn setImage:[UIImage imageNamed:@"new_user_recharge_close"] forState:UIControlStateNormal];
+        _closeBtn.userInteractionEnabled = NO;
     }
     return _closeBtn;
 }