@norcy/react-native-toolkit 0.1.107 → 0.1.111

package/src/ConfigDataModel.ts

@@ -6,7 +6,6 @@ import { LoginResultDataType } from './LoginManager';
 import { Notification } from './Notification';
 import { BuildInPrefs } from './PrefData';
 import { VipAndroidManager } from './VipAndroidManager';
-import { VipManager } from './VipManager';
 
 const EventEmitter = require('events').EventEmitter;
 const eventEmitter = new EventEmitter();
@@ -46,23 +45,6 @@ const _filterByVersion = (items: Object[]) => {
   return ret;
 };
 
-const _filterByVip = (items: Object[]) => {
-  let ret = [];
-  const isVip = VipManager.isVip();
-  const isForeverVip = VipManager.isForeverVip();
-  for (const item of items) {
-    const vipFilter = item.get('vipFilter');
-    if (
-      vipFilter === 0 ||
-      (vipFilter === 1 && !isVip) ||
-      (vipFilter === 2 && !isForeverVip)
-    ) {
-      ret.push(item);
-    }
-  }
-  return ret;
-};
-
 const _updateKeyValues = (items: Object[]) => {
   for (const item of items) {
     let value = item.get('value');
@@ -102,19 +84,16 @@ const handleVersionInfo = () => {
 };
 
 let isDataReady = false;
-let isVipStateReady = false;
 let isNetwordDataReady = false;
 let OnlineItems: Object[] = [];
 
 const _handleResponse = () => {
-  if (!isVipStateReady || !isNetwordDataReady) {
+  if (!isNetwordDataReady) {
     return;
   }
 
   // 根据版本过滤
   let items = _filterByVersion(OnlineItems);
-  // 根据 VIP 状态过滤
-  items = _filterByVip(items);
   _updateKeyValues(items);
   // 处理 Version 信息
   handleVersionInfo();
@@ -128,20 +107,11 @@ const ConfigDataModel = {
   init: (defaultValues: ConfigsType) => {
     MyItems = defaultValues;
 
-    Notification.addListener('onVipRefresh', ({ e }: { e: any }) => {
-      // 监听多次，直到成功，整个生命周期最多处理一次
-      if (!e && !isVipStateReady) {
-        isVipStateReady = true;
-        _handleResponse();
-      }
-    });
-
     Notification.addListener(
       'onLogin',
       ({ isAuto, user, error }: LoginResultDataType) => {
         if (!isAuto && user && !error) {
           isDataReady = false;
-          isVipStateReady = false;
           isNetwordDataReady = false;
           OnlineItems = [];
           ConfigDataModel.fetch();

package/src/VipManager.ts

@@ -9,10 +9,21 @@ import { Notification } from './Notification';
 import { BuildInPrefs } from './PrefData';
 import { Tool, ToolkitConfig } from './Tool';
 import { VipAndroidManager } from './VipAndroidManager';
+import { UserType } from './constant';
 
 let _customerInfo: CustomerInfo | null;
 let isReady = false;
 
+const onLogin = async (user: UserType) => {
+  try {
+    await Purchases.logIn(user.AVUser.get('objectId'));
+    await Purchases.setAttributes({ nickname: user.nickname });
+    await VipManager.refreshVip();
+  } catch (e) {
+    console.error(e);
+  }
+};
+
 export const VipManager = {
   init: async () => {
     isReady = !!ToolkitConfig.RC_API_KEY;
@@ -24,7 +35,7 @@ export const VipManager = {
 
     console.log('Vip 模块初始化');
 
-    if (!!ToolkitConfig.RC_PROXY_URL) {
+    if (ToolkitConfig.RC_PROXY_URL) {
       console.log('设置代理', ToolkitConfig.RC_PROXY_URL);
       await Purchases.setProxyURL(ToolkitConfig.RC_PROXY_URL);
     }
@@ -32,18 +43,18 @@ export const VipManager = {
 
     VipManager.refreshVip();
 
+    const loginUser = LoginManager.currentUser();
+    if (loginUser) {
+      console.log('Vip 模块用户登录 from 直接');
+      onLogin(loginUser);
+    }
+
     Notification.addListener(
       'onLogin',
       async ({ error, user }: LoginResultDataType) => {
-        console.log('Vip 模块用户登录');
+        console.log('Vip 模块用户登录 from 监听');
         if (!error && user) {
-          try {
-            await Purchases.logIn(user.AVUser.get('objectId'));
-            await Purchases.setAttributes({ nickname: user.nickname });
-            await VipManager.refreshVip();
-          } catch (e) {
-            console.error(e);
-          }
+          onLogin(user);
         }
       }
     );