From 074b5e4d09165ec1866b216889d2a4b130a6741f Mon Sep 17 00:00:00 2001
From: lpw
Date: Mon, 22 Jul 2024 09:24:16 +0800
Subject: [PATCH] 提交4.2.0
---
/dev/null | 49 ------------------------
WAApImpl.podspec | 2
WAApImpl/4.2.0/WAApImpl.podspec | 25 ++++++++++++
frameworks/WAApImpl.framework/Headers/WAApImpl.h | 2
frameworks/WAApImpl.framework/WAApImpl | 0
config/wa_sdk_impl_config_apple.xml | 2
6 files changed, 28 insertions(+), 52 deletions(-)
diff --git a/WAApImpl.podspec b/WAApImpl.podspec
index 329fb15..0d5693d 100644
--- a/WAApImpl.podspec
+++ b/WAApImpl.podspec
@@ -9,7 +9,7 @@
Pod::Spec.new do |s|
s.name = 'WAApImpl'
-s.version = '4.0.0'
+s.version = '4.2.0'
s.summary = 'WAApImpl framework in production environment.'
s.license = 'MIT'
s.author = { "Wuyx" => "wuyixin_gh@gamehollywood.com" }
diff --git a/WAApImpl/4.2.0/WAApImpl.podspec b/WAApImpl/4.2.0/WAApImpl.podspec
new file mode 100644
index 0000000..0d5693d
--- /dev/null
+++ b/WAApImpl/4.2.0/WAApImpl.podspec
@@ -0,0 +1,25 @@
+#
+# Be sure to run `pod spec lint WAApImpl.podspec' to ensure this is a
+# valid spec and to remove all comments including this before submitting the spec.
+#
+# To learn more about Podspec attributes see http://docs.cocoapods.org/specification.html
+# To see working Podspecs in the CocoaPods repo see https://github.com/CocoaPods/Specs/
+#
+
+Pod::Spec.new do |s|
+
+s.name = 'WAApImpl'
+s.version = '4.2.0'
+s.summary = 'WAApImpl framework in production environment.'
+s.license = 'MIT'
+s.author = { "Wuyx" => "wuyixin_gh@gamehollywood.com" }
+s.homepage = 'http://repo.wingsdk.cn:8082/summary/WAApImpl.git'
+s.source = { :git => "http://admin@repo.wingsdk.cn:8082/r/WAApImpl.git" , :tag => s.version}
+s.platform = :ios
+s.ios.deployment_target = "7.0"
+s.vendored_frameworks = 'frameworks/*.framework'
+s.resources = ['config/*.xml']
+s.requires_arc = true
+s.dependency 'WASdkIntf'
+s.dependency 'WASdkImpl'
+end
diff --git a/config/wa_sdk_impl_config_apple.xml b/config/wa_sdk_impl_config_apple.xml
index 4dc0d87..ed13980 100644
--- a/config/wa_sdk_impl_config_apple.xml
+++ b/config/wa_sdk_impl_config_apple.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<config>
- <version val="AP4.0.0"/>
+ <version val="AP4.2.0"/>
<comps>
<!-- 用户模块 -->
<comp module="USR" plaf="APPLE" mandatory="YES" value="WAAPUser" desc="APPLE用户账户"/>
diff --git a/frameworks/WAApImpl.framework/Headers/StoreManager.h b/frameworks/WAApImpl.framework/Headers/StoreManager.h
deleted file mode 100755
index d5a1133..0000000
--- a/frameworks/WAApImpl.framework/Headers/StoreManager.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- File: StoreManager.h
- Abstract: Retrieves product information from the App Store using SKRequestDelegate,
- SKProductsRequestDelegate,SKProductsResponse, and SKProductsRequest.
- Notifies its observer with a list of products available for sale along with
- a list of invalid product identifiers. Logs an error message if the product request failed.
-
- Version: 1.0
-
- Disclaimer: IMPORTANT: This Apple software is supplied to you by Apple
- Inc. ("Apple") in consideration of your agreement to the following
- terms, and your use, installation, modification or redistribution of
- this Apple software constitutes acceptance of these terms. If you do
- not agree with these terms, please do not use, install, modify or
- redistribute this Apple software.
-
- In consideration of your agreement to abide by the following terms, and
- subject to these terms, Apple grants you a personal, non-exclusive
- license, under Apple's copyrights in this original Apple software (the
- "Apple Software"), to use, reproduce, modify and redistribute the Apple
- Software, with or without modifications, in source and/or binary forms;
- provided that if you redistribute the Apple Software in its entirety and
- without modifications, you must retain this notice and the following
- text and disclaimers in all such redistributions of the Apple Software.
- Neither the name, trademarks, service marks or logos of Apple Inc. may
- be used to endorse or promote products derived from the Apple Software
- without specific prior written permission from Apple. Except as
- expressly stated in this notice, no other rights or licenses, express or
- implied, are granted by Apple herein, including but not limited to any
- patent rights that may be infringed by your derivative works or by other
- works in which the Apple Software may be incorporated.
-
- The Apple Software is provided by Apple on an "AS IS" basis. APPLE
- MAKES NO WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION
- THE IMPLIED WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS
- FOR A PARTICULAR PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND
- OPERATION ALONE OR IN COMBINATION WITH YOUR PRODUCTS.
-
- IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL
- OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION,
- MODIFICATION AND/OR DISTRIBUTION OF THE APPLE SOFTWARE, HOWEVER CAUSED
- AND WHETHER UNDER THEORY OF CONTRACT, TORT (INCLUDING NEGLIGENCE),
- STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
-
- Copyright (C) 2014 Apple Inc. All Rights Reserved.
-
-
- */
-
-#import <Foundation/Foundation.h>
-#import <StoreKit/StoreKit.h>
-
-@protocol StoreManagerDelegate <NSObject>
-
-- (void)queryAppleProductsDidCompleteWithResult:(NSArray<SKProduct *>*)appleProducts;
-- (void)queryAppleProductsDidError:(NSError *)error;
-
-@end
-
-
-@interface StoreManager : NSObject
-typedef NS_ENUM(NSInteger, IAPProductRequestStatus)
-{
- IAPProductsFound,// Indicate that there are some valid products
- IAPIdentifiersNotFound, // indicate that are some invalid product identifiers
- IAPRequestFailed // Indicate that the product request failed
-};
-
-@property (nonatomic, strong) id<StoreManagerDelegate> delegate;
-// Provide the status of the product request
-@property (nonatomic) IAPProductRequestStatus status;
-
-// Keep track of all valid products. These products are available for sale in the App Store
-@property (nonatomic, strong) NSMutableArray *availableProducts;
-
-// Keep track of all invalid product identifiers
-@property (nonatomic, strong) NSMutableArray *invalidProductIds;
-
-// Indicate the cause of the product request failure
-@property (nonatomic, copy) NSString *errorMessage;
-
-+ (StoreManager *)sharedInstance;
-
-// Query the App Store about the given product identifiers
--(void)fetchProductInformationForIds:(NSArray *)productIds;
-
-// Return the product's title matching a given product identifier
--(NSString *)titleMatchingProductIdentifier:(NSString *)identifier;
-
-@end
diff --git a/frameworks/WAApImpl.framework/Headers/StoreObserver.h b/frameworks/WAApImpl.framework/Headers/StoreObserver.h
deleted file mode 100755
index 174d8ee..0000000
--- a/frameworks/WAApImpl.framework/Headers/StoreObserver.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- File: StoreObserver.h
- Abstract: Implements the SKPaymentTransactionObserver protocol. Handles purchasing and restoring products as well as
- downloading hosted content using paymentQueue:updatedTransactions: and paymentQueue:updatedDownloads:, respectively.
- Provides download progress information using SKDownload's progres. Logs the location of the downloaded file using SKDownload's contentURL property.
-
- Version: 1.0
-
- Disclaimer: IMPORTANT: This Apple software is supplied to you by Apple
- Inc. ("Apple") in consideration of your agreement to the following
- terms, and your use, installation, modification or redistribution of
- this Apple software constitutes acceptance of these terms. If you do
- not agree with these terms, please do not use, install, modify or
- redistribute this Apple software.
-
- In consideration of your agreement to abide by the following terms, and
- subject to these terms, Apple grants you a personal, non-exclusive
- license, under Apple's copyrights in this original Apple software (the
- "Apple Software"), to use, reproduce, modify and redistribute the Apple
- Software, with or without modifications, in source and/or binary forms;
- provided that if you redistribute the Apple Software in its entirety and
- without modifications, you must retain this notice and the following
- text and disclaimers in all such redistributions of the Apple Software.
- Neither the name, trademarks, service marks or logos of Apple Inc. may
- be used to endorse or promote products derived from the Apple Software
- without specific prior written permission from Apple. Except as
- expressly stated in this notice, no other rights or licenses, express or
- implied, are granted by Apple herein, including but not limited to any
- patent rights that may be infringed by your derivative works or by other
- works in which the Apple Software may be incorporated.
-
- The Apple Software is provided by Apple on an "AS IS" basis. APPLE
- MAKES NO WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION
- THE IMPLIED WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS
- FOR A PARTICULAR PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND
- OPERATION ALONE OR IN COMBINATION WITH YOUR PRODUCTS.
-
- IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL
- OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION,
- MODIFICATION AND/OR DISTRIBUTION OF THE APPLE SOFTWARE, HOWEVER CAUSED
- AND WHETHER UNDER THEORY OF CONTRACT, TORT (INCLUDING NEGLIGENCE),
- STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
-
- Copyright (C) 2014 Apple Inc. All Rights Reserved.
-
-
- */
-#import <Foundation/Foundation.h>
-#import <StoreKit/StoreKit.h>
-
-
-
-extern NSString * const IAPPurchaseNotification;
-
-@interface StoreObserver : NSObject <SKPaymentTransactionObserver>
-
-typedef NS_ENUM(NSInteger, IAPPurchaseNotificationStatus)
-{
- IAPPurchaseFailed,
- IAPPurchaseSucceeded,
- IAPRestoredFailed,
- IAPRestoredSucceeded,
- IAPDownloadStarted,
- IAPDownloadInProgress,
- IAPDownloadFailed,
- IAPDownloadSucceeded
-};
-
-@property (nonatomic) IAPPurchaseNotificationStatus status;
-
-// Keep track of all purchases
-@property (nonatomic, strong) NSMutableArray *productsPurchased;
-// Keep track of all restored purchases
-@property (nonatomic, strong) NSMutableArray *productsRestored;
-
-@property (nonatomic, copy) NSString *message;
-
-@property(nonatomic) float downloadProgress;
-// Keep track of the purchased/restored product's identifier
-@property (nonatomic, copy) NSString *purchasedID;
-
-
--(BOOL)hasPurchasedProducts;
--(BOOL)hasRestoredProducts;
-
-+ (StoreObserver *)sharedInstance;
-// Implement the purchase of a product
--(void)buy:(SKProduct *)product withOrderDict:(NSDictionary*)orderDict;
-// Implement the restoration of previously completed purchases
--(void)restore;
-/**
- * 发送支付结果给后台
- *
- * @param skPaymentTransaction
- * @param pStatus
- */
--(void)postPayNotifyServer:(SKPaymentTransaction*) skPaymentTransaction withStatus:(NSInteger)pStatus isRetry:(BOOL)isRetry;
-
-@end
diff --git a/frameworks/WAApImpl.framework/Headers/WAAPIapSingleton.h b/frameworks/WAApImpl.framework/Headers/WAAPIapSingleton.h
deleted file mode 100644
index 49fe44b..0000000
--- a/frameworks/WAApImpl.framework/Headers/WAAPIapSingleton.h
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// GhwSdkIap.h
-// iOSInAppPurchases
-//
-// Created by GHW-T-01 on 15/5/18.
-//
-//
-
-#import <Foundation/Foundation.h>
-#import <WASdkIntf/WASdkIntf.h>
-
-extern NSString * const IAPResultNotification;
-
-
-@interface WAAPIapSingleton : NSObject
-@property(nonatomic,weak)id<WAInventoryDelegate>inventoryDelegate;
-@property(nonatomic,weak)id<WAPaymentDelegate>paymentDelegate;
-@property(nonatomic,strong) NSArray* productIds;
-@property(nonatomic,strong) NSMutableArray *products;
-@property(nonatomic,strong) SKProduct* currentProduct;
-@property(nonatomic,strong) NSData* currentReceipt;
-@property(nonatomic,strong)NSMutableArray* productList;//存放SKProduct;
-@property(nonatomic,strong)NSString* productId;
-@property(nonatomic,strong)NSString* extInfo;
-@property(nonatomic,assign)BOOL isPaying;
-@property(nonatomic,strong)NSDictionary *waProducts;
-
-/**
- * 应用内支付初始化
- *
- */
-+(void)init4Iap;
-
-/**
- * 清理商品内购相关变量
- */
-+(void)clean4Iap;
-
-/**
- * 获取单例
- *
- * @return 返回单例
- */
-+(WAAPIapSingleton *)shareInstance;
-
-///**
-// * 获取商品列表
-// */
-//+(void)queryInventory:(id<WAInventoryDelegate>)delegate;
-
-/**
- * 单个商品购买
- *
- * @param waProductId 对应wa产品id
- * @param product 对应苹果商品类
- * @param serverId服务器id
- * @param extInfo一些额外信息
- */
-+(void)singlePurchaseWithWAProductId:(NSString *)waProductId product:(SKProduct*)product withServerId:(NSString*)serverId withExtInfo:(NSString*)extInfo;
-/**
- * 单个商品购买
- *
- * @param productId 对应苹果商品id
- * @param extInfo一些额外信息
- */
-+(void)payWithProductId:(NSString *)productId extInfo:(NSString *)extInfo delegate:(id<WAPaymentDelegate>)delegate;
-
-+(void)fetchProductInformations:(NSDictionary *)waProducts inventoryDelegate:(id<WAInventoryDelegate>)delegate;
-
-+(SKProduct*)getCurrentProduct;
-
-+(NSData*)getCurrentReceipt;
-@end
diff --git a/frameworks/WAApImpl.framework/Headers/WAAPPaymentTransaction.h b/frameworks/WAApImpl.framework/Headers/WAAPPaymentTransaction.h
deleted file mode 100644
index 31089c8..0000000
--- a/frameworks/WAApImpl.framework/Headers/WAAPPaymentTransaction.h
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// GHWSDKPaymentTransaction.h
-// GHWSdkUI
-//
-// Created by wuyx on 15/8/20.
-// Copyright (c) 2015年 GHW-T-01. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <StoreKit/StoreKit.h>
-@interface WAAPPaymentTransaction : NSObject<NSCoding,NSCopying>
-@property(strong,nonatomic)SKPaymentTransaction* skPaymentTransaction;
-@property(nonatomic)NSInteger status;
-@end
diff --git a/frameworks/WAApImpl.framework/Headers/WAAPPaymentTransactionHandler.h b/frameworks/WAApImpl.framework/Headers/WAAPPaymentTransactionHandler.h
deleted file mode 100644
index 62647de..0000000
--- a/frameworks/WAApImpl.framework/Headers/WAAPPaymentTransactionHandler.h
+++ /dev/null
@@ -1,49 +0,0 @@
-//
-// GHWSDKPaymentTransactionHandler.h
-// GHWSdkUI
-//
-// Created by wuyx on 15/8/19.
-// Copyright (c) 2015年 GHW-T-01. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <StoreKit/StoreKit.h>
-
-extern NSString *CACHE_KEY_PAYMENT_TRANSACTION;
-
-@interface WAAPPaymentTransactionHandler : NSObject
-@property(strong,nonatomic)NSMutableDictionary* unConsumeOrderList;
-/**
- * 将上报失败的订单保存到缓存中
- *
- * @param skPaymentTransaction
- * @param status
- */
-+(void)saveCacheWithPaymentTransaction:(SKPaymentTransaction*)skPaymentTransaction andStatus:(NSInteger)status;
-
-
-/**
- * 通过skProduct 获取未消耗订单列表
- *
- * @param skProduct
- *
- * @return NSMutableArray
- */
-+(NSMutableArray*)getUnconsumeOrderListWithProduct:(SKProduct*)skProduct;
-
-/**
- * 处理未消耗订单
- *
- * @param unComsumeList 未消耗订单列表
- */
-+(void)handleWithUnComsumeList:(NSArray*)unComsumeList;
-
-/**
- * 重试成功,移除未消耗订单
- *
- * @param skPaymentTransaction
- */
-+(void)removeUncomsumeListWithPaymentTransaction:(SKPaymentTransaction *)skPaymentTransaction;
-
-+(BOOL)isInit;
-@end
diff --git a/frameworks/WAApImpl.framework/Headers/WAApImpl.h b/frameworks/WAApImpl.framework/Headers/WAApImpl.h
index c356186..76d09dc 100644
--- a/frameworks/WAApImpl.framework/Headers/WAApImpl.h
+++ b/frameworks/WAApImpl.framework/Headers/WAApImpl.h
@@ -19,4 +19,4 @@
#import <WAApImpl/WAAPUser.h>
#import <WAApImpl/WAAPLogin.h>
-//time:2024/01/08 10:02 ver:4.0.0
+//time:2024/07/22 12:29 ver:4.2.0
diff --git a/frameworks/WAApImpl.framework/WAApImpl b/frameworks/WAApImpl.framework/WAApImpl
index 53b3cf5..b058b57 100644
--- a/frameworks/WAApImpl.framework/WAApImpl
+++ b/frameworks/WAApImpl.framework/WAApImpl
Binary files differ
--
Gitblit v1.8.0