@norcy/react-native-toolkit 0.1.73 → 0.1.75

package/lib/commonjs/AppLink.js

@@ -42,16 +42,9 @@ const getAppInsideQueryParams = url => {
 let GlobalNavigation = null;
 const AppLink = exports.AppLink = {
   /* 测试用例：
-  1. https://norcy.xyz/iread 安卓打开浏览器官网
-  2. https://www.coolapk.com/apk/com.norcy.iread 安卓跳酷安
-  3. https://apps.apple.com/app/id1589203887 iOS 跳 AppStore
-  4. https://apps.apple.com/app/id1589203887?action=write-review iOS 跳评价
-  5. https://norcy.xyz/iread?page=WebPage&url=https%3A%2F%2Fqq.com App 内跳转
-  6. yiyue://WebPage?url=https%3A%2F%2Fqq.com App 内跳转
-  7. WebPage?url=https%3A%2F%2Fqq.com App 内跳转
-  9. https://qq.com 跳转浏览器
+  详见 https://docs.qq.com/sheet/DSHpXb29STWpYempK?tab=w20187
   */
-  open: url => {
+  open: (url, ignoreSelf) => {
     if (!url) {
       return;
     }
@@ -72,6 +65,11 @@ const AppLink = exports.AppLink = {
       return;
     }
 
+    // 如果是官网，则不再处理，因为 App 内跳转已经处理了
+    if (ignoreSelf && url.startsWith(_Tool.ToolkitConfig.AppWebsite)) {
+      return;
+    }
+
     // 第三优先级：外部跳转 AppStore、H5 等
     _reactNative.Linking.canOpenURL(url).then(supported => {
       if (supported) {
@@ -80,19 +78,28 @@ const AppLink = exports.AppLink = {
       } else {
         console.error('无法跳转', url);
       }
-    }).catch(() => {
-      console.error('无法跳转', url);
+    }).catch(e => {
+      console.error('无法跳转', url, e);
     });
   },
+  openPage: (page, params) => {
+    var _GlobalNavigation2;
+    if (!page) {
+      return;
+    }
+    (_GlobalNavigation2 = GlobalNavigation) === null || _GlobalNavigation2 === void 0 || _GlobalNavigation2.navigate(page, params);
+  },
   init: navigation => {
     GlobalNavigation = navigation;
-    _reactNative.Linking.getInitialURL().then(url => {
-      // 此处 url 都是官网开头
-      AppLink.open(url !== null && url !== void 0 ? url : undefined);
-    }).catch(err => console.error('获取初始URL时出错:', err));
+    setTimeout(() => {
+      _reactNative.Linking.getInitialURL().then(url => {
+        // 此处 url 都是官网开头
+        AppLink.open(url !== null && url !== void 0 ? url : undefined, true);
+      }).catch(err => console.error('获取初始URL时出错:', err));
+    }, 1500);
     _reactNative.Linking.addEventListener('url', event => {
       // 此处 url 都是官网开头
-      AppLink.open(event.url);
+      AppLink.open(event.url, true);
     });
   }
 };

package/lib/commonjs/AppLink.js.map

@@ -1 +1 @@
-{"version":3,"names":["_queryString","_interopRequireDefault","require","_reactNative","_Tool","obj","__esModule","default","getAppInsideQueryParams","url","ret","page","params","scheme","query","split","queryString","parse","startsWith","ToolkitConfig","AppWebsite","AppScheme","pageName","substring","length","GlobalNavigation","AppLink","exports","open","console","log","AndroidStoreUrl","Tool","goAppStoreReview","_GlobalNavigation","navigate","Linking","canOpenURL","then","supported","openURL","error","catch","init","navigation","getInitialURL","undefined","err","addEventListener","event"],"sources":["AppLink.ts"],"sourcesContent":["import { NavigationProp, ParamListBase } from '@react-navigation/native';\nimport queryString from 'query-string';\nimport { Linking } from 'react-native';\nimport { Tool, ToolkitConfig } from './Tool';\n\nconst getAppInsideQueryParams = (\n  url: string\n): { page: string; params?: object } => {\n  // 专门处理 App 内跳转\n  // 情况 1：https://norcy.xyz/iread?page=WebPage&url=https%3A%2F%2Fqq.com\n  // 情况 2：yiyue://WebPage?url=https%3A%2F%2Fqq.com\n  // 情况 3：WebPage?url=https%3A%2F%2Fqq.com\n  // 全部都转为 {page:Add, params:{value:'你好', mode:0}}\n  const ret = { page: '', params: {} };\n\n  const [scheme, query] = url.split('?');\n  const params = queryString.parse(query) as { [key: string]: string };\n\n  if (scheme.startsWith(ToolkitConfig.AppWebsite) && params.page) {\n    // https://norcy.xyz/iread?page=WebPage&url=https%3A%2F%2Fqq.com\n    ret.page = params.page;\n    delete params.page;\n    ret.params = params;\n  } else if (scheme.startsWith(ToolkitConfig.AppScheme)) {\n    // yiyue://WebPage?url=https%3A%2F%2Fqq.com\n    const pageName = scheme.substring(ToolkitConfig.AppScheme.length);\n    ret.page = pageName;\n    ret.params = params;\n  } else if (scheme.startsWith('http')) {\n    // 除了第一个 if，http 开头的不处理\n  } else {\n    // WebPage?url=https%3A%2F%2Fqq.com\n    ret.page = scheme;\n    ret.params = params;\n  }\n  return ret;\n};\n\nlet GlobalNavigation: NavigationProp<ParamListBase> | null = null;\n\nexport const AppLink = {\n  /* 测试用例：\n  1. https://norcy.xyz/iread 安卓打开浏览器官网\n  2. https://www.coolapk.com/apk/com.norcy.iread 安卓跳酷安\n  3. https://apps.apple.com/app/id1589203887 iOS 跳 AppStore\n  4. https://apps.apple.com/app/id1589203887?action=write-review iOS 跳评价\n  5. https://norcy.xyz/iread?page=WebPage&url=https%3A%2F%2Fqq.com App 内跳转\n  6. yiyue://WebPage?url=https%3A%2F%2Fqq.com App 内跳转\n  7. WebPage?url=https%3A%2F%2Fqq.com App 内跳转\n  9. https://qq.com 跳转浏览器\n  */\n  open: (url?: string) => {\n    if (!url) {\n      return;\n    }\n\n    console.log('Open URL', url);\n\n    // 第一优先级：Android 市场\n    if (url.startsWith(ToolkitConfig.AndroidStoreUrl)) {\n      Tool.goAppStoreReview();\n      return;\n    }\n\n    // 第二优先级：App 内跳转\n    const ret = getAppInsideQueryParams(url);\n    if (ret.page) {\n      console.log('App 内跳转', ret);\n      GlobalNavigation?.navigate(ret.page, ret.params);\n      return;\n    }\n\n    // 第三优先级：外部跳转 AppStore、H5 等\n    Linking.canOpenURL(url)\n      .then((supported) => {\n        if (supported) {\n          console.log('外部跳转', url);\n          Linking.openURL(url);\n        } else {\n          console.error('无法跳转', url);\n        }\n      })\n      .catch(() => {\n        console.error('无法跳转', url);\n      });\n  },\n\n  init: (navigation: NavigationProp<ParamListBase>) => {\n    GlobalNavigation = navigation;\n    Linking.getInitialURL()\n      .then((url) => {\n        // 此处 url 都是官网开头\n        AppLink.open(url ?? undefined);\n      })\n      .catch((err) => console.error('获取初始URL时出错:', err));\n\n    Linking.addEventListener('url', (event) => {\n      // 此处 url 都是官网开头\n      AppLink.open(event.url);\n    });\n  },\n};\n"],"mappings":"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"}
+{"version":3,"names":["_queryString","_interopRequireDefault","require","_reactNative","_Tool","obj","__esModule","default","getAppInsideQueryParams","url","ret","page","params","scheme","query","split","queryString","parse","startsWith","ToolkitConfig","AppWebsite","AppScheme","pageName","substring","length","GlobalNavigation","AppLink","exports","open","ignoreSelf","console","log","AndroidStoreUrl","Tool","goAppStoreReview","_GlobalNavigation","navigate","Linking","canOpenURL","then","supported","openURL","error","catch","e","openPage","_GlobalNavigation2","init","navigation","setTimeout","getInitialURL","undefined","err","addEventListener","event"],"sources":["AppLink.ts"],"sourcesContent":["import { NavigationProp, ParamListBase } from '@react-navigation/native';\nimport queryString from 'query-string';\nimport { Linking } from 'react-native';\nimport { Tool, ToolkitConfig } from './Tool';\n\nconst getAppInsideQueryParams = (\n  url: string\n): { page: string; params?: object } => {\n  // 专门处理 App 内跳转\n  // 情况 1：https://norcy.xyz/iread?page=WebPage&url=https%3A%2F%2Fqq.com\n  // 情况 2：yiyue://WebPage?url=https%3A%2F%2Fqq.com\n  // 情况 3：WebPage?url=https%3A%2F%2Fqq.com\n  // 全部都转为 {page:Add, params:{value:'你好', mode:0}}\n  const ret = { page: '', params: {} };\n\n  const [scheme, query] = url.split('?');\n  const params = queryString.parse(query) as { [key: string]: string };\n\n  if (scheme.startsWith(ToolkitConfig.AppWebsite) && params.page) {\n    // https://norcy.xyz/iread?page=WebPage&url=https%3A%2F%2Fqq.com\n    ret.page = params.page;\n    delete params.page;\n    ret.params = params;\n  } else if (scheme.startsWith(ToolkitConfig.AppScheme)) {\n    // yiyue://WebPage?url=https%3A%2F%2Fqq.com\n    const pageName = scheme.substring(ToolkitConfig.AppScheme.length);\n    ret.page = pageName;\n    ret.params = params;\n  } else if (scheme.startsWith('http')) {\n    // 除了第一个 if，http 开头的不处理\n  } else {\n    // WebPage?url=https%3A%2F%2Fqq.com\n    ret.page = scheme;\n    ret.params = params;\n  }\n  return ret;\n};\n\nlet GlobalNavigation: NavigationProp<ParamListBase> | null = null;\n\nexport const AppLink = {\n  /* 测试用例：\n  详见 https://docs.qq.com/sheet/DSHpXb29STWpYempK?tab=w20187\n  */\n  open: (url?: string, ignoreSelf?: boolean) => {\n    if (!url) {\n      return;\n    }\n\n    console.log('Open URL', url);\n\n    // 第一优先级：Android 市场\n    if (url.startsWith(ToolkitConfig.AndroidStoreUrl)) {\n      Tool.goAppStoreReview();\n      return;\n    }\n\n    // 第二优先级：App 内跳转\n    const ret = getAppInsideQueryParams(url);\n    if (ret.page) {\n      console.log('App 内跳转', ret);\n      GlobalNavigation?.navigate(ret.page, ret.params);\n      return;\n    }\n\n    // 如果是官网，则不再处理，因为 App 内跳转已经处理了\n    if (ignoreSelf && url.startsWith(ToolkitConfig.AppWebsite)) {\n      return;\n    }\n\n    // 第三优先级：外部跳转 AppStore、H5 等\n    Linking.canOpenURL(url)\n      .then((supported) => {\n        if (supported) {\n          console.log('外部跳转', url);\n          Linking.openURL(url);\n        } else {\n          console.error('无法跳转', url);\n        }\n      })\n      .catch((e) => {\n        console.error('无法跳转', url, e);\n      });\n  },\n\n  openPage: (page: string, params: object) => {\n    if (!page) {\n      return;\n    }\n    GlobalNavigation?.navigate(page, params);\n  },\n\n  init: (navigation: NavigationProp<ParamListBase>) => {\n    GlobalNavigation = navigation;\n    setTimeout(() => {\n      Linking.getInitialURL()\n        .then((url) => {\n          // 此处 url 都是官网开头\n          AppLink.open(url ?? undefined, true);\n        })\n        .catch((err) => console.error('获取初始URL时出错:', err));\n    }, 1500);\n\n    Linking.addEventListener('url', (event) => {\n      // 此处 url 都是官网开头\n      AppLink.open(event.url, true);\n    });\n  },\n};\n"],"mappings":"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"}

package/lib/commonjs/ConfigDataModel.js

@@ -20,7 +20,7 @@ let MyItems = {};
 let VersionInfo = {
   currentVersion: semverCoerce((0, _reactNativeDeviceInfo.getReadableVersion)()).version,
   latestVersion: semverCoerce((0, _reactNativeDeviceInfo.getReadableVersion)()).version,
-  isDanger: true,
+  isDanger: false,
   hasNewVersion: false
 };
 const AV = require('leancloud-storage');

package/lib/commonjs/ConfigDataModel.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","_reactNativeDeviceInfo","_DevConfig","_Notification","_PrefData","_VipAndroidManager","_VipManager","EventEmitter","eventEmitter","semverGt","semverGte","semverCoerce","MyItems","VersionInfo","currentVersion","getReadableVersion","version","latestVersion","isDanger","hasNewVersion","AV","_filterByVersion","items","ret","curVer","item","_item$get","_item$get2","minVer","get","trim","maxVer","push","_filterByVip","isVip","VipManager","isForeverVip","vipFilter","_updateKeyValues","value","handleVersionInfo","key","Platform","OS","configVersion","ConfigDataModel","onlineVersion","__DEV__","DevConfig","hasValue","BuildInPrefs","DevDanger","getValue","isDataReady","isVipStateReady","OnlineItems","_handleResponse","length","console","log","VipAndroidManager","setPackages","emitChange","exports","init","defaultValues","Notification","addListenerOnce","fetch","query","Query","equalTo","find","then","catch","e","error","getVersionConfig","emit","callback","once"],"sources":["ConfigDataModel.ts"],"sourcesContent":["import { Object } from 'leancloud-storage';\nimport { Platform } from 'react-native';\nimport { getReadableVersion } from 'react-native-device-info';\nimport { DevConfig } from './DevConfig';\nimport { Notification } from './Notification';\nimport { BuildInPrefs } from './PrefData';\nimport { VipAndroidManager } from './VipAndroidManager';\nimport { VipManager } from './VipManager';\n\nconst EventEmitter = require('events').EventEmitter;\nconst eventEmitter = new EventEmitter();\nconst semverGt = require('semver/functions/gt');\nconst semverGte = require('semver/functions/gte');\nconst semverCoerce = require('semver/functions/coerce');\n\nexport interface ConfigsType {\n  [key: string]: any;\n}\nlet MyItems: ConfigsType = {};\nlet VersionInfo = {\n  currentVersion: semverCoerce(getReadableVersion()).version,\n  latestVersion: semverCoerce(getReadableVersion()).version,\n  isDanger: true,\n  hasNewVersion: false,\n};\n\nconst AV = require('leancloud-storage');\n\nconst _filterByVersion = (items: Object[]) => {\n  let ret = [];\n  const curVer = semverCoerce(getReadableVersion()).version;\n  for (const item of items) {\n    const minVer = item.get('minVer')?.trim();\n    const maxVer = item.get('maxVer')?.trim();\n    //  确保 cur 处于 [minVer, maxVer)\n    if (!!minVer && semverGt(semverCoerce(minVer).version, curVer)) {\n      continue;\n    }\n    if (!!maxVer && semverGte(curVer, semverCoerce(maxVer).version)) {\n      continue;\n    }\n\n    ret.push(item);\n  }\n  return ret;\n};\n\nconst _filterByVip = (items: Object[]) => {\n  let ret = [];\n  const isVip = VipManager.isVip();\n  const isForeverVip = VipManager.isForeverVip();\n  for (const item of items) {\n    const vipFilter = item.get('vipFilter');\n    if (\n      vipFilter === 0 ||\n      (vipFilter === 1 && !isVip) ||\n      (vipFilter === 2 && !isForeverVip)\n    ) {\n      ret.push(item);\n    }\n  }\n  return ret;\n};\n\nconst _updateKeyValues = (items: Object[]) => {\n  for (const item of items) {\n    let value = item.get('value');\n    if (typeof value === 'string') {\n      // 因为 leancloud 无法配置空白内容，所以 trim 下，这样就能以空格代替空白{\n      value = value.trim();\n    }\n    MyItems[item.get('key')] = value;\n  }\n};\n\nconst handleVersionInfo = () => {\n  // online > current，则更新 latestVersion\n  let key = 'ov';\n  if (Platform.OS === 'android') {\n    key = 'aov';\n  }\n  const configVersion = ConfigDataModel.get(key);\n  if (configVersion) {\n    const onlineVersion = semverCoerce(configVersion).version;\n    // current < online，才有新版本\n    if (semverGt(onlineVersion, VersionInfo.currentVersion)) {\n      VersionInfo.latestVersion = onlineVersion;\n      VersionInfo.hasNewVersion = true;\n    }\n    // current <= online，才安全 ，防止忘记修改 online\n    if (!semverGt(VersionInfo.currentVersion, onlineVersion)) {\n      VersionInfo.isDanger = false;\n    }\n  }\n\n  if (__DEV__) {\n    if (DevConfig.hasValue(BuildInPrefs.DevDanger)) {\n      VersionInfo.isDanger = DevConfig.getValue(BuildInPrefs.DevDanger);\n    }\n  }\n};\n\nlet isDataReady = false;\nlet isVipStateReady = false;\nlet OnlineItems: Object[] = [];\n\nconst _handleResponse = () => {\n  if (!isVipStateReady || !OnlineItems.length) {\n    return;\n  }\n\n  // 根据版本过滤\n  let items = _filterByVersion(OnlineItems);\n  // 根据 VIP 状态过滤\n  items = _filterByVip(items);\n  _updateKeyValues(items);\n  // 处理 Version 信息\n  handleVersionInfo();\n  console.log('Config 处理完毕');\n  isDataReady = true;\n  VipAndroidManager.setPackages(ConfigDataModel.get('vip_android_products'));\n  ConfigDataModel.emitChange();\n};\n\nconst ConfigDataModel = {\n  init: (defaultValues: ConfigsType) => {\n    MyItems = defaultValues;\n    // TODO 这里切换登录信息会复用\n    Notification.addListenerOnce('onVipRefresh', () => {\n      isVipStateReady = true;\n      _handleResponse();\n    });\n    ConfigDataModel.fetch();\n  },\n\n  fetch: () => {\n    const query = new AV.Query('Configs');\n    query.equalTo('valid', true).equalTo(Platform.OS, true);\n    query\n      .find()\n      .then((items: Object[]) => {\n        console.log('Config 抓取完毕');\n        OnlineItems = items;\n        _handleResponse();\n      })\n      .catch((e: any) => {\n        console.error(e);\n      });\n  },\n\n  getVersionConfig: () => {\n    return VersionInfo;\n  },\n\n  get: (key: string) => {\n    return MyItems[key];\n  },\n\n  emitChange: () => {\n    eventEmitter.emit('change');\n  },\n\n  addListenerOnce: (callback: Function) => {\n    if (isDataReady) {\n      callback && callback();\n      return;\n    }\n    eventEmitter.once('change', callback);\n  },\n};\n\nexport { ConfigDataModel };\n"],"mappings":"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"}
+{"version":3,"names":["_reactNative","require","_reactNativeDeviceInfo","_DevConfig","_Notification","_PrefData","_VipAndroidManager","_VipManager","EventEmitter","eventEmitter","semverGt","semverGte","semverCoerce","MyItems","VersionInfo","currentVersion","getReadableVersion","version","latestVersion","isDanger","hasNewVersion","AV","_filterByVersion","items","ret","curVer","item","_item$get","_item$get2","minVer","get","trim","maxVer","push","_filterByVip","isVip","VipManager","isForeverVip","vipFilter","_updateKeyValues","value","handleVersionInfo","key","Platform","OS","configVersion","ConfigDataModel","onlineVersion","__DEV__","DevConfig","hasValue","BuildInPrefs","DevDanger","getValue","isDataReady","isVipStateReady","OnlineItems","_handleResponse","length","console","log","VipAndroidManager","setPackages","emitChange","exports","init","defaultValues","Notification","addListenerOnce","fetch","query","Query","equalTo","find","then","catch","e","error","getVersionConfig","emit","callback","once"],"sources":["ConfigDataModel.ts"],"sourcesContent":["import { Object } from 'leancloud-storage';\nimport { Platform } from 'react-native';\nimport { getReadableVersion } from 'react-native-device-info';\nimport { DevConfig } from './DevConfig';\nimport { Notification } from './Notification';\nimport { BuildInPrefs } from './PrefData';\nimport { VipAndroidManager } from './VipAndroidManager';\nimport { VipManager } from './VipManager';\n\nconst EventEmitter = require('events').EventEmitter;\nconst eventEmitter = new EventEmitter();\nconst semverGt = require('semver/functions/gt');\nconst semverGte = require('semver/functions/gte');\nconst semverCoerce = require('semver/functions/coerce');\n\nexport interface ConfigsType {\n  [key: string]: any;\n}\nlet MyItems: ConfigsType = {};\nlet VersionInfo = {\n  currentVersion: semverCoerce(getReadableVersion()).version,\n  latestVersion: semverCoerce(getReadableVersion()).version,\n  isDanger: false,\n  hasNewVersion: false,\n};\n\nconst AV = require('leancloud-storage');\n\nconst _filterByVersion = (items: Object[]) => {\n  let ret = [];\n  const curVer = semverCoerce(getReadableVersion()).version;\n  for (const item of items) {\n    const minVer = item.get('minVer')?.trim();\n    const maxVer = item.get('maxVer')?.trim();\n    //  确保 cur 处于 [minVer, maxVer)\n    if (!!minVer && semverGt(semverCoerce(minVer).version, curVer)) {\n      continue;\n    }\n    if (!!maxVer && semverGte(curVer, semverCoerce(maxVer).version)) {\n      continue;\n    }\n\n    ret.push(item);\n  }\n  return ret;\n};\n\nconst _filterByVip = (items: Object[]) => {\n  let ret = [];\n  const isVip = VipManager.isVip();\n  const isForeverVip = VipManager.isForeverVip();\n  for (const item of items) {\n    const vipFilter = item.get('vipFilter');\n    if (\n      vipFilter === 0 ||\n      (vipFilter === 1 && !isVip) ||\n      (vipFilter === 2 && !isForeverVip)\n    ) {\n      ret.push(item);\n    }\n  }\n  return ret;\n};\n\nconst _updateKeyValues = (items: Object[]) => {\n  for (const item of items) {\n    let value = item.get('value');\n    if (typeof value === 'string') {\n      // 因为 leancloud 无法配置空白内容，所以 trim 下，这样就能以空格代替空白{\n      value = value.trim();\n    }\n    MyItems[item.get('key')] = value;\n  }\n};\n\nconst handleVersionInfo = () => {\n  // online > current，则更新 latestVersion\n  let key = 'ov';\n  if (Platform.OS === 'android') {\n    key = 'aov';\n  }\n  const configVersion = ConfigDataModel.get(key);\n  if (configVersion) {\n    const onlineVersion = semverCoerce(configVersion).version;\n    // current < online，才有新版本\n    if (semverGt(onlineVersion, VersionInfo.currentVersion)) {\n      VersionInfo.latestVersion = onlineVersion;\n      VersionInfo.hasNewVersion = true;\n    }\n    // current <= online，才安全 ，防止忘记修改 online\n    if (!semverGt(VersionInfo.currentVersion, onlineVersion)) {\n      VersionInfo.isDanger = false;\n    }\n  }\n\n  if (__DEV__) {\n    if (DevConfig.hasValue(BuildInPrefs.DevDanger)) {\n      VersionInfo.isDanger = DevConfig.getValue(BuildInPrefs.DevDanger);\n    }\n  }\n};\n\nlet isDataReady = false;\nlet isVipStateReady = false;\nlet OnlineItems: Object[] = [];\n\nconst _handleResponse = () => {\n  if (!isVipStateReady || !OnlineItems.length) {\n    return;\n  }\n\n  // 根据版本过滤\n  let items = _filterByVersion(OnlineItems);\n  // 根据 VIP 状态过滤\n  items = _filterByVip(items);\n  _updateKeyValues(items);\n  // 处理 Version 信息\n  handleVersionInfo();\n  console.log('Config 处理完毕');\n  isDataReady = true;\n  VipAndroidManager.setPackages(ConfigDataModel.get('vip_android_products'));\n  ConfigDataModel.emitChange();\n};\n\nconst ConfigDataModel = {\n  init: (defaultValues: ConfigsType) => {\n    MyItems = defaultValues;\n    // TODO 这里切换登录信息会复用\n    Notification.addListenerOnce('onVipRefresh', () => {\n      isVipStateReady = true;\n      _handleResponse();\n    });\n    ConfigDataModel.fetch();\n  },\n\n  fetch: () => {\n    const query = new AV.Query('Configs');\n    query.equalTo('valid', true).equalTo(Platform.OS, true);\n    query\n      .find()\n      .then((items: Object[]) => {\n        console.log('Config 抓取完毕');\n        OnlineItems = items;\n        _handleResponse();\n      })\n      .catch((e: any) => {\n        console.error(e);\n      });\n  },\n\n  getVersionConfig: () => {\n    return VersionInfo;\n  },\n\n  get: (key: string) => {\n    return MyItems[key];\n  },\n\n  emitChange: () => {\n    eventEmitter.emit('change');\n  },\n\n  addListenerOnce: (callback: Function) => {\n    if (isDataReady) {\n      callback && callback();\n      return;\n    }\n    eventEmitter.once('change', callback);\n  },\n};\n\nexport { ConfigDataModel };\n"],"mappings":"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"}

package/lib/module/AppLink.js

@@ -35,16 +35,9 @@ const getAppInsideQueryParams = url => {
 let GlobalNavigation = null;
 export const AppLink = {
   /* 测试用例：
-  1. https://norcy.xyz/iread 安卓打开浏览器官网
-  2. https://www.coolapk.com/apk/com.norcy.iread 安卓跳酷安
-  3. https://apps.apple.com/app/id1589203887 iOS 跳 AppStore
-  4. https://apps.apple.com/app/id1589203887?action=write-review iOS 跳评价
-  5. https://norcy.xyz/iread?page=WebPage&url=https%3A%2F%2Fqq.com App 内跳转
-  6. yiyue://WebPage?url=https%3A%2F%2Fqq.com App 内跳转
-  7. WebPage?url=https%3A%2F%2Fqq.com App 内跳转
-  9. https://qq.com 跳转浏览器
+  详见 https://docs.qq.com/sheet/DSHpXb29STWpYempK?tab=w20187
   */
-  open: url => {
+  open: (url, ignoreSelf) => {
     if (!url) {
       return;
     }
@@ -65,6 +58,11 @@ export const AppLink = {
       return;
     }
 
+    // 如果是官网，则不再处理，因为 App 内跳转已经处理了
+    if (ignoreSelf && url.startsWith(ToolkitConfig.AppWebsite)) {
+      return;
+    }
+
     // 第三优先级：外部跳转 AppStore、H5 等
     Linking.canOpenURL(url).then(supported => {
       if (supported) {
@@ -73,19 +71,28 @@ export const AppLink = {
       } else {
         console.error('无法跳转', url);
       }
-    }).catch(() => {
-      console.error('无法跳转', url);
+    }).catch(e => {
+      console.error('无法跳转', url, e);
     });
   },
+  openPage: (page, params) => {
+    var _GlobalNavigation2;
+    if (!page) {
+      return;
+    }
+    (_GlobalNavigation2 = GlobalNavigation) === null || _GlobalNavigation2 === void 0 || _GlobalNavigation2.navigate(page, params);
+  },
   init: navigation => {
     GlobalNavigation = navigation;
-    Linking.getInitialURL().then(url => {
-      // 此处 url 都是官网开头
-      AppLink.open(url !== null && url !== void 0 ? url : undefined);
-    }).catch(err => console.error('获取初始URL时出错:', err));
+    setTimeout(() => {
+      Linking.getInitialURL().then(url => {
+        // 此处 url 都是官网开头
+        AppLink.open(url !== null && url !== void 0 ? url : undefined, true);
+      }).catch(err => console.error('获取初始URL时出错:', err));
+    }, 1500);
     Linking.addEventListener('url', event => {
       // 此处 url 都是官网开头
-      AppLink.open(event.url);
+      AppLink.open(event.url, true);
     });
   }
 };

package/lib/module/AppLink.js.map

@@ -1 +1 @@
-{"version":3,"names":["queryString","Linking","Tool","ToolkitConfig","getAppInsideQueryParams","url","ret","page","params","scheme","query","split","parse","startsWith","AppWebsite","AppScheme","pageName","substring","length","GlobalNavigation","AppLink","open","console","log","AndroidStoreUrl","goAppStoreReview","_GlobalNavigation","navigate","canOpenURL","then","supported","openURL","error","catch","init","navigation","getInitialURL","undefined","err","addEventListener","event"],"sources":["AppLink.ts"],"sourcesContent":["import { NavigationProp, ParamListBase } from '@react-navigation/native';\nimport queryString from 'query-string';\nimport { Linking } from 'react-native';\nimport { Tool, ToolkitConfig } from './Tool';\n\nconst getAppInsideQueryParams = (\n  url: string\n): { page: string; params?: object } => {\n  // 专门处理 App 内跳转\n  // 情况 1：https://norcy.xyz/iread?page=WebPage&url=https%3A%2F%2Fqq.com\n  // 情况 2：yiyue://WebPage?url=https%3A%2F%2Fqq.com\n  // 情况 3：WebPage?url=https%3A%2F%2Fqq.com\n  // 全部都转为 {page:Add, params:{value:'你好', mode:0}}\n  const ret = { page: '', params: {} };\n\n  const [scheme, query] = url.split('?');\n  const params = queryString.parse(query) as { [key: string]: string };\n\n  if (scheme.startsWith(ToolkitConfig.AppWebsite) && params.page) {\n    // https://norcy.xyz/iread?page=WebPage&url=https%3A%2F%2Fqq.com\n    ret.page = params.page;\n    delete params.page;\n    ret.params = params;\n  } else if (scheme.startsWith(ToolkitConfig.AppScheme)) {\n    // yiyue://WebPage?url=https%3A%2F%2Fqq.com\n    const pageName = scheme.substring(ToolkitConfig.AppScheme.length);\n    ret.page = pageName;\n    ret.params = params;\n  } else if (scheme.startsWith('http')) {\n    // 除了第一个 if，http 开头的不处理\n  } else {\n    // WebPage?url=https%3A%2F%2Fqq.com\n    ret.page = scheme;\n    ret.params = params;\n  }\n  return ret;\n};\n\nlet GlobalNavigation: NavigationProp<ParamListBase> | null = null;\n\nexport const AppLink = {\n  /* 测试用例：\n  1. https://norcy.xyz/iread 安卓打开浏览器官网\n  2. https://www.coolapk.com/apk/com.norcy.iread 安卓跳酷安\n  3. https://apps.apple.com/app/id1589203887 iOS 跳 AppStore\n  4. https://apps.apple.com/app/id1589203887?action=write-review iOS 跳评价\n  5. https://norcy.xyz/iread?page=WebPage&url=https%3A%2F%2Fqq.com App 内跳转\n  6. yiyue://WebPage?url=https%3A%2F%2Fqq.com App 内跳转\n  7. WebPage?url=https%3A%2F%2Fqq.com App 内跳转\n  9. https://qq.com 跳转浏览器\n  */\n  open: (url?: string) => {\n    if (!url) {\n      return;\n    }\n\n    console.log('Open URL', url);\n\n    // 第一优先级：Android 市场\n    if (url.startsWith(ToolkitConfig.AndroidStoreUrl)) {\n      Tool.goAppStoreReview();\n      return;\n    }\n\n    // 第二优先级：App 内跳转\n    const ret = getAppInsideQueryParams(url);\n    if (ret.page) {\n      console.log('App 内跳转', ret);\n      GlobalNavigation?.navigate(ret.page, ret.params);\n      return;\n    }\n\n    // 第三优先级：外部跳转 AppStore、H5 等\n    Linking.canOpenURL(url)\n      .then((supported) => {\n        if (supported) {\n          console.log('外部跳转', url);\n          Linking.openURL(url);\n        } else {\n          console.error('无法跳转', url);\n        }\n      })\n      .catch(() => {\n        console.error('无法跳转', url);\n      });\n  },\n\n  init: (navigation: NavigationProp<ParamListBase>) => {\n    GlobalNavigation = navigation;\n    Linking.getInitialURL()\n      .then((url) => {\n        // 此处 url 都是官网开头\n        AppLink.open(url ?? undefined);\n      })\n      .catch((err) => console.error('获取初始URL时出错:', err));\n\n    Linking.addEventListener('url', (event) => {\n      // 此处 url 都是官网开头\n      AppLink.open(event.url);\n    });\n  },\n};\n"],"mappings":"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"}
+{"version":3,"names":["queryString","Linking","Tool","ToolkitConfig","getAppInsideQueryParams","url","ret","page","params","scheme","query","split","parse","startsWith","AppWebsite","AppScheme","pageName","substring","length","GlobalNavigation","AppLink","open","ignoreSelf","console","log","AndroidStoreUrl","goAppStoreReview","_GlobalNavigation","navigate","canOpenURL","then","supported","openURL","error","catch","e","openPage","_GlobalNavigation2","init","navigation","setTimeout","getInitialURL","undefined","err","addEventListener","event"],"sources":["AppLink.ts"],"sourcesContent":["import { NavigationProp, ParamListBase } from '@react-navigation/native';\nimport queryString from 'query-string';\nimport { Linking } from 'react-native';\nimport { Tool, ToolkitConfig } from './Tool';\n\nconst getAppInsideQueryParams = (\n  url: string\n): { page: string; params?: object } => {\n  // 专门处理 App 内跳转\n  // 情况 1：https://norcy.xyz/iread?page=WebPage&url=https%3A%2F%2Fqq.com\n  // 情况 2：yiyue://WebPage?url=https%3A%2F%2Fqq.com\n  // 情况 3：WebPage?url=https%3A%2F%2Fqq.com\n  // 全部都转为 {page:Add, params:{value:'你好', mode:0}}\n  const ret = { page: '', params: {} };\n\n  const [scheme, query] = url.split('?');\n  const params = queryString.parse(query) as { [key: string]: string };\n\n  if (scheme.startsWith(ToolkitConfig.AppWebsite) && params.page) {\n    // https://norcy.xyz/iread?page=WebPage&url=https%3A%2F%2Fqq.com\n    ret.page = params.page;\n    delete params.page;\n    ret.params = params;\n  } else if (scheme.startsWith(ToolkitConfig.AppScheme)) {\n    // yiyue://WebPage?url=https%3A%2F%2Fqq.com\n    const pageName = scheme.substring(ToolkitConfig.AppScheme.length);\n    ret.page = pageName;\n    ret.params = params;\n  } else if (scheme.startsWith('http')) {\n    // 除了第一个 if，http 开头的不处理\n  } else {\n    // WebPage?url=https%3A%2F%2Fqq.com\n    ret.page = scheme;\n    ret.params = params;\n  }\n  return ret;\n};\n\nlet GlobalNavigation: NavigationProp<ParamListBase> | null = null;\n\nexport const AppLink = {\n  /* 测试用例：\n  详见 https://docs.qq.com/sheet/DSHpXb29STWpYempK?tab=w20187\n  */\n  open: (url?: string, ignoreSelf?: boolean) => {\n    if (!url) {\n      return;\n    }\n\n    console.log('Open URL', url);\n\n    // 第一优先级：Android 市场\n    if (url.startsWith(ToolkitConfig.AndroidStoreUrl)) {\n      Tool.goAppStoreReview();\n      return;\n    }\n\n    // 第二优先级：App 内跳转\n    const ret = getAppInsideQueryParams(url);\n    if (ret.page) {\n      console.log('App 内跳转', ret);\n      GlobalNavigation?.navigate(ret.page, ret.params);\n      return;\n    }\n\n    // 如果是官网，则不再处理，因为 App 内跳转已经处理了\n    if (ignoreSelf && url.startsWith(ToolkitConfig.AppWebsite)) {\n      return;\n    }\n\n    // 第三优先级：外部跳转 AppStore、H5 等\n    Linking.canOpenURL(url)\n      .then((supported) => {\n        if (supported) {\n          console.log('外部跳转', url);\n          Linking.openURL(url);\n        } else {\n          console.error('无法跳转', url);\n        }\n      })\n      .catch((e) => {\n        console.error('无法跳转', url, e);\n      });\n  },\n\n  openPage: (page: string, params: object) => {\n    if (!page) {\n      return;\n    }\n    GlobalNavigation?.navigate(page, params);\n  },\n\n  init: (navigation: NavigationProp<ParamListBase>) => {\n    GlobalNavigation = navigation;\n    setTimeout(() => {\n      Linking.getInitialURL()\n        .then((url) => {\n          // 此处 url 都是官网开头\n          AppLink.open(url ?? undefined, true);\n        })\n        .catch((err) => console.error('获取初始URL时出错:', err));\n    }, 1500);\n\n    Linking.addEventListener('url', (event) => {\n      // 此处 url 都是官网开头\n      AppLink.open(event.url, true);\n    });\n  },\n};\n"],"mappings":"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"}

package/lib/module/ConfigDataModel.js

@@ -14,7 +14,7 @@ let MyItems = {};
 let VersionInfo = {
   currentVersion: semverCoerce(getReadableVersion()).version,
   latestVersion: semverCoerce(getReadableVersion()).version,
-  isDanger: true,
+  isDanger: false,
   hasNewVersion: false
 };
 const AV = require('leancloud-storage');

package/lib/module/ConfigDataModel.js.map

@@ -1 +1 @@
-{"version":3,"names":["Platform","getReadableVersion","DevConfig","Notification","BuildInPrefs","VipAndroidManager","VipManager","EventEmitter","require","eventEmitter","semverGt","semverGte","semverCoerce","MyItems","VersionInfo","currentVersion","version","latestVersion","isDanger","hasNewVersion","AV","_filterByVersion","items","ret","curVer","item","_item$get","_item$get2","minVer","get","trim","maxVer","push","_filterByVip","isVip","isForeverVip","vipFilter","_updateKeyValues","value","handleVersionInfo","key","OS","configVersion","ConfigDataModel","onlineVersion","__DEV__","hasValue","DevDanger","getValue","isDataReady","isVipStateReady","OnlineItems","_handleResponse","length","console","log","setPackages","emitChange","init","defaultValues","addListenerOnce","fetch","query","Query","equalTo","find","then","catch","e","error","getVersionConfig","emit","callback","once"],"sources":["ConfigDataModel.ts"],"sourcesContent":["import { Object } from 'leancloud-storage';\nimport { Platform } from 'react-native';\nimport { getReadableVersion } from 'react-native-device-info';\nimport { DevConfig } from './DevConfig';\nimport { Notification } from './Notification';\nimport { BuildInPrefs } from './PrefData';\nimport { VipAndroidManager } from './VipAndroidManager';\nimport { VipManager } from './VipManager';\n\nconst EventEmitter = require('events').EventEmitter;\nconst eventEmitter = new EventEmitter();\nconst semverGt = require('semver/functions/gt');\nconst semverGte = require('semver/functions/gte');\nconst semverCoerce = require('semver/functions/coerce');\n\nexport interface ConfigsType {\n  [key: string]: any;\n}\nlet MyItems: ConfigsType = {};\nlet VersionInfo = {\n  currentVersion: semverCoerce(getReadableVersion()).version,\n  latestVersion: semverCoerce(getReadableVersion()).version,\n  isDanger: true,\n  hasNewVersion: false,\n};\n\nconst AV = require('leancloud-storage');\n\nconst _filterByVersion = (items: Object[]) => {\n  let ret = [];\n  const curVer = semverCoerce(getReadableVersion()).version;\n  for (const item of items) {\n    const minVer = item.get('minVer')?.trim();\n    const maxVer = item.get('maxVer')?.trim();\n    //  确保 cur 处于 [minVer, maxVer)\n    if (!!minVer && semverGt(semverCoerce(minVer).version, curVer)) {\n      continue;\n    }\n    if (!!maxVer && semverGte(curVer, semverCoerce(maxVer).version)) {\n      continue;\n    }\n\n    ret.push(item);\n  }\n  return ret;\n};\n\nconst _filterByVip = (items: Object[]) => {\n  let ret = [];\n  const isVip = VipManager.isVip();\n  const isForeverVip = VipManager.isForeverVip();\n  for (const item of items) {\n    const vipFilter = item.get('vipFilter');\n    if (\n      vipFilter === 0 ||\n      (vipFilter === 1 && !isVip) ||\n      (vipFilter === 2 && !isForeverVip)\n    ) {\n      ret.push(item);\n    }\n  }\n  return ret;\n};\n\nconst _updateKeyValues = (items: Object[]) => {\n  for (const item of items) {\n    let value = item.get('value');\n    if (typeof value === 'string') {\n      // 因为 leancloud 无法配置空白内容，所以 trim 下，这样就能以空格代替空白{\n      value = value.trim();\n    }\n    MyItems[item.get('key')] = value;\n  }\n};\n\nconst handleVersionInfo = () => {\n  // online > current，则更新 latestVersion\n  let key = 'ov';\n  if (Platform.OS === 'android') {\n    key = 'aov';\n  }\n  const configVersion = ConfigDataModel.get(key);\n  if (configVersion) {\n    const onlineVersion = semverCoerce(configVersion).version;\n    // current < online，才有新版本\n    if (semverGt(onlineVersion, VersionInfo.currentVersion)) {\n      VersionInfo.latestVersion = onlineVersion;\n      VersionInfo.hasNewVersion = true;\n    }\n    // current <= online，才安全 ，防止忘记修改 online\n    if (!semverGt(VersionInfo.currentVersion, onlineVersion)) {\n      VersionInfo.isDanger = false;\n    }\n  }\n\n  if (__DEV__) {\n    if (DevConfig.hasValue(BuildInPrefs.DevDanger)) {\n      VersionInfo.isDanger = DevConfig.getValue(BuildInPrefs.DevDanger);\n    }\n  }\n};\n\nlet isDataReady = false;\nlet isVipStateReady = false;\nlet OnlineItems: Object[] = [];\n\nconst _handleResponse = () => {\n  if (!isVipStateReady || !OnlineItems.length) {\n    return;\n  }\n\n  // 根据版本过滤\n  let items = _filterByVersion(OnlineItems);\n  // 根据 VIP 状态过滤\n  items = _filterByVip(items);\n  _updateKeyValues(items);\n  // 处理 Version 信息\n  handleVersionInfo();\n  console.log('Config 处理完毕');\n  isDataReady = true;\n  VipAndroidManager.setPackages(ConfigDataModel.get('vip_android_products'));\n  ConfigDataModel.emitChange();\n};\n\nconst ConfigDataModel = {\n  init: (defaultValues: ConfigsType) => {\n    MyItems = defaultValues;\n    // TODO 这里切换登录信息会复用\n    Notification.addListenerOnce('onVipRefresh', () => {\n      isVipStateReady = true;\n      _handleResponse();\n    });\n    ConfigDataModel.fetch();\n  },\n\n  fetch: () => {\n    const query = new AV.Query('Configs');\n    query.equalTo('valid', true).equalTo(Platform.OS, true);\n    query\n      .find()\n      .then((items: Object[]) => {\n        console.log('Config 抓取完毕');\n        OnlineItems = items;\n        _handleResponse();\n      })\n      .catch((e: any) => {\n        console.error(e);\n      });\n  },\n\n  getVersionConfig: () => {\n    return VersionInfo;\n  },\n\n  get: (key: string) => {\n    return MyItems[key];\n  },\n\n  emitChange: () => {\n    eventEmitter.emit('change');\n  },\n\n  addListenerOnce: (callback: Function) => {\n    if (isDataReady) {\n      callback && callback();\n      return;\n    }\n    eventEmitter.once('change', callback);\n  },\n};\n\nexport { ConfigDataModel };\n"],"mappings":"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"}
+{"version":3,"names":["Platform","getReadableVersion","DevConfig","Notification","BuildInPrefs","VipAndroidManager","VipManager","EventEmitter","require","eventEmitter","semverGt","semverGte","semverCoerce","MyItems","VersionInfo","currentVersion","version","latestVersion","isDanger","hasNewVersion","AV","_filterByVersion","items","ret","curVer","item","_item$get","_item$get2","minVer","get","trim","maxVer","push","_filterByVip","isVip","isForeverVip","vipFilter","_updateKeyValues","value","handleVersionInfo","key","OS","configVersion","ConfigDataModel","onlineVersion","__DEV__","hasValue","DevDanger","getValue","isDataReady","isVipStateReady","OnlineItems","_handleResponse","length","console","log","setPackages","emitChange","init","defaultValues","addListenerOnce","fetch","query","Query","equalTo","find","then","catch","e","error","getVersionConfig","emit","callback","once"],"sources":["ConfigDataModel.ts"],"sourcesContent":["import { Object } from 'leancloud-storage';\nimport { Platform } from 'react-native';\nimport { getReadableVersion } from 'react-native-device-info';\nimport { DevConfig } from './DevConfig';\nimport { Notification } from './Notification';\nimport { BuildInPrefs } from './PrefData';\nimport { VipAndroidManager } from './VipAndroidManager';\nimport { VipManager } from './VipManager';\n\nconst EventEmitter = require('events').EventEmitter;\nconst eventEmitter = new EventEmitter();\nconst semverGt = require('semver/functions/gt');\nconst semverGte = require('semver/functions/gte');\nconst semverCoerce = require('semver/functions/coerce');\n\nexport interface ConfigsType {\n  [key: string]: any;\n}\nlet MyItems: ConfigsType = {};\nlet VersionInfo = {\n  currentVersion: semverCoerce(getReadableVersion()).version,\n  latestVersion: semverCoerce(getReadableVersion()).version,\n  isDanger: false,\n  hasNewVersion: false,\n};\n\nconst AV = require('leancloud-storage');\n\nconst _filterByVersion = (items: Object[]) => {\n  let ret = [];\n  const curVer = semverCoerce(getReadableVersion()).version;\n  for (const item of items) {\n    const minVer = item.get('minVer')?.trim();\n    const maxVer = item.get('maxVer')?.trim();\n    //  确保 cur 处于 [minVer, maxVer)\n    if (!!minVer && semverGt(semverCoerce(minVer).version, curVer)) {\n      continue;\n    }\n    if (!!maxVer && semverGte(curVer, semverCoerce(maxVer).version)) {\n      continue;\n    }\n\n    ret.push(item);\n  }\n  return ret;\n};\n\nconst _filterByVip = (items: Object[]) => {\n  let ret = [];\n  const isVip = VipManager.isVip();\n  const isForeverVip = VipManager.isForeverVip();\n  for (const item of items) {\n    const vipFilter = item.get('vipFilter');\n    if (\n      vipFilter === 0 ||\n      (vipFilter === 1 && !isVip) ||\n      (vipFilter === 2 && !isForeverVip)\n    ) {\n      ret.push(item);\n    }\n  }\n  return ret;\n};\n\nconst _updateKeyValues = (items: Object[]) => {\n  for (const item of items) {\n    let value = item.get('value');\n    if (typeof value === 'string') {\n      // 因为 leancloud 无法配置空白内容，所以 trim 下，这样就能以空格代替空白{\n      value = value.trim();\n    }\n    MyItems[item.get('key')] = value;\n  }\n};\n\nconst handleVersionInfo = () => {\n  // online > current，则更新 latestVersion\n  let key = 'ov';\n  if (Platform.OS === 'android') {\n    key = 'aov';\n  }\n  const configVersion = ConfigDataModel.get(key);\n  if (configVersion) {\n    const onlineVersion = semverCoerce(configVersion).version;\n    // current < online，才有新版本\n    if (semverGt(onlineVersion, VersionInfo.currentVersion)) {\n      VersionInfo.latestVersion = onlineVersion;\n      VersionInfo.hasNewVersion = true;\n    }\n    // current <= online，才安全 ，防止忘记修改 online\n    if (!semverGt(VersionInfo.currentVersion, onlineVersion)) {\n      VersionInfo.isDanger = false;\n    }\n  }\n\n  if (__DEV__) {\n    if (DevConfig.hasValue(BuildInPrefs.DevDanger)) {\n      VersionInfo.isDanger = DevConfig.getValue(BuildInPrefs.DevDanger);\n    }\n  }\n};\n\nlet isDataReady = false;\nlet isVipStateReady = false;\nlet OnlineItems: Object[] = [];\n\nconst _handleResponse = () => {\n  if (!isVipStateReady || !OnlineItems.length) {\n    return;\n  }\n\n  // 根据版本过滤\n  let items = _filterByVersion(OnlineItems);\n  // 根据 VIP 状态过滤\n  items = _filterByVip(items);\n  _updateKeyValues(items);\n  // 处理 Version 信息\n  handleVersionInfo();\n  console.log('Config 处理完毕');\n  isDataReady = true;\n  VipAndroidManager.setPackages(ConfigDataModel.get('vip_android_products'));\n  ConfigDataModel.emitChange();\n};\n\nconst ConfigDataModel = {\n  init: (defaultValues: ConfigsType) => {\n    MyItems = defaultValues;\n    // TODO 这里切换登录信息会复用\n    Notification.addListenerOnce('onVipRefresh', () => {\n      isVipStateReady = true;\n      _handleResponse();\n    });\n    ConfigDataModel.fetch();\n  },\n\n  fetch: () => {\n    const query = new AV.Query('Configs');\n    query.equalTo('valid', true).equalTo(Platform.OS, true);\n    query\n      .find()\n      .then((items: Object[]) => {\n        console.log('Config 抓取完毕');\n        OnlineItems = items;\n        _handleResponse();\n      })\n      .catch((e: any) => {\n        console.error(e);\n      });\n  },\n\n  getVersionConfig: () => {\n    return VersionInfo;\n  },\n\n  get: (key: string) => {\n    return MyItems[key];\n  },\n\n  emitChange: () => {\n    eventEmitter.emit('change');\n  },\n\n  addListenerOnce: (callback: Function) => {\n    if (isDataReady) {\n      callback && callback();\n      return;\n    }\n    eventEmitter.once('change', callback);\n  },\n};\n\nexport { ConfigDataModel };\n"],"mappings":"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"}

package/lib/typescript/AppLink.d.ts

@@ -1,5 +1,6 @@
 import { NavigationProp, ParamListBase } from '@react-navigation/native';
 export declare const AppLink: {
-    open: (url?: string) => void;
+    open: (url?: string, ignoreSelf?: boolean) => void;
+    openPage: (page: string, params: object) => void;
     init: (navigation: NavigationProp<ParamListBase>) => void;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@norcy/react-native-toolkit",
-  "version": "0.1.73",
+  "version": "0.1.75",
   "description": "My Toolkit",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

package/src/AppLink.ts

@@ -40,16 +40,9 @@ let GlobalNavigation: NavigationProp<ParamListBase> | null = null;
 
 export const AppLink = {
   /* 测试用例：
-  1. https://norcy.xyz/iread 安卓打开浏览器官网
-  2. https://www.coolapk.com/apk/com.norcy.iread 安卓跳酷安
-  3. https://apps.apple.com/app/id1589203887 iOS 跳 AppStore
-  4. https://apps.apple.com/app/id1589203887?action=write-review iOS 跳评价
-  5. https://norcy.xyz/iread?page=WebPage&url=https%3A%2F%2Fqq.com App 内跳转
-  6. yiyue://WebPage?url=https%3A%2F%2Fqq.com App 内跳转
-  7. WebPage?url=https%3A%2F%2Fqq.com App 内跳转
-  9. https://qq.com 跳转浏览器
+  详见 https://docs.qq.com/sheet/DSHpXb29STWpYempK?tab=w20187
   */
-  open: (url?: string) => {
+  open: (url?: string, ignoreSelf?: boolean) => {
     if (!url) {
       return;
     }
@@ -70,6 +63,11 @@ export const AppLink = {
       return;
     }
 
+    // 如果是官网，则不再处理，因为 App 内跳转已经处理了
+    if (ignoreSelf && url.startsWith(ToolkitConfig.AppWebsite)) {
+      return;
+    }
+
     // 第三优先级：外部跳转 AppStore、H5 等
     Linking.canOpenURL(url)
       .then((supported) => {
@@ -80,23 +78,32 @@ export const AppLink = {
           console.error('无法跳转', url);
         }
       })
-      .catch(() => {
-        console.error('无法跳转', url);
+      .catch((e) => {
+        console.error('无法跳转', url, e);
       });
   },
 
+  openPage: (page: string, params: object) => {
+    if (!page) {
+      return;
+    }
+    GlobalNavigation?.navigate(page, params);
+  },
+
   init: (navigation: NavigationProp<ParamListBase>) => {
     GlobalNavigation = navigation;
-    Linking.getInitialURL()
-      .then((url) => {
-        // 此处 url 都是官网开头
-        AppLink.open(url ?? undefined);
-      })
-      .catch((err) => console.error('获取初始URL时出错:', err));
+    setTimeout(() => {
+      Linking.getInitialURL()
+        .then((url) => {
+          // 此处 url 都是官网开头
+          AppLink.open(url ?? undefined, true);
+        })
+        .catch((err) => console.error('获取初始URL时出错:', err));
+    }, 1500);
 
     Linking.addEventListener('url', (event) => {
       // 此处 url 都是官网开头
-      AppLink.open(event.url);
+      AppLink.open(event.url, true);
     });
   },
 };

package/src/ConfigDataModel.ts

@@ -20,7 +20,7 @@ let MyItems: ConfigsType = {};
 let VersionInfo = {
   currentVersion: semverCoerce(getReadableVersion()).version,
   latestVersion: semverCoerce(getReadableVersion()).version,
-  isDanger: true,
+  isDanger: false,
   hasNewVersion: false,
 };
 

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>