@norcy/react-native-toolkit 0.1.30 → 0.1.32

package/src/LoginManager.ts

@@ -4,6 +4,7 @@ import { getUniqueIdSync } from 'react-native-device-info';
 import { AppleLoginUtil } from './AppleLoginUtil';
 import { Notification } from './Notification';
 import { BuildInPrefs, PrefData } from './PrefData';
+import { ToolkitConfig } from './Tool';
 import { WeChatLoginUtil } from './WeChatLoginUtil';
 import {
   LoginAuthDataType,
@@ -17,9 +18,6 @@ const AV = require('leancloud-storage');
 
 let CURRENT_USER: UserType | null = null;
 
-let WeiXinId = '';
-let WeiXinSecret = '';
-
 const AVUserToLocalUser = (user: User) => {
   return {
     nickname: user.get('nickname'),
@@ -120,11 +118,6 @@ const doLeanCloudLogin = async (
 };
 
 export const LoginManager = {
-  setup: (WeChatId: string, WeChatSecret: string) => {
-    WeiXinId = WeChatId;
-    WeiXinSecret = WeChatSecret;
-  },
-
   // 自动根据已有的 User 信息进行登录鉴权，如果 User 为空则失败
   autoLogin: async () => {
     const user = await AV.User.currentAsync();
@@ -198,8 +191,8 @@ export const LoginManager = {
       }
     } else if (type === LoginType.LoginTypeWeChat) {
       WeChatLoginUtil.doLogin(
-        WeiXinId,
-        WeiXinSecret,
+        ToolkitConfig.WeiXinId,
+        ToolkitConfig.WeiXinSecret,
         ({
           nickname,
           headimgurl,
@@ -345,8 +338,8 @@ export const LoginManager = {
 
   fetchWeChatAvatar: (callback: Function) => {
     WeChatLoginUtil.doLogin(
-      WeiXinId,
-      WeiXinSecret,
+      ToolkitConfig.WeiXinId,
+      ToolkitConfig.WeiXinSecret,
       ({ headimgurl }: { headimgurl: string }) => {
         callback({ headimgurl });
       }

package/src/PrefData.ts

@@ -93,7 +93,7 @@ export const PrefData = {
       } else {
         _PrefDatas[key] = value;
       }
-      console.log('读取配置结束');
+
       // console.log(
       //   '配置读取结果：',
       //   key,
@@ -102,6 +102,7 @@ export const PrefData = {
       // );
     }
 
+    console.log('读取配置结束');
     isDataLoaded = true;
     eventEmitter.emit('load');
   },

package/src/Tool.ts

@@ -10,9 +10,19 @@ export interface ToolkitConfigType {
   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 };