esoftplay 0.0.115 → 0.0.116

package/bin/build.js

@@ -146,6 +146,12 @@ if (fs.existsSync(packjson)) {
 			"simulator": true
 		}
 	},
+	"preview_build": {
+		"distribution": "internal",
+		"android": {
+			"buildType": "apk"
+		}
+	},
 	"production": {}
 },
 "submit": {

package/bin/cli.js

@@ -92,9 +92,9 @@ switch (args[0]) {
 		createMaster(args[1])
 		break;
 	case "start":
-		jsEng(appjson, false)
-		jsEng(appdebug, false)
-		jsEng(applive, false)
+		jsEng(appjson, true)
+		jsEng(appdebug, true)
+		jsEng(applive, true)
 		excludeModules()
 		execution();
 		break;
@@ -665,7 +665,19 @@ function build() {
 			}
 		},
 		{
-			name: "3. IOS (Production) - ipa",
+			name: "3. IOS (Preview) - Non Simulator",
+			cmd: "eas build --platform ios --profile preview_build",
+			pre: () => {
+				configAvailable(true)
+				devClientPos(appjson)
+				jsEng(appjson, true)
+				jsEng(appdebug, true)
+				jsEng(applive, true)
+				consoleSucces("Hermes diaktifkan")
+			}
+		},
+		{
+			name: "4. IOS (Production) - ipa",
 			cmd: "eas build --platform ios --profile production",
 			pre: () => {
 				configAvailable(true)
@@ -677,7 +689,7 @@ function build() {
 			}
 		},
 		{
-			name: "4. Android (Development) - apk",
+			name: "5. Android (Development) - apk",
 			cmd: "eas build --platform android --profile development",
 			pre: () => {
 				configAvailable(true)
@@ -689,7 +701,7 @@ function build() {
 			}
 		},
 		{
-			name: "5. Android (Preview) - apk",
+			name: "6. Android (Preview) - apk",
 			cmd: "eas build --platform android --profile preview",
 			pre: () => {
 				configAvailable(true)
@@ -701,7 +713,7 @@ function build() {
 			}
 		},
 		{
-			name: "6. Android (Production) - aab",
+			name: "7. Android (Production) - aab",
 			cmd: "eas build --platform android --profile production",
 			pre: () => {
 				configAvailable(true)

package/bin/router.js

@@ -570,7 +570,7 @@ function createRouter() {
   var nav = "";
   var staticImport = []
 
-  staticImport.push("const isEqual = require('react-fast-compare');\n")
+  staticImport.push("var isEqual = require('react-fast-compare');\n")
   staticImport.push("export function applyStyle(style){ return style };\n")
   staticImport.push("export { default as useGlobalState } from '../../../node_modules/esoftplay/global';\n")
   staticImport.push("export { default as usePersistState } from '../../../node_modules/esoftplay/persist';\n")
@@ -599,13 +599,13 @@ function createRouter() {
         item += "export { _" + ucword(module) + ucword(task) + " as " + ucword(module) + ucword(task) + " };\n"
       }
       if (module == 'lib' && task == 'component') {
-        staticImport.splice(0, 0, item)
+        staticImport.splice(2, 0, item)
       } else if (module == 'lib' && task == 'style') {
-        staticImport.splice(0, 0, item)
+        staticImport.splice(4, 0, item)
       } else if (module == 'lib' && task == 'worker') {
-        staticImport.splice(2, 0, item)
+        staticImport.splice(4, 0, item)
       } else if (module == 'lib' && task == 'navigation') {
-        staticImport.splice(2, 0, item)
+        staticImport.splice(4, 0, item)
       } else if (task == 'style') {
         staticImport.splice(9, 0, item)
       } else if (task == 'scrollpicker') {
@@ -615,9 +615,9 @@ function createRouter() {
       }
     }
   }
-  staticImport.splice(0, 0, "export { default as createCache } from '../../../node_modules/esoftplay/_cache';\n")
-  staticImport.splice(0, 0, "export { default as _global } from '../../../node_modules/esoftplay/_global';\n")
-  staticImport.splice(0, 0, "import React from 'react';\n")
+  staticImport.splice(2, 0, "export { default as createCache } from '../../../node_modules/esoftplay/_cache';\n")
+  staticImport.splice(2, 0, "export { default as _global } from '../../../node_modules/esoftplay/_global';\n")
+  staticImport.splice(2, 0, "import React from 'react';\n")
   const x = staticImport.join('')
   if (isChange(tmpDir + 'index.js', x))
     fs.writeFile(tmpDir + 'index.js', x, { flag: 'w' }, function (err) {

package/global.ts

@@ -35,134 +35,130 @@ class Context {
 
 export const globalIdx = new Context()
 
-const n = () => {
-  let subscriber = {}
-  let debouceTime
-  let persistKeys: any = {}
-
-  function m<T>(initValue: T, o?: useGlobalOption): useGlobalReturn<T> {
-    const _idx = globalIdx.idx
-    if (!subscriber[_idx])
-      subscriber[_idx] = [];
-    let value: T = initValue;
-
-    // rehidryte instant
-    if (o?.persistKey) {
-      rehidryte(o.persistKey, (p) => {
-        if (typeof p == 'string') set(JSON.parse(p))
 
-      })
+let subscriber = {}
+let debouceTime
+let persistKeys: any = {}
+
+export default function useGlobalState<T>(initValue: T, o?: useGlobalOption): useGlobalReturn<T> {
+  const _idx = globalIdx.idx
+  if (!subscriber[_idx])
+    subscriber[_idx] = [];
+  let value: T = initValue;
+
+  // rehidryte instant
+  if (o?.persistKey) {
+    rehidryte(o.persistKey, (p) => {
+      if (typeof p == 'string') set(JSON.parse(p))
+
+    })
+  }
+
+  /* register to userData to automatically reset state and persist */
+  if (o?.isUserData) {
+    function resetFunction() {
+      set(initValue)
+    }
+    if (o?.persistKey) {
+      const UserData = require('./modules/user/data').default
+      UserData.register(o?.persistKey)
     }
+    _global.useGlobalUserDelete[_idx] = resetFunction
+  }
 
-    /* register to userData to automatically reset state and persist */
-    if (o?.isUserData) {
-      function resetFunction() {
-        set(initValue)
-      }
+  function set(ns: T) {
+    const isChange = !isEqual(value, ns)
+    if (isChange) {
+      value = ns
+      fastLoop(subscriber?.[_idx], (c) => { c?.(ns) })
       if (o?.persistKey) {
-        const UserData = require('./modules/user/data').default
-        UserData.register(o?.persistKey)
+        AsyncStorage.setItem(o.persistKey, JSON.stringify(ns))
       }
-      _global.useGlobalUserDelete[_idx] = resetFunction
+      if (o?.listener)
+        o.listener(ns)
     }
+  };
 
-    function set(ns: T) {
-      const isChange = !isEqual(value, ns)
-      if (isChange) {
-        value = ns
-        fastLoop(subscriber?.[_idx], (c) => { c?.(ns) })
-        if (o?.persistKey) {
-          AsyncStorage.setItem(o.persistKey, JSON.stringify(ns))
-        }
-        if (o?.listener)
-          o.listener(ns)
-      }
-    };
-
-    function del() {
-      if (o?.persistKey) {
-        AsyncStorage.removeItem(o.persistKey)
-      }
-      set(initValue)
+  function del() {
+    if (o?.persistKey) {
+      AsyncStorage.removeItem(o.persistKey)
     }
+    set(initValue)
+  }
 
-    function useSelector(se: (state: T) => any): void {
-      let [l, s] = R.useState<any>(se(value));
+  function useSelector(se: (state: T) => any): void {
+    let [l, s] = R.useState<any>(se(value));
 
-      let sl = R.useCallback(
-        (ns: T) => {
-          let n = se(ns);
-          !isEqual(l, n) && s(n);
-        },
-        [l]
-      );
+    let sl = R.useCallback(
+      (ns: T) => {
+        let n = se(ns);
+        !isEqual(l, n) && s(n);
+      },
+      [l]
+    );
 
-      subscribe(sl)
+    subscribe(sl)
 
-      return l;
-    }
+    return l;
+  }
 
-    function subscribe(func: any) {
-      R.useLayoutEffect(() => {
-        subscriber[_idx].push(func);
-        return () => {
-          subscriber[_idx] = fastFilter(subscriber?.[_idx], (f) => f !== func)
-        };
-      }, [func]);
-    }
+  function subscribe(func: any) {
+    R.useLayoutEffect(() => {
+      subscriber[_idx].push(func);
+      return () => {
+        subscriber[_idx] = fastFilter(subscriber?.[_idx], (f) => f !== func)
+      };
+    }, [func]);
+  }
 
-    function get(param?: string, ...params: string[]): any {
-      let out: any = value;
-      if (param) {
-        const _params = [param, ...params]
-        if (_params.length > 0)
-          for (let i = 0; i < _params.length; i++) {
-            if (out && _params[i] != undefined)
-              out = out?.[_params[i]];
-          }
-      }
-      return out;
+  function get(param?: string, ...params: string[]): any {
+    let out: any = value;
+    if (param) {
+      const _params = [param, ...params]
+      if (_params.length > 0)
+        for (let i = 0; i < _params.length; i++) {
+          if (out && _params[i] != undefined)
+            out = out?.[_params[i]];
+        }
     }
+    return out;
+  }
 
 
-    function useState(): [T, (newState: T) => void, () => void] {
-      let [l, sl] = R.useState<T>(value);
+  function useState(): [T, (newState: T) => void, () => void] {
+    let [l, sl] = R.useState<T>(value);
 
-      subscribe(sl)
+    subscribe(sl)
 
-      return [l, set, del];
-    };
+    return [l, set, del];
+  };
 
-    function _connect(props: useGlobalConnect<T>): any {
-      const [state] = useState()
-      const children = props.render(state)
-      return children ? R.cloneElement(children) : null
-    }
-
-    globalIdx.increment()
-    return { useState, get, set, useSelector, reset: del, connect: _connect };
+  function _connect(props: useGlobalConnect<T>): any {
+    const [state] = useState()
+    const children = props.render(state)
+    return children ? R.cloneElement(children) : null
   }
 
-  function debounce(func: () => any, delay: number): void {
-    clearTimeout(debouceTime)
-    debouceTime = setTimeout(() => func(), delay)
-  }
+  globalIdx.increment()
+  return { useState, get, set, useSelector, reset: del, connect: _connect };
+}
 
-  function rehidryte(key: string, func: (e: string) => void) {
-    persistKeys[key] = func
-    debounce(() => {
-      AsyncStorage.multiGet(Object.keys(persistKeys), (e, v) => {
-        if (v && !e) {
-          v.forEach((iv, i) => {
-            persistKeys[iv[0]]?.(iv[1])
-          })
-        } else {
-          
-        }
-      })
-    }, 100)
-  }
-  return m
+function debounce(func: () => any, delay: number): void {
+  clearTimeout(debouceTime)
+  debouceTime = setTimeout(() => func(), delay)
 }
 
-export default n()
+function rehidryte(key: string, func: (e: string) => void) {
+  persistKeys[key] = func
+  debounce(() => {
+    AsyncStorage.multiGet(Object.keys(persistKeys), (e, v) => {
+      if (v && !e) {
+        v.forEach((iv, i) => {
+          persistKeys[iv[0]]?.(iv[1])
+        })
+      } else {
+
+      }
+    })
+  }, 100)
+}

package/modules/lib/curl.ts

@@ -9,6 +9,7 @@ export default class ecurl {
   signal = this.controller.signal
   timeout = 30000;
   maxRetry = 3;
+  resStatus?: number = undefined
   timeoutContext: any = null;
   isDebug = esp.config("isDebug");
   post: any;
@@ -267,7 +268,6 @@ export default class ecurl {
         Pragma: "no-cache",
         ['Cache-Control']: "no-store",
         mode: "cors",
-        _post: post
       }
       if (debug == 1)
         esp.log(this.url + this.uri, options)
@@ -276,6 +276,7 @@ export default class ecurl {
       fetch(this.url + this.uri, options).then(async (res) => {
         this.cancelTimeout()
         var resText = await res.text()
+        this.resStatus = res.status
         var resJson = (resText.startsWith("{") || resText.startsWith("[")) ? JSON.parse(resText) : null
         if (resJson) {
           if (onDone) onDone(resJson, false)
@@ -333,7 +334,6 @@ export default class ecurl {
       ["Cache-Control"]: 'no-cache, no-store, must-revalidate',
       ["Expires"]: 0,
       mode: "cors",
-      _post: post
     }
 
     //api_logger
@@ -347,6 +347,7 @@ export default class ecurl {
 
     fetch(this.url + this.uri, options).then(async (res) => {
       this.cancelTimeout()
+      this.resStatus = res.status
       let resText = await res.text()
       this.onFetched(resText, onDone, onFailed, debug)
     }).catch((r) => {
@@ -407,7 +408,16 @@ export default class ecurl {
   private onError(msg: string): void {
     esp.log("\x1b[31m", msg)
     esp.log("\x1b[0m")
+    this.fetchConf.options["status_code"] = this.resStatus
     delete this.fetchConf.options.cancelToken
+    delete this.fetchConf.options.signal
+    delete this.fetchConf.options.cache
+    delete this.fetchConf.options.Pragma
+    delete this.fetchConf.options.Expires
+    delete this.fetchConf.options.mode
+    delete this.fetchConf.options["Cache-Control"]
+    delete this.fetchConf.options["Content-Type"]
+    delete this.fetchConf.options.token
     reportApiError(this.fetchConf, msg)
     LibProgress.hide()
   }

package/modules/lib/image_multi.tsx

@@ -1,5 +1,6 @@
 // withHooks
 
+// import { FlashList } from "@shopify/flash-list";
 import { LibIcon, LibLoading, LibNavigation, LibObject, LibStyle, LibTextstyle, useSafeState } from 'esoftplay';
 import * as MediaLibrary from 'expo-media-library';
 import React, { useEffect } from 'react';
@@ -70,6 +71,8 @@ export default function m(props: LibImage_multiProps): any {
           setPhotos(LibObject.set(photos, item.selected == 1 ? 0 : 1)(index, "selected"))
     }} />
   )
+  // const AutoLayoutViewNativeComponent = require("@shopify/flash-list/src/native/auto-layout/AutoLayoutViewNativeComponent")
+  const List = /* !!AutoLayoutViewNativeComponent ? FlashList : */ FlatList
 
   return (
     <View style={{ flex: 1, backgroundColor: "white" }} >
@@ -87,7 +90,7 @@ export default function m(props: LibImage_multiProps): any {
         </TouchableOpacity>
       </View>
       <View style={{ flex: 1 }} >
-        <FlatList
+        <List
           data={photos}
           keyExtractor={(_: any, i) => _.uri}
           getItemLayout={getItemLayout}

package/modules/lib/infinite.tsx

@@ -1,11 +1,11 @@
 // noPage
 
+// import { FlashList } from "@shopify/flash-list";
 import { esp, LibComponent, LibCurl, LibListItemLayout, LibLoading, LibStyle, LibTextstyle } from 'esoftplay';
 import React from 'react';
 import isEqual from 'react-fast-compare';
 import { FlatList, View } from 'react-native';
 
-
 export interface LibInfiniteProps {
   url: string,
   post?: any,
@@ -172,13 +172,15 @@ export default class m extends LibComponent<LibInfiniteProps, LibInfiniteState>{
   render(): any {
     const { data, error } = this.state
     const { errorView, refreshEnabled } = this.props
+    // const AutoLayoutViewNativeComponent = require("@shopify/flash-list/src/native/auto-layout/AutoLayoutViewNativeComponent")
+    const List = /* !!AutoLayoutViewNativeComponent ? FlashList : */ FlatList
     return (
       <View style={{ flex: 1 }} >
         {
           (!data || data.length) == 0 && !this.isStop ?
             this.props.LoadingView || <LibLoading />
             :
-            <FlatList
+            <List
               ref={this.flatlist}
               data={data || []}
               onRefresh={((refreshEnabled == undefined) || refreshEnabled) && (() => this.loadData())}

package/modules/lib/list.tsx

@@ -1,6 +1,7 @@
 // noPage
 
 
+// import { FlashList } from "@shopify/flash-list";
 import { LibComponent } from "esoftplay";
 import React from "react";
 import { FlatList, View } from 'react-native';
@@ -75,9 +76,11 @@ export default class EList extends LibComponent<LibListProps, LibListState> {
       if (this.props.staticHeight)
         return ({ getItemLayout: (data, index) => this.props.staticHeight ? ({ length: this.props.staticHeight, offset: this.props.staticHeight, index: index }) : undefined })
     }
+    // const AutoLayoutViewNativeComponent = require("@shopify/flash-list/src/native/auto-layout/AutoLayoutViewNativeComponent")
+    const List = /* !!AutoLayoutViewNativeComponent ? FlashList : */ FlatList
     return (
       <View ref={(e) => this.view = e} style={[{ flex: 1 }]} >
-        <FlatList
+        <List
           ref={this.flatlist}
           data={this.props.data}
           keyExtractor={this.keyExtractor}

package/modules/lib/version.tsx

@@ -1,10 +1,8 @@
 
-// noPage
-
-import { esp, LibComponent, LibCurl, LibDialog, LibIcon, LibNavigation, LibStyle, LibTextstyle, LibUtils } from 'esoftplay';
+import { esp, LibComponent, LibCurl, LibDialog, LibIcon, LibNavigation, LibStyle, LibTextstyle } from 'esoftplay';
 import Constants from 'expo-constants';
 import React from 'react';
-import { BackHandler, Linking, Platform, TouchableOpacity, View } from 'react-native';
+import { BackHandler, ImageBackground, Linking, Platform, TouchableOpacity } from 'react-native';
 export interface LibVersionProps {
 
 }
@@ -42,7 +40,6 @@ export default class m extends LibComponent<LibVersionProps, LibVersionState> {
 
   static onDone(res: any, msg: string): void {
     const { title, version, android, ios } = res
-
     function isAvailableNewVersion(newVersion: string): boolean {
       let oldVersion = m.appVersion()
       return newVersion > oldVersion
@@ -62,16 +59,16 @@ export default class m extends LibComponent<LibVersionProps, LibVersionState> {
     const { res: { title, version, android, ios }, msg } = LibNavigation.getArgsAll(this.props)
     const link = Platform.OS == 'ios' ? ios : android
     return (
-      <View style={{ flex: 1, justifyContent: 'center', alignItems: 'center', borderStartColor: 'white', paddingHorizontal: 17 }} >
+      <ImageBackground source={esp.assets("splash.png")} blurRadius={100} style={{ flex: 1, justifyContent: 'center', alignItems: 'center', borderStartColor: 'white', paddingHorizontal: 17 }} >
         <LibIcon.SimpleLineIcons name="info" size={60} />
         <LibTextstyle textStyle="headline" text={title || 'A new version is available'} style={{ textAlign: 'center', marginTop: 10 }} />
-        <LibTextstyle textStyle="callout" text={LibUtils.ucwords(msg)} style={{ textAlign: 'center', marginTop: 10, color: '#888' }} />
+        <LibTextstyle textStyle="callout" text={msg} style={{ textAlign: 'center', marginTop: 10, color: '#333' }} />
         <TouchableOpacity
           onPress={() => { Linking.canOpenURL(link) && Linking.openURL(link) }}
           style={{ marginTop: 20, borderRadius: 10, paddingHorizontal: 17, paddingVertical: 10, backgroundColor: LibStyle.colorPrimary }} >
           <LibTextstyle textStyle="body" text="Update Sekarang" />
         </TouchableOpacity>
-      </View>
+      </ImageBackground>
     )
   }
 }

package/modules/lib/worker.tsx

@@ -1,8 +1,10 @@
 // noPage
 
-import { _global } from 'esoftplay';
+import { useGlobalReturn, _global } from 'esoftplay';
 import React, { Component } from "react";
 import { Platform } from 'react-native';
+import useGlobalState from '../../global';
+
 
 export interface LibWorkerInit {
   task: string,
@@ -16,17 +18,21 @@ export interface LibWorkerProps {
 export interface LibWorkerState {
 
 }
-
 _global.LibWorkerBase = React.createRef()
 _global.LibWorkerTasks = new Map()
 _global.injectedJavaScripts = []
 _global.LibWorkerReady = 0
 _global.LibWorkerCount = 0
+const state = useGlobalState?.(null)
 export default class m extends Component<LibWorkerProps, LibWorkerState> {
   constructor(props: LibWorkerProps) {
     super(props)
   }
-
+  
+  static workerState(): useGlobalReturn<any> {
+    return state
+  }
+  
   static delete(taskId: string): void {
     _global.LibWorkerTasks.delete(taskId)
   }
@@ -152,6 +158,7 @@ export default class m extends Component<LibWorkerProps, LibWorkerState> {
     return (e: any) => {
       if (e.nativeEvent.data == withRefName) {
         _global.LibWorkerReady += 1
+        m.workerState().set(1)
         return
       }
       const dt = e.nativeEvent.data

package/modules/user/class.ts

@@ -1,14 +1,14 @@
 // noPage
 
 import AsyncStorage from '@react-native-async-storage/async-storage';
-import { esp, LibCrypt, LibCurl, LibNotification, useGlobalReturn, useGlobalState, UserClass, UserData } from 'esoftplay';
+import { esp, LibCrypt, LibCurl, LibNotification, useGlobalReturn, UserClass, UserData } from 'esoftplay';
 import Constants from 'expo-constants';
 import * as Notifications from 'expo-notifications';
 import { Platform } from 'react-native';
+import useGlobalState from '../../global';
 import moment from "../../moment";
 
-
-const state = useGlobalState(undefined)
+const state = useGlobalState?.(null, { persistKey: "user" })
 
 export default class eclass {
   static state(): useGlobalReturn<any> {
@@ -16,33 +16,15 @@ export default class eclass {
   }
   static create(user: any): Promise<void> {
     return new Promise((r, j) => {
-      state.set(user)
-      AsyncStorage.setItem("user", new LibCrypt().encode(JSON.stringify(user)))
-      if (esp.config('notification') == 1) {
-        UserClass.pushToken()
-      }
-      r();
+      state?.set?.(user)
+      r(user)
     })
   }
 
   static load(callback?: (user?: any | null) => void): Promise<any> {
     return new Promise((r, j) => {
-      AsyncStorage.getItem("user").then((user: string) => {
-        if (user) {
-          const usr = (user[0] == '{' && user[user.length - 1] == '}') ? JSON.parse(user) : JSON.parse(new LibCrypt().decode(user))
-          if (usr) {
-            r(usr);
-            state.set(usr)
-            if (callback) callback(usr)
-          } else {
-            j()
-            if (callback) callback(null)
-          }
-        } else {
-          j()
-          if (callback) callback(null)
-        }
-      })
+      if (callback) callback(state?.get?.())
+      r((state?.get?.()))
     })
   }
 
@@ -59,11 +41,10 @@ export default class eclass {
   }
 
   static delete(): Promise<void> {
-    return new Promise((r) => {
+    return new Promise(async (r) => {
       Notifications.setBadgeCountAsync(0)
-      state.set(undefined)
-      AsyncStorage.removeItem("user_notification");
-      AsyncStorage.removeItem("user");
+      state.reset()
+      await AsyncStorage.removeItem("user_notification");
       new UserData().deleteAll()
       if (esp.config('notification') == 1) {
         UserClass.pushToken()
@@ -74,7 +55,7 @@ export default class eclass {
 
   static pushToken(): Promise<any> {
     return new Promise((resolve, reject) => {
-      if (Constants.appOwnership == 'expo' && !esp.isDebug()) {
+      if (Constants.appOwnership == 'expo' && !esp.isDebug('')) {
         resolve(undefined)
         return
       }

package/modules/user/index.tsx

@@ -1,12 +1,11 @@
 // withHooks
 // noPage
 
-import { ChattingFirebase, esp, LibDialog, LibImage, LibNet_status, LibProgress, LibStyle, LibToast, LibUpdaterProperty, LibVersion, LibWorker, LibWorkloop, LibWorkview, UseDeeplink, UserClass, UserLoading, UserMain, UserRoutes, useSafeState, _global } from 'esoftplay';
+import { ChattingFirebase, esp, LibDialog, LibImage, LibNet_status, LibProgress, LibStyle, LibToast, LibUpdaterProperty, LibVersion, LibWorker, LibWorkloop, LibWorkview, UseDeeplink, UserClass, UserHook, UserLoading, UserRoutes, useSafeState, _global } from 'esoftplay';
 import * as Font from "expo-font";
-import React, { useEffect, useLayoutEffect } from "react";
-import { View } from "react-native";
+import React, { useEffect } from "react";
+import { Platform, View } from "react-native";
 import { GestureHandlerRootView } from 'react-native-gesture-handler';
-import Navs from "../../cache/navs";
 
 export interface UserIndexProps {
 
@@ -31,8 +30,9 @@ function setFonts(): Promise<void> {
 
 
 
-export default function m(props: UserIndexProps): any {
+export default function UserIndex(props: UserIndexProps): any {
   const [loading, setLoading] = useSafeState(true)
+  const [worker] = LibWorker.workerState().useState()
   const user = UserClass.state().useSelector(s => s)
   const ready = React.useRef(0)
   UseDeeplink()
@@ -47,21 +47,33 @@ export default function m(props: UserIndexProps): any {
     UserRoutes.set(currentState)
   }
 
-  useLayoutEffect(() => {
+  useEffect(() => {
     // const timeout = setTimeout(() => {
     //   setLoading(false)
     // }, 15 * 1000);
+    let limitReady = 3
+    if (Platform.OS == 'android')
+      if (Platform.Version <= 22) {
+        limitReady = 2
+      }
+
+    if (worker == 1) {
+      ready.current += 1
+      if (ready.current >= limitReady) {
+        setLoading(false)
+      }
+    }
     (async () => {
       await setFonts()
       ready.current += 1
-      if (ready.current >= 2) {
+      if (ready.current >= limitReady) {
         setLoading(false)
       }
     })()
 
     UserClass.isLogin(async () => {
       ready.current += 1
-      if (ready.current >= 2) {
+      if (ready.current >= limitReady) {
         setLoading(false)
       }
     })
@@ -74,7 +86,7 @@ export default function m(props: UserIndexProps): any {
       }
     }
     LibUpdaterProperty.check((isNew) => { })
-  }, [])
+  }, [worker])
 
   useEffect(() => {
     if (!loading) {
@@ -84,19 +96,24 @@ export default function m(props: UserIndexProps): any {
     }
   }, [loading])
 
-  if (loading) return <UserLoading />
   return (
     <GestureHandlerRootView style={{ flex: 1 }}>
       <View style={{ flex: 1 }}>
         <LibWorker />
         <LibWorkview />
         <LibWorkloop />
-        <Navs user={user} initialState={initialState} handler={handler} />
+        {
+          loading ?
+            <UserLoading />
+            :
+            <View style={{ backgroundColor: 'red', flex: 1 }} />
+          // <Navs user={user} initialState={initialState} handler={handler} />
+        }
         <LibNet_status />
         <LibDialog style={'default'} />
         <LibImage />
         <LibProgress />
-        <UserMain />
+        <UserHook />
         <LibToast />
       </View>
       <View style={{ backgroundColor: LibStyle.colorNavigationBar || 'white', height: LibStyle.isIphoneX ? 35 : 0 }} />

package/package.json

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