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

1.0.6提审

Browse Source
This commit is contained in:
湖北秦九 2026-01-16 13:34:22 +08:00
parent f595c881b8
commit a75dade0aa
5 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Fableon.xcodeproj/project.pbxproj
View File

@ -2734,7 +2734,7 @@
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Fableon/Fableon.entitlements; CODE_SIGN_ENTITLEMENTS = Fableon/Fableon.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 6XALB8RSYF; DEVELOPMENT_TEAM = 6XALB8RSYF;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;
@ -2755,7 +2755,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.0.5; MARKETING_VERSION = 1.0.6;
PRODUCT_BUNDLE_IDENTIFIER = com.hn.qinjiu.fableon; PRODUCT_BUNDLE_IDENTIFIER = com.hn.qinjiu.fableon;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@ -2777,7 +2777,7 @@
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Fableon/Fableon.entitlements; CODE_SIGN_ENTITLEMENTS = Fableon/Fableon.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 6XALB8RSYF; DEVELOPMENT_TEAM = 6XALB8RSYF;
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = Fableon/Source/Info.plist; INFOPLIST_FILE = Fableon/Source/Info.plist;
@ -2797,7 +2797,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.0.5; MARKETING_VERSION = 1.0.6;
PRODUCT_BUNDLE_IDENTIFIER = com.hn.qinjiu.fableon; PRODUCT_BUNDLE_IDENTIFIER = com.hn.qinjiu.fableon;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";

12
Fableon/Object/Base/Request/FAAPI/FAStoreAPI.swift
View File

@ -200,12 +200,16 @@ class FAStoreAPI: NSObject {
///挽留支付项 ///挽留支付项
static func requestPayRetainInfo(completer: ((_ model: FAPayDateModel?) -> Void)?) { static func requestPayRetainInfo(completer: ((_ model: FAPayDateModel?) -> Void)?) {
let parameters = [
"purchases_token" : JXIAPManager.manager.getAppStoreReceipt() ?? "",
"discount" : "1",
]
FANetworkManager.manager.request(FABaseURL + "/payRetrieveSettings", FANetworkManager.manager.request(FABaseURL + "/payRetrieveSettings",
method: .get, method: .post,
parameters: nil, parameters: parameters,
isLoding: true, isLoding: false,
isToast: true, isToast: false,
) { (response: FANetworkManager.Response<FAPayDateModel>) in ) { (response: FANetworkManager.Response<FAPayDateModel>) in
if (response.data?.list_coins?.count ?? 0) > 0 { if (response.data?.list_coins?.count ?? 0) > 0 {
completer?(response.data) completer?(response.data)

13
Fableon/Object/Class/Store/M/FAPayDateModel.swift
View File

@ -96,6 +96,9 @@ class FAPayItem: NSObject, SmartCodable {
@SmartIgnored @SmartIgnored
var product: SKProduct? var product: SKProduct?
///首冲优惠数据 ///首冲优惠数据
var introductionaryOffer: SKProductDiscount? { var introductionaryOffer: SKProductDiscount? {
return product?.introductoryPrice return product?.introductoryPrice
@ -106,6 +109,16 @@ class FAPayItem: NSObject, SmartCodable {
return product?.discounts return product?.discounts
} }
var discount_price: String? {
var price: String? = nil
if self.discount_type == 1, let introductoryPrice = self.introductionaryOffer {
price = introductoryPrice.price.stringValue
} else if self.discount_type == 2, let discount = self.promotionalOffers?.first {
price = discount.price.stringValue
}
return price
}
static func mappingForKey() -> [SmartKeyTransformer]? { static func mappingForKey() -> [SmartKeyTransformer]? {
return [ return [

7
Fableon/Object/Libs/Alert/FAPayRetainAlert.swift
View File

@ -468,7 +468,12 @@ final class FAPayRetainPackCell: UICollectionViewCell {
coinLabel.text = "\(item.coins ?? 0)" coinLabel.text = "\(item.coins ?? 0)"
bonusLabel.text = "+\((item.ext_info?.max_total_coins_pop ?? 0) - (item.ext_info?.max_total_coins ?? 0)) " + "fableon_free_coins".localized bonusLabel.text = "+\((item.ext_info?.max_total_coins_pop ?? 0) - (item.ext_info?.max_total_coins ?? 0)) " + "fableon_free_coins".localized
priceLabel.text = "\(item.currency ?? "")\(item.price ?? "")"
var price = item.price
if let discountPrice = item.discount_price {
price = discountPrice
}
priceLabel.text = "\(item.currency ?? "")\(price ?? "")"
} }
private func setupView() { private func setupView() {

1
Fableon/Object/Libs/FAIap/FAPayDataRequest.swift
View File

@ -108,7 +108,6 @@ class FAPayDataRequest: NSObject {
func requestPayRetainInfo(completer: ((_ model: FAPayDateModel?) -> Void)?) { func requestPayRetainInfo(completer: ((_ model: FAPayDateModel?) -> Void)?) {
self.payRetainBlock = completer self.payRetainBlock = completer
self.isLoding = true self.isLoding = true
self.isToast = true
FAHUD.show() FAHUD.show()
FAStoreAPI.requestPayRetainInfo { [weak self] model in FAStoreAPI.requestPayRetainInfo { [weak self] model in