pixuireactcomponents 1.3.89 → 1.3.91

package/lib/loadlib/loadlib_interface_wrapper.js

@@ -1,7 +1,7 @@
 "use strict";
 // @ts-nocheck
 // make it callable from typescript
-if (globalThis.oplatSDKRunningTestRoutine) {
+if (globalThis.oplatSDKRunningTestRoutine || typeof addlibpath === 'undefined') {
     exports.addlibpath = function (path) { };
     exports.clearlibpath = function (path) { };
     exports.loadlib = function (libname) { return undefined; };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "pixuireactcomponents",
-    "version": "1.3.89",
+    "version": "1.3.91",
     "description": "pixui react components",
     "main": "index.js",
     "scripts": {

package/src/components/react/app/preloadImg/PreloadImg.d.ts

@@ -0,0 +1,2 @@
+import { h } from 'preact';
+export declare const PreloadImg: (props: h.JSX.HTMLAttributes<HTMLImageElement>) => h.JSX.Element;

package/src/components/react/app/preloadImg/PreloadImg.js

@@ -0,0 +1,36 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+import { useEffect, useState } from 'preact/hooks';
+import { h } from 'preact';
+import { GameletAPI } from 'gamelet-pixui-frame';
+import { assetCache } from 'src/components/tools/assetCache';
+export var PreloadImg = function (props) {
+    var src = props.src;
+    var _a = useState(''), realSrc = _a[0], setRealSrc = _a[1];
+    useEffect(function () {
+        if (src) {
+            if (isJssdkEnv()) {
+                assetCache.cache(src).then(function (localSrc) {
+                    setRealSrc(localSrc);
+                    console.log('使用预加载图片', src, ' -> ', localSrc);
+                });
+            }
+            else {
+                setRealSrc(src);
+            }
+        }
+    }, [src]);
+    return h("img", __assign({}, props, { src: realSrc }));
+};
+var isJssdkEnv = function () {
+    return GameletAPI.getRuntimeEnv() == 'jssdk-appwindow' || GameletAPI.getRuntimeEnv() == 'jssdk-preprocessor';
+};

package/src/components/tools/assetCache.d.ts

@@ -16,5 +16,5 @@ export declare namespace assetCache {
      * @param retryTimes 重试次数
      * @returns 下载成功是，返回xhr.response，否则返回空字符串
      */
-    const download: (url: string, responseType: 'arraybuffer' | 'json' | 'text', retryTimes?: number) => Promise<string>;
+    const request: (url: string, responseType: 'arraybuffer' | 'json' | 'text', retryTimes?: number) => Promise<string>;
 }

package/src/components/tools/assetCache.js

@@ -37,30 +37,11 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 import { GameletAPI } from 'gamelet-pixui-frame';
 import path from 'path';
 import { tools } from './tools';
-// import { LibMgr } from '../../../lib/loadlib/lib_mgr';
+import { LibMgr } from '../../../lib/loadlib/lib_mgr';
 var assetPrefix = 'cacheAsset';
-var isJssdkEnv = function () {
-    return GameletAPI.getRuntimeEnv() == 'jssdk-appwindow' || GameletAPI.getRuntimeEnv() == 'jssdk-preprocessor';
-};
-//动态导入lib_mgr
-var getLibMgr = function () { return __awaiter(void 0, void 0, void 0, function () {
-    var module_1, error_1;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                _a.trys.push([0, 2, , 3]);
-                return [4 /*yield*/, import('../../../lib/loadlib/lib_mgr')];
-            case 1:
-                module_1 = _a.sent();
-                return [2 /*return*/, module_1.LibMgr];
-            case 2:
-                error_1 = _a.sent();
-                console.error('need puerts env', error_1);
-                return [2 /*return*/, null];
-            case 3: return [2 /*return*/];
-        }
-    });
-}); };
+var isJssdkEnv = GameletAPI.getRuntimeEnv() == 'jssdk-appwindow' || GameletAPI.getRuntimeEnv() == 'jssdk-preprocessor';
+var OPLib = LibMgr.getInstance().getMainLib();
+console.log('new lib test');
 /**
  * 缓存资源到本地，仅jssdk环境可用
  */
