@norcy/react-native-toolkit 0.1.112 → 0.1.113

package/src/ConfigDataModel.ts

@@ -2,7 +2,7 @@ import { Object } from 'leancloud-storage';
 import { Platform } from 'react-native';
 import { getReadableVersion } from 'react-native-device-info';
 import { DevConfig } from './DevConfig';
-import { LoginResultDataType } from './LoginManager';
+import { LoginManager, LoginResultDataType } from './LoginManager';
 import { Notification } from './Notification';
 import { BuildInPrefs } from './PrefData';
 import { VipAndroidManager } from './VipAndroidManager';
@@ -85,9 +85,8 @@ const handleVersionInfo = () => {
 
 let isDataReady = false;
 let isNetwordDataReady = false;
-let OnlineItems: Object[] = [];
 
-const _handleResponse = () => {
+const _handleResponse = (OnlineItems: Object[]) => {
   if (!isNetwordDataReady) {
     return;
   }
@@ -103,6 +102,7 @@ const _handleResponse = () => {
   ConfigDataModel.emitChange();
 };
 
+// ConfigDataModel 的 Config 是支持后台配置多条同一个 Key 的，按版本区分
 const ConfigDataModel = {
   init: (defaultValues: ConfigsType) => {
     MyItems = defaultValues;
@@ -113,7 +113,6 @@ const ConfigDataModel = {
         if (!isAuto && user && !error) {
           isDataReady = false;
           isNetwordDataReady = false;
-          OnlineItems = [];
           ConfigDataModel.fetch();
         }
       }
@@ -135,8 +134,7 @@ const ConfigDataModel = {
       .then((items: Object[]) => {
         console.log('Config 抓取完毕');
         isNetwordDataReady = true;
-        OnlineItems = items;
-        _handleResponse();
+        _handleResponse(items);
       })
       .catch((e: any) => {
         console.error(e);
@@ -170,6 +168,21 @@ const ConfigDataModel = {
     }
     eventEmitter.on('change', callback);
   },
+
+  shouldEnableByRate: (enable?: boolean, rate?: number) => {
+    if (!enable) {
+      return false;
+    }
+    // rate 不传，默认为全量
+    const r = rate ?? 1;
+    if (r <= 0) {
+      return false;
+    }
+    // ID 最后一位是 16 进制（0-f），未登录默认为全量
+    const lastChar =
+      LoginManager.currentUser()?.AVUser?.get('objectId')?.slice(-1) ?? '0';
+    return '0123456789abcdef'.indexOf(lastChar.toLowerCase()) < r * 16;
+  },
 };
 
 export { ConfigDataModel };

package/src/Tool.ts

@@ -73,7 +73,7 @@ const _jsonify = (target: any): any => {
   return target;
 };
 
-const _getAlertDataFromConfig = (config: AlertConfig) => {
+const _getAlertDataFromConfig = (config?: AlertConfig) => {
   if (!config) {
     return undefined;
   }
@@ -220,10 +220,12 @@ export const Tool = {
   },
 
   showToast: (toast: string) => {
-    Toast.showWithGravity(toast, Toast.SHORT, Toast.CENTER);
+    if (toast) {
+      Toast.showWithGravity(toast, Toast.SHORT, Toast.CENTER);
+    }
   },
 
-  alertWithConfig: (config: AlertConfig) => {
+  alertWithConfig: (config?: AlertConfig) => {
     const alertData = _getAlertDataFromConfig(config);
     if (alertData) {
       Alert.alert(alertData.title, alertData.message, alertData.buttons);

package/.vscode/settings.json

@@ -1,9 +0,0 @@
-{
-  "editor.formatOnSave": true,
-  "editor.codeActionsOnSave": {
-    "source.organizeImports": "explicit"
-  },
-  "prettier.tabWidth": 4,
-  "prettier.jsxBracketSameLine": true,
-  "editor.tabSize": 2
-}

package/ios/ReactNativeToolkit.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-</Workspace>