@norcy/react-native-toolkit 0.1.97 → 0.1.98

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,8 @@
1
1
  import { PurchasesPackage } from 'react-native-purchases';
2
2
  export declare const VipAndroidManager: {
3
- setPackages: (packages: PurchasesPackage[]) => void;
3
+ setOfferings: (offerings: {
4
+ [key: string]: PurchasesPackage[];
5
+ }) => void;
4
6
  queryOrder: (orderId?: string) => Promise<{
5
7
  paid: any;
6
8
  e?: undefined;
@@ -15,7 +17,7 @@ export declare const VipAndroidManager: {
15
17
  errorCode: number;
16
18
  errorMsg: string;
17
19
  }>;
18
- getPackages: () => PurchasesPackage[];
20
+ getPackages: (offeringId?: string) => PurchasesPackage[];
19
21
  purchase: (purchasePackage: PurchasesPackage) => Promise<{
20
22
  errorCode: number;
21
23
  errorMsg: string | undefined;
@@ -15,7 +15,7 @@ export declare const VipManager: {
15
15
  errorCode: number;
16
16
  errorMsg: any;
17
17
  }>;
18
- getPackages: () => Promise<PurchasesPackage[]>;
18
+ getPackages: (offeringId?: string) => Promise<PurchasesPackage[]>;
19
19
  isVip: () => boolean;
20
20
  isForeverVip: () => boolean;
21
21
  vipEndTime: () => string;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@norcy/react-native-toolkit",
3
- "version": "0.1.97",
3
+ "version": "0.1.98",
4
4
  "description": "My Toolkit",
5
5
  "main": "lib/commonjs/index",
6
6
  "module": "lib/module/index",
package/src/.DS_Store ADDED
Binary file
@@ -120,7 +120,7 @@ const _handleResponse = () => {
120
120
  handleVersionInfo();
121
121
  console.log('Config 处理完毕');
122
122
  isDataReady = true;
123
- VipAndroidManager.setPackages(ConfigDataModel.get('vip_android_products'));
123
+ VipAndroidManager.setOfferings(ConfigDataModel.get('vip_android_offerings'));
124
124
  ConfigDataModel.emitChange();
125
125
  };
126
126
 
@@ -2,11 +2,11 @@ import Purchases, { PurchasesPackage } from 'react-native-purchases';
2
2
  import * as WeChat from 'react-native-wechat-lib';
3
3
  import { LoginManager } from './LoginManager';
4
4
  import { Tool, ToolkitConfig } from './Tool';
5
- let AndroidPackages: PurchasesPackage[] = [];
5
+ let AndroidOfferings: { [key: string]: PurchasesPackage[] };
6
6
 
7
7
  export const VipAndroidManager = {
8
- setPackages: (packages: PurchasesPackage[]) => {
9
- AndroidPackages = packages;
8
+ setOfferings: (offerings: { [key: string]: PurchasesPackage[] }) => {
9
+ AndroidOfferings = offerings;
10
10
  },
11
11
 
12
12
  queryOrder: async (orderId?: string) => {
@@ -54,8 +54,12 @@ export const VipAndroidManager = {
54
54
  }
55
55
  },
56
56
 
57
- getPackages: () => {
58
- return AndroidPackages;
57
+ getPackages: (offeringId?: string) => {
58
+ if (offeringId) {
59
+ return AndroidOfferings[offeringId];
60
+ }
61
+
62
+ return AndroidOfferings.current;
59
63
  },
60
64
 
61
65
  purchase: async (purchasePackage: PurchasesPackage) => {
package/src/VipManager.ts CHANGED
@@ -127,7 +127,7 @@ export const VipManager = {
127
127
  }
128
128
  },
129
129
 
130
- getPackages: async (): Promise<PurchasesPackage[]> => {
130
+ getPackages: async (offeringId?: string): Promise<PurchasesPackage[]> => {
131
131
  if (!isReady) {
132
132
  console.log('VIP 模块无有效配置信息');
133
133
  return [];
@@ -138,12 +138,20 @@ export const VipManager = {
138
138
  }
139
139
 
140
140
  if (Platform.OS === 'android' || __DEV__) {
141
- return VipAndroidManager.getPackages();
141
+ return VipAndroidManager.getPackages(offeringId);
142
142
  }
143
143
 
144
144
  try {
145
145
  const offerings = await Purchases.getOfferings();
146
- let targetOffering = offerings.current;
146
+ let targetOffering;
147
+ if (offeringId) {
148
+ targetOffering = offerings.all[offeringId];
149
+ }
150
+
151
+ if (!targetOffering) {
152
+ targetOffering = offerings.current;
153
+ }
154
+
147
155
  console.log('获取商品');
148
156
  if (
149
157
  targetOffering !== null &&