@@ -80,27 +61,18 @@ export var assetCache;
             return __generator(this, function (_a) {
                 console.log('cacheAsset---', url);
                 return [2 /*return*/, new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
-                        var urlWithoutParams, LibMgr, lib, localPath, xhr;
+                        var urlWithoutParams, localPath, xhr;
                         var _this = this;
                         return __generator(this, function (_a) {
                             switch (_a.label) {
                                 case 0:
-                                    if (!isJssdkEnv()) {
+                                    if (!isJssdkEnv) {
                                         console.log('非jssdk环境');
                                         reject(url);
                                     }
                                     urlWithoutParams = url.split('?')[0];
-                                    return [4 /*yield*/, getLibMgr()];
-                                case 1:
-                                    LibMgr = _a.sent();
-                                    if (!LibMgr) {
-                                        console.log('getLibMgr failed');
-                                        reject();
-                                        return [2 /*return*/];
-                                    }
-                                    lib = LibMgr.getInstance().getMainLib();
                                     return [4 /*yield*/, getLocalPath(urlWithoutParams)];
-                                case 2:
+                                case 1:
                                     localPath = _a.sent();
                                     if (!localPath) {
                                         console.log('getLocalPath failed');
@@ -109,7 +81,7 @@ export var assetCache;
                                     }
                                     console.log('cacheAsset getlocalPath', localPath);
                                     if (!force) {
-                                        if (lib.fileExists(localPath)) {
+                                        if (OPLib.fileExists(localPath)) {
                                             console.log('cacheAsset file exist', localPath);
                                             resolve(localPath);
                                         }
@@ -124,7 +96,7 @@ export var assetCache;
                                                 console.log('cacheAsset xhr statue=200', url, localPath);
                                                 // let buf = Buffer.from(xhr.response, 'binary').buffer;
                                                 if (localPath) {
-                                                    lib.saveToFile(localPath, xhr.response);
+                                                    OPLib.saveToFile(localPath, xhr.response);
                                                     resolve(localPath);
                                                 }
                                                 else {
@@ -169,9 +141,9 @@ export var assetCache;
      * @param retryTimes 重试次数
      * @returns 下载成功是，返回xhr.response，否则返回空字符串
      */
-    assetCache.download = function (url, responseType, retryTimes) {
+    assetCache.request = function (url, responseType, retryTimes) {
         if (retryTimes === void 0) { retryTimes = 3; }
-        console.log('download---', url);
+        console.log('request---', url);
         return new Promise(function (resolve, reject) {
             var xhr = new XMLHttpRequest();
             xhr.open('GET', url, true);
@@ -185,7 +157,7 @@ export var assetCache;
                         console.warn('cacheAsset xhr statue!=200', xhr.status);
                         if (retryTimes > 0) {
                             console.log('retry cacheAsset', retryTimes);
-                            assetCache.download(url, responseType, retryTimes - 1).then(resolve, reject);
+                            assetCache.request(url, responseType, retryTimes - 1).then(resolve, reject);
                         }
                         else {
                             reject('');
@@ -198,7 +170,7 @@ export var assetCache;
                 console.warn('cacheAsset XHR error', xhr.status);
                 if (retryTimes > 0) {
                     console.log('retry cacheAsset', retryTimes);
-                    assetCache.download(url, responseType, retryTimes - 1).then(resolve, reject);
+                    assetCache.request(url, responseType, retryTimes - 1).then(resolve, reject);
                 }
                 else {
                     reject('');
@@ -208,27 +180,16 @@ export var assetCache;
         });
     };
     var getLocalPath = function (url) { return __awaiter(_this, void 0, void 0, function () {
-        var LibMgr, lib, filePath, fileName;
+        var filePath, fileName;
         return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    console.log('getLocalPath', url);
-                    return [4 /*yield*/, getLibMgr()];
-                case 1:
-                    LibMgr = _a.sent();
-                    if (!LibMgr) {
-                        console.log('getLibMgr failed');
-                        return [2 /*return*/];
-                    }
-                    lib = LibMgr.getInstance().getMainLib();
-                    filePath = path.join(lib.getCachePath(), 'assetcache');
-                    //检查assetcache文件夹
-                    if (!lib.dirExists(filePath)) {
-                        lib.makeDir(filePath);
-                    }
-                    fileName = tools.getHashStr(assetPrefix + url) + path.extname(url);
-                    return [2 /*return*/, path.join(filePath, fileName)];
+            console.log('getLocalPath', url);
+            filePath = path.join(OPLib.getCachePath(), 'assetcache');
+            //检查assetcache文件夹
+            if (!OPLib.dirExists(filePath)) {
+                OPLib.makeDir(filePath);
             }
+            fileName = tools.getHashStr(assetPrefix + url) + path.extname(url);
+            return [2 /*return*/, path.join(filePath, fileName)];
         });
     }); };
 })(assetCache || (assetCache = {}));