@norcy/react-native-toolkit 0.1.29 → 0.1.31

package/src/MessageModel.ts

@@ -196,7 +196,7 @@ export const MessageModel = {
   ) => {
     if (
       url.startsWith(ToolkitConfig.iOSStoreUrl) ||
-      url.startsWith(ToolkitConfig.AndroidUrl)
+      url.startsWith(ToolkitConfig.AndroidStoreUrl)
     ) {
       Tool.goAppStoreReview();
       return;

package/src/Tool.ts

@@ -5,14 +5,24 @@ import { ReportUtil } from './ReportUtil';
 
 export interface ToolkitConfigType {
   iOSStoreUrl: string;
-  AndroidUrl: string;
+  AndroidStoreUrl: string;
   iOSStoreScheme: string;
   AndroidStoreScheme: string;
   iOSReviewUrl: string;
   AndroidPackageName: string;
+
   AppWebsite: string;
+
   PolicyUrl: string;
   TermsUrl: string;
+
+  PushDeerUrl: string;
+
+  RC_API_KEY: string;
+  RC_ENTITLEMENT_ID: string;
+  WeChatPayServer: string;
+  WeiXinId: string;
+  WeiXinSecret: string;
 }
 
 export let ToolkitConfig: ToolkitConfigType;
@@ -192,4 +202,10 @@ export const Tool = {
       Linking.openURL(ToolkitConfig.AppWebsite);
     }
   },
+
+  notifyMe: async (text: string) => {
+    if (!__DEV__) {
+      await fetch(ToolkitConfig.PushDeerUrl + encodeURIComponent(text));
+    }
+  },
 };

package/src/VipAndroidManager.ts

@@ -2,20 +2,14 @@ import Purchases, { PurchasesPackage } from 'react-native-purchases';
 import * as WeChat from 'react-native-wechat-lib';
 import { ConfigDataModel } from './ConfigDataModel';
 import { LoginManager } from './LoginManager';
-import { Tool } from './Tool';
-
-let SERVER_URL = '';
+import { Tool, ToolkitConfig } from './Tool';
 
 export const VipAndroidManager = {
-  init: ({ WeChatPayServer }: { WeChatPayServer: string }) => {
-    SERVER_URL = WeChatPayServer;
-  },
-
   queryOrder: async (orderId?: string) => {
     const user = LoginManager.currentUser();
     // Step1：生成预订单
     try {
-      const rawResponse = await fetch(SERVER_URL, {
+      const rawResponse = await fetch(ToolkitConfig.WeChatPayServer, {
         method: 'POST',
         headers: {
           'Accept': 'application/json',
@@ -64,7 +58,7 @@ export const VipAndroidManager = {
     try {
       const user = LoginManager.currentUser();
       // Step1：生成预订单
-      const rawResponse = await fetch(SERVER_URL, {
+      const rawResponse = await fetch(ToolkitConfig.WeChatPayServer, {
         method: 'POST',
         headers: {
           'Accept': 'application/json',

package/src/VipManager.ts

@@ -7,32 +7,17 @@ import { DevConfig } from './DevConfig';
 import { LoginManager } from './LoginManager';
 import { Notification } from './Notification';
 import { BuildInPrefs } from './PrefData';
-import { Tool } from './Tool';
+import { Tool, ToolkitConfig } from './Tool';
 import { VipAndroidManager } from './VipAndroidManager';
 import { UserType } from './constant';
 
 let _customerInfo: CustomerInfo | null;
-let _RC_ENTITLEMENT_ID: string = '';
 
 export const VipManager = {
-  init: ({
-    RC_API_KEY,
-    RC_ENTITLEMENT_ID,
-    WeChatPayServer,
-  }: {
-    RC_API_KEY: string;
-    RC_ENTITLEMENT_ID: string;
-    WeChatPayServer: string;
-  }) => {
+  init: () => {
     console.log('Vip 模块初始化');
 
-    VipAndroidManager.init({ WeChatPayServer });
-
-    _RC_ENTITLEMENT_ID = RC_ENTITLEMENT_ID;
-
-    Purchases.configure({
-      apiKey: RC_API_KEY,
-    });
+    Purchases.configure({ apiKey: ToolkitConfig.RC_API_KEY });
 
     VipManager.refreshVip();
 
@@ -78,8 +63,9 @@ export const VipManager = {
 
       await VipManager.refreshVip(customerInfo);
       if (
-        typeof customerInfo.entitlements.active[_RC_ENTITLEMENT_ID] !==
-        'undefined'
+        typeof customerInfo.entitlements.active[
+          ToolkitConfig.RC_ENTITLEMENT_ID
+        ] !== 'undefined'
       ) {
         console.log('购买成功');
         return { errorCode: 0 };