esoftplay 0.0.115-b → 0.0.115-e

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;
@@ -276,6 +277,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)
@@ -347,6 +349,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 +410,14 @@ 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"]
     reportApiError(this.fetchConf, msg)
     LibProgress.hide()
   }

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,36 +40,37 @@ export default class m extends LibComponent<LibVersionProps, LibVersionState> {
 
   static onDone(res: any, msg: string): void {
     const { title, version, android, ios } = res
-
+    console.log(res)
     function isAvailableNewVersion(newVersion: string): boolean {
       let oldVersion = m.appVersion()
       return newVersion > oldVersion
     }
 
     if (isAvailableNewVersion(version)) {
+      console.log("IS AVAILABLE", version)
       LibNavigation.backToRoot()
       LibNavigation.replace("lib/version", { res, msg: msg == 'success' ? 'Update to a new version now' : msg })
     }
 
   }
   static check(): void {
-    new LibCurl("public_version", null, m.onDone)
+    new LibCurl("public_version?syafiq=1", null, m.onDone)
   }
 
   render(): any {
     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/user/index.tsx

@@ -4,7 +4,7 @@
 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 * as Font from "expo-font";
 import React, { useEffect, useLayoutEffect } from "react";
-import { View } from "react-native";
+import { Platform, View } from "react-native";
 import { GestureHandlerRootView } from 'react-native-gesture-handler';
 import Navs from "../../cache/navs";
 
@@ -56,24 +56,30 @@ export default function m(props: UserIndexProps): any {
     // const timeout = setTimeout(() => {
     //   setLoading(false)
     // }, 15 * 1000);
+    let limitReady = 3
+    if (Platform.OS == 'android')
+      if (Platform.Version <= 22) {
+        limitReady = 2
+      }
+
     if (worker == 1 && !workerReady.current) {
       ready.current += 1
       workerReady.current = true
-      if (ready.current >= 3) {
+      if (ready.current >= limitReady) {
         setLoading(false)
       }
     }
     (async () => {
       await setFonts()
       ready.current += 1
-      if (ready.current >= 3) {
+      if (ready.current >= limitReady) {
         setLoading(false)
       }
     })()
 
     UserClass.isLogin(async () => {
       ready.current += 1
-      if (ready.current >= 3) {
+      if (ready.current >= limitReady) {
         setLoading(false)
       }
     })

package/package.json

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