From 6c08d96ac4ffaf4fa1bf102d6327146b151b6ba2 Mon Sep 17 00:00:00 2001
From: innocces <18435105624@163.com>
Date: Thu, 19 Aug 2021 22:55:57 +0800
Subject: [PATCH] improvement(update async): update useSystemInfo and
 useLaunchOptions

---
 .../useSelectorQuery/getFields/index.tsx      |  4 ++--
 packages/hooks/src/useLaunchOptions/index.ts  | 15 +++++++++++++--
 packages/hooks/src/useSystemInfo/index.ts     | 19 +++++++++++++++----
 3 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/packages/app/src/pages/useSelectorQuery/getFields/index.tsx b/packages/app/src/pages/useSelectorQuery/getFields/index.tsx
index 56c0b440d..ca3b0ded3 100644
--- a/packages/app/src/pages/useSelectorQuery/getFields/index.tsx
+++ b/packages/app/src/pages/useSelectorQuery/getFields/index.tsx
@@ -1,7 +1,7 @@
 import React, { useEffect, useState } from 'react';
 import { AtDivider, AtList, AtListItem } from 'taro-ui';
 import DocPage from '@components/DocPage';
-import { Video } from '@tarojs/components';
+import { View } from '@tarojs/components';
 
 import { useSelectorQuery, useEnv } from 'taro-hooks';
 import { useReady, ENV_TYPE, General } from '@tarojs/taro';
@@ -36,7 +36,7 @@ const Query = () => {
   return (
     <>
       <DocPage title="useSelectorQuery fields">
-        <Video src="" className="demo" />
+        <View src="" className="demo" />
         <AtDivider content="属性" />
         <AtList>
           {rect &&
diff --git a/packages/hooks/src/useLaunchOptions/index.ts b/packages/hooks/src/useLaunchOptions/index.ts
index 70d949394..6971ad54c 100644
--- a/packages/hooks/src/useLaunchOptions/index.ts
+++ b/packages/hooks/src/useLaunchOptions/index.ts
@@ -1,9 +1,20 @@
+import { useEffect, useState } from 'react';
 import { ENV_TYPE, getLaunchOptionsSync, General } from '@tarojs/taro';
 import useEnv from '../useEnv';
 
-function useLaunchOptions(): General.LaunchOptionsApp | {} {
+export type Result = General.LaunchOptionsApp | {};
+
+function useLaunchOptions(): Result {
   const env = useEnv();
-  return env === ENV_TYPE.WEAPP ? getLaunchOptionsSync() : {};
+  const [launchOptions, setLaunchOptions] = useState<Result>({});
+
+  useEffect(() => {
+    if (env && env === ENV_TYPE.WEAPP) {
+      setLaunchOptions(getLaunchOptionsSync());
+    }
+  }, [env]);
+
+  return launchOptions;
 }
 
 export default useLaunchOptions;
diff --git a/packages/hooks/src/useSystemInfo/index.ts b/packages/hooks/src/useSystemInfo/index.ts
index e81516d0a..35359b699 100644
--- a/packages/hooks/src/useSystemInfo/index.ts
+++ b/packages/hooks/src/useSystemInfo/index.ts
@@ -1,13 +1,24 @@
-import { getSystemInfoSync } from '@tarojs/taro';
-import { useEffect, useState } from 'react';
+import { getSystemInfo } from '@tarojs/taro';
+import { useCallback, useEffect, useState } from 'react';
 
-export type Result = getSystemInfoSync.Result | {};
+export type Result = getSystemInfo.Result | {};
 
 function useSystemInfo(): Result {
   const [systemInfo, setSystemInfo] = useState<Result>({});
 
   useEffect(() => {
-    setSystemInfo(getSystemInfoSync());
+    getSystemInfoSync();
+  }, []);
+
+  const getSystemInfoSync = useCallback(() => {
+    try {
+      getSystemInfo({
+        success: setSystemInfo,
+        fail: () => setSystemInfo({}),
+      });
+    } catch (e) {
+      setSystemInfo({});
+    }
   }, []);
 
   return systemInfo;