fix: 领金币添加任务跳转

GYDemo/GYDemo/Alert/GYTaskAlertView.m

@@ -10,6 +10,7 @@
 #import "GYTaskAlertCollectionHeaderView.h"
 #import "GYDayTaskModel.h"
 #import "GYGiftAlertView.h"
+#import "AppDelegate.h"
 
 @interface GYTaskAlertView ()<UICollectionViewDelegate,UICollectionViewDataSource,UICollectionViewDelegateFlowLayout>
 
@@ -85,7 +86,6 @@
 - (void)dismiss{
     
     [UIView animateWithDuration:0.5 animations:^{
-
         self.bgView.frame = CGRectMake(0, KScreenHeight, KScreenWidth, self.bgView.frame.size.height);
         self.alpha = 0;
         self.bgView.alpha = 0;
@@ -94,6 +94,51 @@
     }];
 }
 
+- (void)statusNotFinishAction:(UIButton *)sender {
+    //1 转盘 2 高额水滴任务 3 首页 4 激励视频  5 直客任务链接 6 福利中心"
+    GYDayTaskModel * model = self.dataSource[sender.tag-0x64];
+    switch (model.reference) {
+        case 1:
+        {
+            [UIView animateWithDuration:0.5 animations:^{
+                self.bgView.frame = CGRectMake(0, KScreenHeight, KScreenWidth, self.bgView.frame.size.height);
+                self.alpha = 0;
+                self.bgView.alpha = 0;
+            } completion:^(BOOL finished) {
+                [self removeFromSuperview];
+                [(AppDelegate *)[UIApplication sharedApplication].delegate ios_luckyTurntable];
+            }];
+        }
+            break;
+        case 2:
+            NSLog(@"高额水滴任务 (广告)");
+            break;
+        case 3:
+            [self dismiss];
+            break;
+        case 4:
+            NSLog(@"激励视频");
+            break;
+        case 5:
+            NSLog(@"直客任务链接 互动广告");
+            break;
+        case 6:
+        {
+            [UIView animateWithDuration:0.5 animations:^{
+                self.bgView.frame = CGRectMake(0, KScreenHeight, KScreenWidth, self.bgView.frame.size.height);
+                self.alpha = 0;
+                self.bgView.alpha = 0;
+            } completion:^(BOOL finished) {
+                [self removeFromSuperview];
+                [(AppDelegate *)[UIApplication sharedApplication].delegate ios_oneveryDayWelfareClick];
+            }];
+        }
+            break;
+        default:
+            break;
+    }
+}
+
 - (void)drawTask:(UIButton *)sender{
     
     GYDayTaskModel * model = self.dataSource[sender.tag-0x64];
@@ -192,14 +237,14 @@
         [cell.confirmBtn setImage:[UIImage imageNamed:@"task_cell_completion"] forState:(UIControlStateNormal)];
         [cell.confirmBtn removeTarget:self action:@selector(clickNone) forControlEvents:UIControlEventTouchUpInside];
         [cell.confirmBtn removeTarget:self action:@selector(drawTask:) forControlEvents:UIControlEventTouchUpInside];
-        [cell.confirmBtn addTarget:self action:@selector(dismiss) forControlEvents:(UIControlEventTouchUpInside)];
+        [cell.confirmBtn addTarget:self action:@selector(statusNotFinishAction:) forControlEvents:(UIControlEventTouchUpInside)];
     }else if (model.status == 1){
         [cell.confirmBtn setImage:[UIImage imageNamed:@"task_cell_done"] forState:(UIControlStateNormal)];
         [cell.confirmBtn removeTarget:self action:@selector(drawTask:) forControlEvents:UIControlEventTouchUpInside];
-        [cell.confirmBtn removeTarget:self action:@selector(dismiss) forControlEvents:UIControlEventTouchUpInside];
+        [cell.confirmBtn removeTarget:self action:@selector(statusNotFinishAction:) forControlEvents:UIControlEventTouchUpInside];
         [cell.confirmBtn addTarget:self action:@selector(clickNone) forControlEvents:(UIControlEventTouchUpInside)];
     }else{
-        [cell.confirmBtn removeTarget:self action:@selector(dismiss) forControlEvents:UIControlEventTouchUpInside];
+        [cell.confirmBtn removeTarget:self action:@selector(statusNotFinishAction:) forControlEvents:UIControlEventTouchUpInside];
         [cell.confirmBtn removeTarget:self action:@selector(clickNone) forControlEvents:UIControlEventTouchUpInside];
         [cell.confirmBtn addTarget:self action:@selector(drawTask:) forControlEvents:(UIControlEventTouchUpInside)];
         [cell.confirmBtn setImage:[UIImage imageNamed:@"task_cell_draw"] forState:(UIControlStateNormal)];

GYDemo/GYDemo/Alert/GYTaskAlertView.xib

@@ -2,6 +2,7 @@
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
+        <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>

GYDemo/GYDemo/AppDelegate.h

@@ -26,6 +26,9 @@
 - (void)ios_getOrderData;
 - (void)unityVideo:(BOOL)video;
 
+- (void)ios_luckyTurntable;
+- (void)ios_oneveryDayWelfareClick;
+
 // 获取当前window
 - (UIWindow *)getMainWindow;
 // 获取当前window 最上方控制器

GYDemo/GYDemo/GYPrefixHeader.pch

@@ -14,29 +14,29 @@
 #ifndef GYPrefixHeader_pch
 #define GYPrefixHeader_pch
 
-//#define ServerReport   @"http://reporttest.zhangxinhulian.com"
-//#define ServerHost     @"https://feedapitest.zhangxinhulian.com" // 服务端接口地址
-//#define ServerAds      @"http://bstest.zhangxinhulian.com/v4/ads"
+#define ServerReport   @"http://reporttest.zhangxinhulian.com"
+#define ServerHost     @"https://feedapitest.zhangxinhulian.com" // 服务端接口地址
+#define ServerAds      @"http://bstest.zhangxinhulian.com/v4/ads"
 
-#define ServerReport   @"http://report.clouddistribute.net"
-#define ServerHost     @"https://feedapi.clouddistribute.net" // 服务端接口地址
-#define ServerAds      @"http://bs.clouddistribute.net/v4/ads"
+//#define ServerReport   @"http://report.clouddistribute.net"
+//#define ServerHost     @"https://feedapi.clouddistribute.net" // 服务端接口地址
+//#define ServerAds      @"http://bs.clouddistribute.net/v4/ads"
 
-#define WXAppId @"wxe7a03eb52cce1b51"
-#define WXAppSecret @"6fa72a89ea188c4dff5729cff328b587"
-#define WXUniversalLink @"https://feedapi.clouddistribute.net/LuckFarm/"
-#define WXLoginState @"WTF"
-#define WXLoginName @"WXLogin"
+#define WXAppId         @"wxe7a03eb52cce1b51"
+#define WXAppSecret     @"6fa72a89ea188c4dff5729cff328b587"
+#define WXUniversalLink @"https:                           //feedapi.clouddistribute.net/LuckFarm/"
+#define WXLoginState    @"WTF"
+#define WXLoginName     @"WXLogin"
 
-#define UMAppkey @"5f966f0d45b2b751a91b6012"
+#define UMAppkey        @"5f966f0d45b2b751a91b6012"
 
-#define saltA @"HXHJ4KDL1QPFHGA0" // md5盐值
-#define saltB @"ZJQJQ66AH9COTXSU"
+#define saltA           @"HXHJ4KDL1QPFHGA0"                // md5盐值
+#define saltB           @"ZJQJQ66AH9COTXSU"
 
-#define aesIvParameter @"e2e7d664d72f710b" // 密钥默认偏移，可更改
-#define aesKey         @"c20505927997d952" // key必须为16位，可更改为自己的key
+#define aesIvParameter  @"e2e7d664d72f710b"                // 密钥默认偏移，可更改
+#define aesKey          @"c20505927997d952"                // key必须为16位，可更改为自己的key
 
-#define appLs @"327ec0258dc8d0b3"
+#define appLs           @"327ec0258dc8d0b3"
 
 #define kAdCodeId      @"ad_code_id"
 #define kAdClkTracking @"ad_clk_tracking"

GYDemo/GYDemo/View/GYCountDownTimeView.h

@@ -15,6 +15,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) NSString * details;
 @property (nonatomic, copy) void(^countDownCallBcak)(BOOL result);
 
