Commit 3735d0dac6acb6ff2c7132608c9b421ff43950a5

Authored by 权海
1 parent a538a75a

feat(ui):增加apple product name

... ... @@ -205,6 +205,8 @@ data class WatchAppOtherInfo (
data class AppleProductInfo (
/** 苹果商品id */
val productId: String,
/** 苹果商品名称 */
val productName: String,
/** 原价描述 */
val originPriceDescription: String,
/** 真实价格描述 */
... ... @@ -224,19 +226,21 @@ data class AppleProductInfo (
companion object {
fun fromList(pigeonVar_list: List<Any?>): AppleProductInfo {
val productId = pigeonVar_list[0] as String
val originPriceDescription = pigeonVar_list[1] as String
val priceDescription = pigeonVar_list[2] as String
val originPrice = pigeonVar_list[3] as Double
val price = pigeonVar_list[4] as Double
val unitPrice = pigeonVar_list[5] as String
val currencyCode = pigeonVar_list[6] as String
val isTrialPeriod = pigeonVar_list[7] as Boolean
return AppleProductInfo(productId, originPriceDescription, priceDescription, originPrice, price, unitPrice, currencyCode, isTrialPeriod)
val productName = pigeonVar_list[1] as String
val originPriceDescription = pigeonVar_list[2] as String
val priceDescription = pigeonVar_list[3] as String
val originPrice = pigeonVar_list[4] as Double
val price = pigeonVar_list[5] as Double
val unitPrice = pigeonVar_list[6] as String
val currencyCode = pigeonVar_list[7] as String
val isTrialPeriod = pigeonVar_list[8] as Boolean
return AppleProductInfo(productId, productName, originPriceDescription, priceDescription, originPrice, price, unitPrice, currencyCode, isTrialPeriod)
}
}
fun toList(): List<Any?> {
return listOf(
productId,
productName,
originPriceDescription,
priceDescription,
originPrice,
... ...
... ... @@ -232,6 +232,8 @@ struct WatchAppOtherInfo: Hashable {
struct AppleProductInfo: Hashable {
/// 苹果商品id
var productId: String
/// 苹果商品名称
var productName: String
/// 原价描述
var originPriceDescription: String
/// 真实价格描述
... ... @@ -251,16 +253,18 @@ struct AppleProductInfo: Hashable {
// swift-format-ignore: AlwaysUseLowerCamelCase
static func fromList(_ pigeonVar_list: [Any?]) -> AppleProductInfo? {
let productId = pigeonVar_list[0] as! String
let originPriceDescription = pigeonVar_list[1] as! String
let priceDescription = pigeonVar_list[2] as! String
let originPrice = pigeonVar_list[3] as! Double
let price = pigeonVar_list[4] as! Double
let unitPrice = pigeonVar_list[5] as! String
let currencyCode = pigeonVar_list[6] as! String
let isTrialPeriod = pigeonVar_list[7] as! Bool
let productName = pigeonVar_list[1] as! String
let originPriceDescription = pigeonVar_list[2] as! String
let priceDescription = pigeonVar_list[3] as! String
let originPrice = pigeonVar_list[4] as! Double
let price = pigeonVar_list[5] as! Double
let unitPrice = pigeonVar_list[6] as! String
let currencyCode = pigeonVar_list[7] as! String
let isTrialPeriod = pigeonVar_list[8] as! Bool
return AppleProductInfo(
productId: productId,
productName: productName,
originPriceDescription: originPriceDescription,
priceDescription: priceDescription,
originPrice: originPrice,
... ... @@ -273,6 +277,7 @@ struct AppleProductInfo: Hashable {
func toList() -> [Any?] {
return [
productId,
productName,
originPriceDescription,
priceDescription,
originPrice,
... ...
... ... @@ -260,6 +260,7 @@ final class PlatformHostApiImpl: NSObject, PlatformHostApi {
let productInfo = AppleProductInfo(
productId: product.id,
productName: product.displayName,
originPriceDescription: product.displayPrice,
priceDescription: displayPrice,
originPrice: NSDecimalNumber(decimal: originPrice * 100).doubleValue,
... ...
... ... @@ -206,6 +206,7 @@ class WatchAppOtherInfo {
class AppleProductInfo {
AppleProductInfo({
required this.productId,
required this.productName,
required this.originPriceDescription,
required this.priceDescription,
required this.originPrice,
... ... @@ -218,6 +219,9 @@ class AppleProductInfo {
/// 苹果商品id
String productId;
/// 苹果商品名称
String productName;
/// 原价描述
String originPriceDescription;
... ... @@ -242,6 +246,7 @@ class AppleProductInfo {
List<Object?> _toList() {
return <Object?>[
productId,
productName,
originPriceDescription,
priceDescription,
originPrice,
... ... @@ -259,13 +264,14 @@ class AppleProductInfo {
result as List<Object?>;
return AppleProductInfo(
productId: result[0]! as String,
originPriceDescription: result[1]! as String,
priceDescription: result[2]! as String,
originPrice: result[3]! as double,
price: result[4]! as double,
unitPrice: result[5]! as String,
currencyCode: result[6]! as String,
isTrialPeriod: result[7]! as bool,
productName: result[1]! as String,
originPriceDescription: result[2]! as String,
priceDescription: result[3]! as String,
originPrice: result[4]! as double,
price: result[5]! as double,
unitPrice: result[6]! as String,
currencyCode: result[7]! as String,
isTrialPeriod: result[8]! as bool,
);
}
... ...
... ... @@ -15,11 +15,19 @@ class AppleSignInModel {
}
class GoogleSignInModel {
final String? email = null;
final String? clientID = null;
final String idToken = '';
final String? nickname = null;
final String? avatarUrl = null;
final String? email;
final String? clientID;
final String idToken;
final String? nickname;
final String? avatarUrl;
GoogleSignInModel({
this.email,
this.clientID,
required this.idToken,
this.nickname,
this.avatarUrl,
});
}
class WatchAppOtherInfo {
... ... @@ -38,6 +46,9 @@ class AppleProductInfo {
/// 苹果商品id
final String productId;
/// 苹果商品名称
final String productName;
/// 原价描述
final String originPriceDescription;
... ... @@ -60,6 +71,7 @@ class AppleProductInfo {
final bool isTrialPeriod;
AppleProductInfo({
required this.productId,
required this.productName,
required this.originPriceDescription,
required this.priceDescription,
required this.originPrice,
... ...