Merge remote-tracking branch 'refs/remotes/origin/master'

GYDemo/GYDemo/AppDelegate.mm

@@ -85,7 +85,7 @@ NSDictionary* appLaunchOpts;
         GYWebViewController * web = [[GYWebViewController alloc] init];
         NSString *withdrawUrl =  [[CGUserManager shared].h5_url objectForKey:@"withdrawurl"];
         if (web.url == nil || web.url.length == 0) {
-            web.url = @"http://h5v2.zhangxinzhixun.com/farm/Withdraw";
+            web.url = WithdrawURL;
         }
         //显示操作引导
         Data * data = [[Data alloc] init];
@@ -122,7 +122,8 @@ NSDictionary* appLaunchOpts;
     GYWebViewController * web = [[GYWebViewController alloc] init];
     web.url = [[CGUserManager shared].h5_url objectForKey:@"rankingurl"];
     if (web.url == nil || web.url.length == 0) {
-        web.url = @"http://h5v3.zhangxinzhixun.com/huayuan/Ranking";
+        web.url = RankingURL;
+
     }
     UINavigationController * nav = [[UINavigationController alloc] initWithRootViewController:web];
     nav.modalPresentationStyle = UIModalPresentationFullScreen;
@@ -140,7 +141,7 @@ NSDictionary* appLaunchOpts;
     GYWebViewController * web = [[GYWebViewController alloc] init];
     web.url = [[CGUserManager shared].h5_url objectForKey:@"welfareurl"];
     if (web.url == nil || web.url.length == 0) {
-        web.url = @"http://h5v3.zhangxinzhixun.com/huayuan/Welfare";
+        web.url = WelfareURL;
     }
     
 //    WelfareCenterVC * vc = [[WelfareCenterVC alloc]init];
@@ -167,7 +168,7 @@ NSDictionary* appLaunchOpts;
     GYWebViewController * web = [[GYWebViewController alloc] init];
     web.url = [[CGUserManager shared].h5_url objectForKey:@"clockInzurl"];
     if (web.url == nil || web.url.length == 0) {
-        web.url = @"http://h5v3.zhangxinzhixun.com/huayuan/ClockIn";
+        web.url = ClockINZUNL;
     }
     UINavigationController * nav = [[UINavigationController alloc] initWithRootViewController:web];
     nav.modalPresentationStyle = UIModalPresentationFullScreen;

GYDemo/GYDemo/GYPrefixHeader.pch

@@ -129,6 +129,13 @@ typedef enum : NSUInteger {
 //瑞狮
 #define VLNAPPId @"31153"
 
+
+#define ClockINZUNL @"https://h5v3.zhangxinzhixun.com/huayuan/ClockIn"
+#define WelfareURL @"https://h5v3.zhangxinzhixun.com/huayuan/Welfare"
+#define WithdrawURL @"https://h5v2.zhangxinzhixun.com/farm/Withdraw"
+#define RankingURL @"https://h5v3.zhangxinzhixun.com/huayuan/Ranking"
+
+
 //#define BUOpenScreenAdId             @"887385283"
 //#define BUBannerAdId                 @"945509537"
 //#define BUAllScreenVideoAdId         @"945509533"

GYDemo/GYDemo/ViewController/GYLoginViewController.m

@@ -49,6 +49,7 @@
 
 /// 跳过
 - (IBAction)skipAction:(UIButton *)sender {
+    self.view.hidden = YES;
     [self.view removeFromSuperview];
     [self removeFromParentViewController];
     [[CGUserManager shared] addLocCollection:@"click_skip_button" value:@""];

GYDemo/GYDemo/ViewController/GYWebViewController.m

@@ -401,9 +401,7 @@
     [MBProgressHUD showError:@"未知错误" toView:self.view];
     [self goBackController];
 }
-- (void)webView:(WKWebView *)webView didFailNavigation:(null_unspecified WKNavigation *)navigation withError:(NSError *)error;{
 
-}
 // 当web content处理完成时，会回调
 - (void)webViewWebContentProcessDidTerminate:(WKWebView *)webView {