fix voice and withdraw event bugs

GYDemo/GYDemo.xcodeproj/project.pbxproj

@@ -993,7 +993,7 @@
 				CODE_SIGN_ENTITLEMENTS = GYDemo/GYDemo.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 121;
+				CURRENT_PROJECT_VERSION = 103;
 				DEVELOPMENT_TEAM = XWMRLLSSFL;
 				ENABLE_BITCODE = NO;
 				GCC_INCREASE_PRECOMPILED_HEADER_SHARING = NO;
@@ -1025,7 +1025,7 @@
 				CODE_SIGN_ENTITLEMENTS = GYDemo/GYDemo.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 121;
+				CURRENT_PROJECT_VERSION = 103;
 				DEVELOPMENT_TEAM = XWMRLLSSFL;
 				ENABLE_BITCODE = NO;
 				GCC_INCREASE_PRECOMPILED_HEADER_SHARING = NO;

GYDemo/GYDemo/AppDelegate.mm

@@ -79,7 +79,14 @@ NSDictionary* appLaunchOpts;
     [[CGUserManager shared] addLocCollection:@"click_withdraw_redPack_5" value:@""];
     [[CGUserManager shared] addLocCollection:@"show_withdraw_page" value:@""];
     GYWebViewController * web = [[GYWebViewController alloc] init];
-    web.url = [[CGUserManager shared].h5_url objectForKey:@"withdrawurl"];
+    NSString *withdrawUrl =  [[CGUserManager shared].h5_url objectForKey:@"withdrawurl"];
+    //显示操作引导
+    Data * data = [[Data alloc] init];
+    if(![[data Read] objectForKey:@"firstShowNovice"]){
+        [data WirteDic:@"1" Key:@"firstShowNovice"];
+        withdrawUrl = [withdrawUrl stringByAppendingString:@"?novice=1"];
+    }
+    web.url = withdrawUrl;
     UINavigationController * nav = [[UINavigationController alloc] initWithRootViewController:web];
     nav.modalPresentationStyle = UIModalPresentationFullScreen;
     [[[self ufw] appController].window.rootViewController presentViewController:nav animated:YES completion:nil];
@@ -350,7 +357,7 @@ NSDictionary* appLaunchOpts;
                 
             }];
             
-        }else{
+        } else {
             [[CGUserManager shared] addLocCollection:@"play_adVideo_end_cloud_speed_up" value:@""];
 
         }
@@ -684,6 +691,10 @@ NSDictionary* appLaunchOpts;
     
     [self.window makeKeyAndVisible];
     
+    [[CGUserManager shared] getServiceInfo:^{
+    } failure:^{
+    }];
+    
     [ZJGuideConfig configWithWindow:self.window finishMainVC:nil showGuide:^(BOOL result) {
         dispatch_async(dispatch_get_main_queue(), ^{
             [self initUnity];
@@ -699,7 +710,7 @@ NSDictionary* appLaunchOpts;
     
     NSString *status = [[CGUserManager shared].appSwitch[@"isopenH5"] stringValue];
     NSLog(@"isopenH5  = %@", status);
-    if ([status isEqualToString:@"1"]) {
+    if (![status isEqualToString:@"1"]) {
         Data * data = [[Data alloc] init];
         if([[data Read] objectForKey:@"refresh_token"] == nil) {
             [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(launchAdSuccesShow) name:LaunchAdSuccesShow object:nil];
@@ -718,7 +729,6 @@ NSDictionary* appLaunchOpts;
         naviVC.modalPresentationStyle = UIModalPresentationFullScreen;
         [[[self ufw] appController].window.rootViewController.view addSubview:naviVC.view];
         [[[self ufw] appController].window.rootViewController addChildViewController:naviVC];
-//        [[[self ufw] appController].window.rootViewController presentViewController:naviVC animated:false completion:nil];
 //    });
 }
 

GYDemo/GYDemo/SCAds/IOSADManager.m

@@ -398,6 +398,9 @@ static IOSADManager * manager = nil;
             [[CGUserManager shared] addLocCollection:@"splash_request" value:@"splash_request_success"];
             NSMutableArray * models = [NSMutableArray new];
             NSArray * arr = response[@"result"][@"data"];
+            if (arr.count <= 0) {
+                return;
+            }
             for (NSDictionary * dict in arr) {
                 GYAdsTrackModel * model = [GYAdsTrackModel new];
                 [model setValuesForKeysWithDictionary:dict];
@@ -430,6 +433,9 @@ static IOSADManager * manager = nil;
 
             NSMutableArray * models = [NSMutableArray new];
             NSArray * arr = response[@"result"][@"data"];
+            if (arr.count <= 0) {
+                return;
+            }
             for (NSDictionary * dict in arr) {
                 GYAdsTrackModel * model = [GYAdsTrackModel new];
                 [model setValuesForKeysWithDictionary:dict];
@@ -468,11 +474,17 @@ static IOSADManager * manager = nil;
     
     [[CGNetworkTools shared] getWithAdsAction:getAdsInfo parameters: @{@"slotName": @"common_video"} success:^(id  _Nonnull response) {
         if ([[response objectForKey:@"status"] intValue] == 200) {
+    
             requestToTry = 0;
             NSLog(@"common_video-response = %@",response);
             [[CGUserManager shared] addLocCollection:@"reward_request" value:@"reward_request_success"];
             NSMutableArray * models = [[NSMutableArray alloc]init];
             NSArray * arr = response[@"result"][@"data"];
+            
+            if (arr.count <= 0) {
+                return;
+            }
+            
             for (NSDictionary * dict in arr) {
                 GYAdsTrackModel * model = [GYAdsTrackModel new];
                 [model setValuesForKeysWithDictionary:dict];

GYDemo/GYDemo/ViewController/GYWebViewController.m

@@ -90,7 +90,7 @@
     self.progressView = [[UIProgressView alloc] initWithFrame:CGRectMake(0, statusBarFrameHeight, KScreenWidth, 2)];
     _progressView.backgroundColor = [UIColor groupTableViewBackgroundColor];
     
-    _progressView.progressTintColor = UIColor.whiteColor; //kColorWithRGB(112, 156, 246);
+    _progressView.progressTintColor = kColorWithRGB(112, 156, 246);
     _progressView.transform = CGAffineTransformMakeScale(1.0f, 1.5f);
     [self.view addSubview:_progressView];
     [self.view bringSubviewToFront:self.progressView];