+-(void)destroyTimer;
+
 @end
 
 NS_ASSUME_NONNULL_END

GYDemo/GYDemo/View/GYCountDownTimeView.m

@@ -31,6 +31,12 @@
     [self.roundView addSubview:self.roundProgressView];
 }
 
+
+- (void)willRemoveSubview:(UIView *)subview {
+    [super willRemoveSubview:subview];
+    
+}
+
 - (void)layoutSubviews{
     [super layoutSubviews];
     self.roundProgressView.frame = self.roundView.bounds;
@@ -59,6 +65,13 @@
     }
 }
 
+// 销毁timer
+-(void)destroyTimer {
+    if (self.timer) {    
+        dispatch_source_cancel(self.timer);
+    }
+}
+
 - (void)countDown{
     __block int count = 0;
     _downDone = NO;

GYDemo/GYDemo/ViewController/GYWebViewController.m

@@ -36,6 +36,12 @@
 - (void)viewDidDisappear:(BOOL)animated{
     [super viewDidDisappear:animated];
 //    [[NSNotificationCenter defaultCenter] removeObserver:self];
+    
+    if (self.countDownView) {
+        [self.countDownView destroyTimer];
+        [self.countDownView removeFromSuperview];
+    }
+    
 }
 
 - (void)viewDidLoad {
@@ -94,11 +100,7 @@
     [self.webView loadRequest:_requestW];
     
     if (!_showNav){
-        if (@available(iOS 11.0, *)) {
-            self.webView.scrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
-        } else {
-            self.automaticallyAdjustsScrollViewInsets = NO;
-        }
+        self.webView.scrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
     }
     
     if (self.countDown > 0) {
@@ -532,7 +534,6 @@
             [[CGUserManager shared] addLocCollection:bodyStr value:@""];
         }
     }
-
 }
 
 // alert

GYDemo/Pods/Pods.xcodeproj/xcuserdata/mazy.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -14,17 +14,17 @@
 		<key>Bytedance-UnionAD.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>12</integer>
+			<integer>9</integer>
 		</dict>
 		<key>GDTMobSDK.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>11</integer>
+			<integer>8</integer>
 		</dict>
 		<key>KSAdSDK.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>7</integer>
+			<integer>11</integer>
 		</dict>
 		<key>MBProgressHUD.xcscheme</key>
 		<dict>
@@ -57,12 +57,12 @@
 		<key>UMCCommon.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>8</integer>
+			<integer>7</integer>
 		</dict>
 		<key>WechatOpenSDK.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>9</integer>
+			<integer>10</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>

UnityiOSFarm/Unity-iPhone.xcodeproj/xcuserdata/mazy.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -12,7 +12,7 @@
 		<key>UnityFramework.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>10</integer>
+			<integer>12</integer>
 		</dict>
 	</dict>
 </dict>