esoftplay 0.0.115-u → 0.0.115-x

package/global.ts

@@ -40,7 +40,7 @@ let subscriber = {}
 let debouceTime
 let persistKeys: any = {}
 
-export default function m<T>(initValue: T, o?: useGlobalOption): useGlobalReturn<T> {
+export default function useGlobalState<T>(initValue: T, o?: useGlobalOption): useGlobalReturn<T> {
   const _idx = globalIdx.idx
   if (!subscriber[_idx])
     subscriber[_idx] = [];

package/modules/user/class.ts

@@ -8,7 +8,7 @@ import { Platform } from 'react-native';
 import useGlobalState from '../../global';
 import moment from "../../moment";
 
-const state = useGlobalState?.(null)
+const state = useGlobalState?.(null, { persistKey: "user" })
 
 export default class eclass {
   static state(): useGlobalReturn<any> {
@@ -17,32 +17,14 @@ 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();
+      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(async(r) => {
+    return new Promise(async (r) => {
       Notifications.setBadgeCountAsync(0)
       state.reset()
       await AsyncStorage.removeItem("user_notification");
-      await AsyncStorage.removeItem("user");
       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

@@ -31,7 +31,7 @@ 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)
@@ -52,7 +52,7 @@ export default function m(props: UserIndexProps): any {
     // const timeout = setTimeout(() => {
     //   setLoading(false)
     // }, 15 * 1000);
-    let limitReady = 2
+    let limitReady = 3
     if (Platform.OS == 'android')
       if (Platform.Version <= 22) {
         limitReady = 2
@@ -72,12 +72,12 @@ export default function m(props: UserIndexProps): any {
       }
     })()
 
-    // UserClass.isLogin(async () => {
-    //   ready.current += 1
-    //   if (ready.current >= limitReady) {
-    //     setLoading(false)
-    //   }
-    // })
+    UserClass.isLogin(async () => {
+      ready.current += 1
+      if (ready.current >= limitReady) {
+        setLoading(false)
+      }
+    })
     if (esp.config('firebase').hasOwnProperty('apiKey')) {
       try {
         if (ChattingFirebase)

package/package.json

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