zengjx/Veloria
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.1.2发布

Browse Source
This commit is contained in:
zjx 2025-08-08 15:26:47 +08:00
parent c709faae38
commit 65d04d0aeb
7 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Veloria.xcodeproj/project.pbxproj
View File

@ -1929,7 +1929,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.1;
MARKETING_VERSION = 1.1.2;
PRODUCT_BUNDLE_IDENTIFIER = com.qjwl168.veloria.ios;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
@ -1972,7 +1972,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.1;
MARKETING_VERSION = 1.1.2;
PRODUCT_BUNDLE_IDENTIFIER = com.qjwl168.veloria.ios;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";

7
Veloria/AppDelegate/AppDelegate+Open.swift
View File

@ -42,9 +42,14 @@ extension SceneDelegate {
static var allowOpenMessage = true
///是否需要重试
static var isNeedRetry = false
private static var webpageURL: URL?
static var webpageURL: URL?
func vp_handleOpenAppMessage(webpageURL: URL?) {
guard SceneDelegate.allowOpenMessage else {
SceneDelegate.webpageURL = nil
return
}
guard VPNetworkReachabilityManager.manager.isReachable == true, //有网
AppDelegate.haveBeenShownAPNS, //推送弹窗
self.isOpenApp, //APP被开启

2
Veloria/AppDelegate/SceneDelegate.swift
View File

@ -65,7 +65,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
vpLog(message: "++++++++++++++sceneWillEnterForeground")
VPAppTool.appDelegate?.uploadNoticeStatus()
DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
self.vp_handleOpenAppMessage(webpageURL: nil)
self.vp_handleOpenAppMessage(webpageURL: SceneDelegate.webpageURL)
}
}

4
Veloria/Base/Networking/API/VPWalletAPI.swift
View File

@ -135,13 +135,13 @@ class VPWalletAPI {
}
///校验内购
static func requestVerifyOrder(orderCode: String, payId: String, productId: String, purchaseToken: String, completer: ((_ model: VPIAPVerifyModel?) -> Void)?) {
static func requestVerifyOrder(orderCode: String, payId: String, productId: String, transactionId: String, purchaseToken: String, completer: ((_ model: VPIAPVerifyModel?) -> Void)?) {
var param = VPNetworkParameters(path: "/applePaid")
param.parameters = [
"order_code" : orderCode,
"pay_setting_id" : payId,
"pkg_name" : kVPAPPBundleIdentifier,
"transaction_id" : productId,
"transaction_id" : transactionId,
"purchases_token" : purchaseToken
]

2
Veloria/Libs/AdManager/AppOpen/VPAppOpenAdManager.swift
View File

@ -95,7 +95,7 @@ class VPAppOpenAdManager: NSObject {
if self.appOpenAd?.isReady == true {
self.showAd()
} else {
self.timeOutTimer = Timer.scheduledTimer(timeInterval: 30, target: YYWeakProxy(target: self), selector: #selector(handleTimeOutTimer), userInfo: nil, repeats: false)
self.timeOutTimer = Timer.scheduledTimer(timeInterval: 5, target: YYWeakProxy(target: self), selector: #selector(handleTimeOutTimer), userInfo: nil, repeats: false)
self.needAutoShow = true
self.loadAd()

8
Veloria/Libs/VPIAPManager/VPIAPManager.swift
View File

@ -95,7 +95,8 @@ class VPIAPManager {
let orderCode = waitRestoreModel.orderCode,
let payId = waitRestoreModel.payId,
let productId = waitRestoreModel.productId,
let receipt = waitRestoreModel.receipt
let receipt = waitRestoreModel.receipt,
let transactionId = waitRestoreModel.transactionId
else {
if isLoding {
VPToast.show(text: "veloria_pay_error_3".localized)
@ -106,7 +107,7 @@ class VPIAPManager {
if isLoding {
VPHUD.show()
}
VPWalletAPI.requestVerifyOrder(orderCode: orderCode, payId: payId, productId: productId, purchaseToken: receipt) { model in
VPWalletAPI.requestVerifyOrder(orderCode: orderCode, payId: payId, productId: productId, transactionId: transactionId, purchaseToken: receipt) { model in
if isLoding {
VPHUD.dismiss()
}
@ -165,10 +166,11 @@ extension VPIAPManager: JXIAPManagerDelegate {
self.waitRestoreModel?.productId = productId
self.waitRestoreModel?.receipt = receipt
self.waitRestoreModel?.transactionId = transactionIdentifier
UserDefaults.vp_setObject(self.waitRestoreModel, forKey: kVPWaitRestoreIAPDefaultsKey)
VPWalletAPI.requestVerifyOrder(orderCode: orderCode, payId: payId, productId: productId, purchaseToken: receipt) { model in
VPWalletAPI.requestVerifyOrder(orderCode: orderCode, payId: payId, productId: productId, transactionId: transactionIdentifier ?? "", purchaseToken: receipt) { model in
VPHUD.dismiss()
self.orderCode = nil

1
Veloria/Libs/VPIAPManager/VPWaitRestoreModel.swift
View File

@ -12,6 +12,7 @@ class VPWaitRestoreModel: VPModel, NSSecureCoding {
var orderCode: String?
var payId: String?
var productId: String?
var transactionId: String?
var receipt: String?
var buyType: VPWalletAPI.BuyType?