esoftplay 0.0.115-k → 0.0.115-n

package/modules/lib/worker.tsx

@@ -1,6 +1,6 @@
 // noPage
 
-import { UserIndexProperty, _global } from 'esoftplay';
+import { useGlobalReturn, useGlobalState } from 'esoftplay';
 import React, { Component } from "react";
 import { Platform } from 'react-native';
 
@@ -16,17 +16,22 @@ export interface LibWorkerProps {
 export interface LibWorkerState {
 
 }
-
+const _global = require('../../_global')
 _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,7 +157,7 @@ export default class m extends Component<LibWorkerProps, LibWorkerState> {
     return (e: any) => {
       if (e.nativeEvent.data == withRefName) {
         _global.LibWorkerReady += 1
-        UserIndexProperty.workerState().set(1)
+        m.workerState().set(1)
         return
       }
       const dt = e.nativeEvent.data

package/modules/lib/workview.tsx

@@ -1,10 +1,11 @@
 // withHooks
 // noPage
 
-import { esp, LibWorker, _global } from 'esoftplay';
+import { esp, LibWorker } from 'esoftplay';
 import React from 'react';
 import { Platform, View } from 'react-native';
 import WebView from 'react-native-webview';
+const _global = require('../../_global')
 
 export interface LibWorkviewArgs {
 

package/modules/user/index.tsx

@@ -1,9 +1,9 @@
 // withHooks
 // noPage
 
-import { ChattingFirebase, esp, LibDialog, LibImage, LibNet_status, LibProgress, LibStyle, LibToast, LibUpdaterProperty, LibVersion, LibWorker, LibWorkloop, LibWorkview, UseDeeplink, useGlobalReturn, useGlobalState, 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, UserLoading, UserMain, UserRoutes, useSafeState, _global } from 'esoftplay';
 import * as Font from "expo-font";
-import React, { useEffect, useLayoutEffect } from "react";
+import React, { useEffect } from "react";
 import { Platform, View } from "react-native";
 import { GestureHandlerRootView } from 'react-native-gesture-handler';
 import Navs from "../../cache/navs";
@@ -30,16 +30,12 @@ function setFonts(): Promise<void> {
 }
 
 
-const state = useGlobalState(null)
-export function workerState(): useGlobalReturn<any> {
-  return state
-}
+
 export default function m(props: UserIndexProps): any {
   const [loading, setLoading] = useSafeState(true)
-  const worker = state.useSelector((x) => x)
+  const [worker] = LibWorker.workerState().useState()
   const user = UserClass.state().useSelector(s => s)
   const ready = React.useRef(0)
-  const workerReady = React.useRef(false)
   UseDeeplink()
   //@ts-ignore
   const initialState = __DEV__ ? _global.nav__state : undefined
@@ -52,7 +48,7 @@ export default function m(props: UserIndexProps): any {
     UserRoutes.set(currentState)
   }
 
-  useLayoutEffect(() => {
+  useEffect(() => {
     // const timeout = setTimeout(() => {
     //   setLoading(false)
     // }, 15 * 1000);
@@ -62,9 +58,8 @@ export default function m(props: UserIndexProps): any {
         limitReady = 2
       }
 
-    if (worker == 1 && !workerReady.current) {
+    if (worker == 1) {
       ready.current += 1
-      workerReady.current = true
       if (ready.current >= limitReady) {
         setLoading(false)
       }

package/package.json

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