esoftplay 0.0.131-u → 0.0.131-w

package/bin/build.js

@@ -297,6 +297,7 @@ export default UserIndex`;
 			'react-native-gesture-handler',
 			'react-native-awesome-gallery',
 			'react-native-fast-image',
+			'react-native-mmkv',
 			'react-native-pan-pinch-view',
 			'react-native-reanimated',
 			'react-native-safe-area-context',

package/modules/user/index.tsx

@@ -18,7 +18,7 @@ import { UserHook } from 'esoftplay/cache/user/hook/import';
 import { UserLoading } from 'esoftplay/cache/user/loading/import';
 import * as ErrorReport from 'esoftplay/error';
 import moment from 'esoftplay/moment';
-import * as Font from "expo-font";
+import { useFonts } from 'expo-font';
 import React, { useLayoutEffect } from 'react';
 import { View } from 'react-native';
 import { GestureHandlerRootView } from 'react-native-gesture-handler';
@@ -30,8 +30,7 @@ export interface UserIndexProps {
 export interface UserIndexState {
   loading: boolean
 }
-
-function setFonts(): Promise<void> {
+function getFontConfig() {
   let fonts: any = {}
   let fontsConfig = esp.config("fonts")
   if (fontsConfig) {
@@ -39,29 +38,31 @@ function setFonts(): Promise<void> {
       fonts[key] = esp.assets('fonts/' + fontsConfig[key])
     })
   }
-  return new Promise((r, j) => {
-    Font.loadAsync(fonts).then(() => r())
-  })
+  return fonts
 }
 
 
 export default function m(props: UserIndexProps): any {
   moment().locale(LibLocale.state().get())
   const [loading, setLoading] = useSafeState(true)
+  const [fontLoaded] = useFonts(getFontConfig())
   //esoftplay-user-class-hook
   UseDeeplink()
 
   useLayoutEffect(() => {
-    (async () => {
-      await setFonts()
-      UserClass.isLogin(() => {
-        setLoading(false)
-      })
-    })()
     ErrorReport.getError()
     LibUpdaterProperty.check()
     LibVersion.check()
   }, [])
+
+  useLayoutEffect(() => {
+    if (fontLoaded) {
+      UserClass.isLogin(() => {
+        setLoading(false)
+      })
+    }
+  }, [fontLoaded])
+
   
   //esoftplay-chatting
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "esoftplay",
-  "version": "0.0.131-u",
+  "version": "0.0.131-w",
   "description": "embedding data from esoftplay framework (web based) into mobile app",
   "main": "cache/index.js",
   "types": "../../index.d.ts",