Commit 3735d0dac6acb6ff2c7132608c9b421ff43950a5

Authored by 权海
1 parent a538a75a

feat(ui):增加apple product name

@@ -205,6 +205,8 @@ data class WatchAppOtherInfo ( @@ -205,6 +205,8 @@ data class WatchAppOtherInfo (
205 data class AppleProductInfo ( 205 data class AppleProductInfo (
206 /** 苹果商品id */ 206 /** 苹果商品id */
207 val productId: String, 207 val productId: String,
  208 + /** 苹果商品名称 */
  209 + val productName: String,
208 /** 原价描述 */ 210 /** 原价描述 */
209 val originPriceDescription: String, 211 val originPriceDescription: String,
210 /** 真实价格描述 */ 212 /** 真实价格描述 */
@@ -224,19 +226,21 @@ data class AppleProductInfo ( @@ -224,19 +226,21 @@ data class AppleProductInfo (
224 companion object { 226 companion object {
225 fun fromList(pigeonVar_list: List<Any?>): AppleProductInfo { 227 fun fromList(pigeonVar_list: List<Any?>): AppleProductInfo {
226 val productId = pigeonVar_list[0] as String 228 val productId = pigeonVar_list[0] as String
227 - val originPriceDescription = pigeonVar_list[1] as String  
228 - val priceDescription = pigeonVar_list[2] as String  
229 - val originPrice = pigeonVar_list[3] as Double  
230 - val price = pigeonVar_list[4] as Double  
231 - val unitPrice = pigeonVar_list[5] as String  
232 - val currencyCode = pigeonVar_list[6] as String  
233 - val isTrialPeriod = pigeonVar_list[7] as Boolean  
234 - return AppleProductInfo(productId, originPriceDescription, priceDescription, originPrice, price, unitPrice, currencyCode, isTrialPeriod) 229 + val productName = pigeonVar_list[1] as String
  230 + val originPriceDescription = pigeonVar_list[2] as String
  231 + val priceDescription = pigeonVar_list[3] as String
  232 + val originPrice = pigeonVar_list[4] as Double
  233 + val price = pigeonVar_list[5] as Double
  234 + val unitPrice = pigeonVar_list[6] as String
  235 + val currencyCode = pigeonVar_list[7] as String
  236 + val isTrialPeriod = pigeonVar_list[8] as Boolean
  237 + return AppleProductInfo(productId, productName, originPriceDescription, priceDescription, originPrice, price, unitPrice, currencyCode, isTrialPeriod)
235 } 238 }
236 } 239 }
237 fun toList(): List<Any?> { 240 fun toList(): List<Any?> {
238 return listOf( 241 return listOf(
239 productId, 242 productId,
  243 + productName,
240 originPriceDescription, 244 originPriceDescription,
241 priceDescription, 245 priceDescription,
242 originPrice, 246 originPrice,
@@ -232,6 +232,8 @@ struct WatchAppOtherInfo: Hashable { @@ -232,6 +232,8 @@ struct WatchAppOtherInfo: Hashable {
232 struct AppleProductInfo: Hashable { 232 struct AppleProductInfo: Hashable {
233 /// 苹果商品id 233 /// 苹果商品id
234 var productId: String 234 var productId: String
  235 + /// 苹果商品名称
  236 + var productName: String
235 /// 原价描述 237 /// 原价描述
236 var originPriceDescription: String 238 var originPriceDescription: String
237 /// 真实价格描述 239 /// 真实价格描述
@@ -251,16 +253,18 @@ struct AppleProductInfo: Hashable { @@ -251,16 +253,18 @@ struct AppleProductInfo: Hashable {
251 // swift-format-ignore: AlwaysUseLowerCamelCase 253 // swift-format-ignore: AlwaysUseLowerCamelCase
252 static func fromList(_ pigeonVar_list: [Any?]) -> AppleProductInfo? { 254 static func fromList(_ pigeonVar_list: [Any?]) -> AppleProductInfo? {
253 let productId = pigeonVar_list[0] as! String 255 let productId = pigeonVar_list[0] as! String
254 - let originPriceDescription = pigeonVar_list[1] as! String  
255 - let priceDescription = pigeonVar_list[2] as! String  
256 - let originPrice = pigeonVar_list[3] as! Double  
257 - let price = pigeonVar_list[4] as! Double  
258 - let unitPrice = pigeonVar_list[5] as! String  
259 - let currencyCode = pigeonVar_list[6] as! String  
260 - let isTrialPeriod = pigeonVar_list[7] as! Bool 256 + let productName = pigeonVar_list[1] as! String
  257 + let originPriceDescription = pigeonVar_list[2] as! String
  258 + let priceDescription = pigeonVar_list[3] as! String
  259 + let originPrice = pigeonVar_list[4] as! Double
  260 + let price = pigeonVar_list[5] as! Double
  261 + let unitPrice = pigeonVar_list[6] as! String
  262 + let currencyCode = pigeonVar_list[7] as! String
  263 + let isTrialPeriod = pigeonVar_list[8] as! Bool
261 264
262 return AppleProductInfo( 265 return AppleProductInfo(
263 productId: productId, 266 productId: productId,
  267 + productName: productName,
264 originPriceDescription: originPriceDescription, 268 originPriceDescription: originPriceDescription,
265 priceDescription: priceDescription, 269 priceDescription: priceDescription,
266 originPrice: originPrice, 270 originPrice: originPrice,
@@ -273,6 +277,7 @@ struct AppleProductInfo: Hashable { @@ -273,6 +277,7 @@ struct AppleProductInfo: Hashable {
273 func toList() -> [Any?] { 277 func toList() -> [Any?] {
274 return [ 278 return [
275 productId, 279 productId,
  280 + productName,
276 originPriceDescription, 281 originPriceDescription,
277 priceDescription, 282 priceDescription,
278 originPrice, 283 originPrice,
@@ -260,6 +260,7 @@ final class PlatformHostApiImpl: NSObject, PlatformHostApi { @@ -260,6 +260,7 @@ final class PlatformHostApiImpl: NSObject, PlatformHostApi {
260 260
261 let productInfo = AppleProductInfo( 261 let productInfo = AppleProductInfo(
262 productId: product.id, 262 productId: product.id,
  263 + productName: product.displayName,
263 originPriceDescription: product.displayPrice, 264 originPriceDescription: product.displayPrice,
264 priceDescription: displayPrice, 265 priceDescription: displayPrice,
265 originPrice: NSDecimalNumber(decimal: originPrice * 100).doubleValue, 266 originPrice: NSDecimalNumber(decimal: originPrice * 100).doubleValue,
@@ -206,6 +206,7 @@ class WatchAppOtherInfo { @@ -206,6 +206,7 @@ class WatchAppOtherInfo {
206 class AppleProductInfo { 206 class AppleProductInfo {
207 AppleProductInfo({ 207 AppleProductInfo({
208 required this.productId, 208 required this.productId,
  209 + required this.productName,
209 required this.originPriceDescription, 210 required this.originPriceDescription,
210 required this.priceDescription, 211 required this.priceDescription,
211 required this.originPrice, 212 required this.originPrice,
@@ -218,6 +219,9 @@ class AppleProductInfo { @@ -218,6 +219,9 @@ class AppleProductInfo {
218 /// 苹果商品id 219 /// 苹果商品id
219 String productId; 220 String productId;
220 221
  222 + /// 苹果商品名称
  223 + String productName;
  224 +
221 /// 原价描述 225 /// 原价描述
222 String originPriceDescription; 226 String originPriceDescription;
223 227
@@ -242,6 +246,7 @@ class AppleProductInfo { @@ -242,6 +246,7 @@ class AppleProductInfo {
242 List<Object?> _toList() { 246 List<Object?> _toList() {
243 return <Object?>[ 247 return <Object?>[
244 productId, 248 productId,
  249 + productName,
245 originPriceDescription, 250 originPriceDescription,
246 priceDescription, 251 priceDescription,
247 originPrice, 252 originPrice,
@@ -259,13 +264,14 @@ class AppleProductInfo { @@ -259,13 +264,14 @@ class AppleProductInfo {
259 result as List<Object?>; 264 result as List<Object?>;
260 return AppleProductInfo( 265 return AppleProductInfo(
261 productId: result[0]! as String, 266 productId: result[0]! as String,
262 - originPriceDescription: result[1]! as String,  
263 - priceDescription: result[2]! as String,  
264 - originPrice: result[3]! as double,  
265 - price: result[4]! as double,  
266 - unitPrice: result[5]! as String,  
267 - currencyCode: result[6]! as String,  
268 - isTrialPeriod: result[7]! as bool, 267 + productName: result[1]! as String,
  268 + originPriceDescription: result[2]! as String,
  269 + priceDescription: result[3]! as String,
  270 + originPrice: result[4]! as double,
  271 + price: result[5]! as double,
  272 + unitPrice: result[6]! as String,
  273 + currencyCode: result[7]! as String,
  274 + isTrialPeriod: result[8]! as bool,
269 ); 275 );
270 } 276 }
271 277
@@ -15,11 +15,19 @@ class AppleSignInModel { @@ -15,11 +15,19 @@ class AppleSignInModel {
15 } 15 }
16 16
17 class GoogleSignInModel { 17 class GoogleSignInModel {
18 - final String? email = null;  
19 - final String? clientID = null;  
20 - final String idToken = '';  
21 - final String? nickname = null;  
22 - final String? avatarUrl = null; 18 + final String? email;
  19 + final String? clientID;
  20 + final String idToken;
  21 + final String? nickname;
  22 + final String? avatarUrl;
  23 +
  24 + GoogleSignInModel({
  25 + this.email,
  26 + this.clientID,
  27 + required this.idToken,
  28 + this.nickname,
  29 + this.avatarUrl,
  30 + });
23 } 31 }
24 32
25 class WatchAppOtherInfo { 33 class WatchAppOtherInfo {
@@ -38,6 +46,9 @@ class AppleProductInfo { @@ -38,6 +46,9 @@ class AppleProductInfo {
38 /// 苹果商品id 46 /// 苹果商品id
39 final String productId; 47 final String productId;
40 48
  49 + /// 苹果商品名称
  50 + final String productName;
  51 +
41 /// 原价描述 52 /// 原价描述
42 final String originPriceDescription; 53 final String originPriceDescription;
43 54
@@ -60,6 +71,7 @@ class AppleProductInfo { @@ -60,6 +71,7 @@ class AppleProductInfo {
60 final bool isTrialPeriod; 71 final bool isTrialPeriod;
61 AppleProductInfo({ 72 AppleProductInfo({
62 required this.productId, 73 required this.productId,
  74 + required this.productName,
63 required this.originPriceDescription, 75 required this.originPriceDescription,
64 required this.priceDescription, 76 required this.priceDescription,
65 required this.originPrice, 77 required this.originPrice,