apple 5 anni fa
parent
commit
478e771d3e

+ 2 - 2
ios/JianYuIOS/JianYuIOS.xcodeproj/project.pbxproj

@@ -1056,7 +1056,7 @@
 				CODE_SIGN_ENTITLEMENTS = JianYuIOS/JianYuIOS.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 53;
+				CURRENT_PROJECT_VERSION = 55;
 				DEVELOPMENT_TEAM = 4S438G3ZUL;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1140,7 +1140,7 @@
 				CODE_SIGN_ENTITLEMENTS = JianYuIOS/JianYuIOS.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 53;
+				CURRENT_PROJECT_VERSION = 55;
 				DEVELOPMENT_TEAM = 4S438G3ZUL;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

BIN
ios/JianYuIOS/JianYuIOS.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate


+ 1 - 1
ios/JianYuIOS/JianYuIOS/Classes(模块)/JYNewExpViewController.m

@@ -867,7 +867,7 @@ NSString *const new_AesKey_3 = @"mGlAgnIBB8bx2nch";
     if([SKPaymentQueue canMakePayments]){
         [self requestProductData:productid];
     }else{
-       
+       [[LXViewControllerManager shareViewControllerManager] hideHud];
     }
 }
 

+ 1 - 1
ios/JianYuIOS/JianYuIOS/Classes(模块)/JYNewMineViewController.m

@@ -886,7 +886,7 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
     if([SKPaymentQueue canMakePayments]){
         [self requestProductData:productid];
     }else{
-
+        [[LXViewControllerManager shareViewControllerManager] hideHud];
     }
 }
 

+ 4 - 5
ios/JianYuIOS/JianYuIOS/Classes(模块)/JYNewSearchViewController.m

@@ -455,11 +455,6 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
         }];
     });
 }
-- (void)viewDidUnload {
-    NSLog(@"viewDidUnload\nviewDidUnload\nviewDidUnload\nviewDidUnload\nviewDidUnload\nviewDidUnload\nviewDidUnload\nviewDidUnload\nviewDidUnload\nviewDidUnload\n");
-    [super viewDidUnload];
-    [[SKPaymentQueue defaultQueue] removeTransactionObserver:self];
-}
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
@@ -1114,6 +1109,7 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
         [self requestProductData:productid];
     }else{
         NSLog(@"不允许程序内付费");
+        [[LXViewControllerManager shareViewControllerManager] hideHud];
     }
 }
 
@@ -1138,6 +1134,7 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
  
 //监听购买结果
 - (void)paymentQueue:(SKPaymentQueue *)queue updatedTransactions:(NSArray *)transactions {
+//    NSLog(@"收到支付回调");
     for (SKPaymentTransaction *transaction in transactions) {
         switch (transaction.transactionState) {
             case SKPaymentTransactionStatePurchased://交易完成
@@ -1218,6 +1215,8 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
 -(void)judgeIsHiddenBottom {
     if(self.tabBarController.selectedIndex == 0) {
         NSString *current_url = [self stringByEvaluatingJavaScriptFromString:@"document.location.href"];
+        NSArray *array = [current_url componentsSeparatedByString:@"?"];
+        current_url = [NSString stringWithFormat:@"%@",array.firstObject];
         if([current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/jylab/mainSearch",kHost]]){
             [self showTabBar];
             [self showMethodTabBar];

+ 1 - 0
ios/JianYuIOS/JianYuIOS/Classes(模块)/JYNewSubViewController.m

@@ -879,6 +879,7 @@ NSString *const new_AesKey_2 = @"mGlAgnIBB8bx2nch";
         [self requestProductData:productid];
     }else{
 //        [[LXViewControllerManager shareViewControllerManager]showHudOnlyText:@"不允许程序内付费" delay:1];
+        [[LXViewControllerManager shareViewControllerManager] hideHud];
     }
 }