pixuireactcomponents 1.5.35 → 1.5.37

package/index.d.ts

@@ -21,4 +21,3 @@ export { AntiRepeat } from "./src/components/tools/antiRepeat";
 export { DragList } from "./src/components/react/app/dragList/dragList";
 export { QRCode } from "./src/components/react/app/qrcode/QRCode";
 export { Slider, SliderProps } from "./src/components/react/app/slider/Slider";
-export { ImgPreLoader_base64, PreLoadPic_base64 } from "./src/components/tools/ImgPreLoader";

package/index.js

@@ -15,7 +15,7 @@ export { GradientText } from './src/components/react/base/gradient/GradientText'
 export { PVideo } from './src/components/react/base/pixVideo/PixVideo';
 export { OutlineText } from './src/components/react/base/outlinetext/OutlineText';
 export { FrameAnimation } from './src/components/react/app/frameAnimation/FrameAnimation';
-export { ImgPreLoader_base64, PreLoadPic_base64 } from './src/components/tools/ImgPreLoader';
+// export { ImgPreLoader_base64, PreLoadPic_base64 } from './src/components/tools/ImgPreLoader';
 export { AsyncTaskProcessor } from './src/components/tools/AsyncTaskProcessor';
 export { assetCache } from './src/components/tools/assetCache';
 export { ScrollBar } from './src/components/react/app/scrollBar/ScrollBar';

package/lib/loadlib/lib_mgr.d.ts

@@ -4,6 +4,7 @@ export declare function singleton<T>(impl: new () => T): {
 declare class MainLibImpl {
     private lib;
     load(): void;
+    isLoadSuccess(): boolean;
     unload(): void;
     stringToArrayBuffer(content: string): ArrayBuffer;
     getPlatform(): number;

package/lib/loadlib/lib_mgr.js

@@ -34,6 +34,9 @@ var MainLibImpl = /** @class */ (function () {
             console.log('function table end');
         }
     };
+    MainLibImpl.prototype.isLoadSuccess = function () {
+        return this.lib != undefined;
+    };
     MainLibImpl.prototype.unload = function () {
         loadlib.unloadLib('openplatform');
         this.lib = undefined;

package/package.json

@@ -1,8 +1,9 @@
 {
     "name": "pixuireactcomponents",
-    "version": "1.5.35",
+    "version": "1.5.37",
     "description": "pixui react components",
     "main": "index.js",
+    "sideEffects": false,
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",
         "build": "tsc && node -e \"const path = require('path'); const cpx = require('cpx'); cpx.copySync(path.join('src', 'components', 'asset', '**'), path.join('publish_components', 'asset'));\""

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

@@ -11,26 +11,22 @@ var __assign = (this && this.__assign) || function () {
 };
 import { useEffect, useState } from 'preact/hooks';
 import { h } from 'preact';
-import { GameletAPI } from 'gamelet-pixui-frame';
 import { assetCache } from '../../../tools/assetCache';
 export var PreloadImg = function (props) {
     var src = props.src, useImgTag = props.useImgTag;
     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);
-            }
+            assetCache.cache(src)
+                .then(function (localSrc) {
+                setRealSrc(localSrc);
+                console.log('使用预加载图片', src, ' -> ', localSrc);
+            })
+                .catch(function (error) {
+                console.error('Failed to cache asset:', error);
+                setRealSrc(src); // 回退到使用原始的src
+            });
         }
     }, [src]);
     return useImgTag ? (h("img", __assign({}, props, { src: realSrc }))) : (h("div", __assign({}, props, { style: __assign({ backgroundImage: "url(".concat(realSrc, ")"), backgroundSize: '100% 100%', backgroundRepeat: 'no-repeat' }, props.style) })));
 };
-var isJssdkEnv = function () {
-    return GameletAPI.getRuntimeEnv() == 'jssdk-appwindow' || GameletAPI.getRuntimeEnv() == 'jssdk-preprocessor';
-};

package/src/components/react/app/videoPlayer/VideoPlayer.js

@@ -343,7 +343,7 @@ export var VideoPlayer = function (props) {
                 case VideoStatus.End:
                     return iconElement === null || iconElement === void 0 ? void 0 : iconElement.reloadIcon;
                 default:
-                    return '' || {};
+                    return {};
             }
         }
     };

package/src/components/tools/assetCache.js

@@ -34,12 +34,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-import { GameletAPI } from 'gamelet-pixui-frame';
 import path from 'path';
-import { tools } from './tools';
+import { sha1 } from './Sha1';
 import { LibMgr } from '../../../lib/loadlib/lib_mgr';
 var assetPrefix = 'cacheAsset';
-var isJssdkEnv = GameletAPI.getRuntimeEnv() == 'jssdk-appwindow' || GameletAPI.getRuntimeEnv() == 'jssdk-preprocessor';
 var OPLib = LibMgr.getInstance().getMainLib();
 console.log('new lib test');
 /**
@@ -64,7 +62,7 @@ export var assetCache;
                         var urlWithoutParams, localPath, xhr;
                         var _this = this;
                         return __generator(this, function (_a) {
-                            if (!isJssdkEnv) {
+                            if (!OPLib.isLoadSuccess()) {
                                 console.log('非jssdk环境');
                                 reject(url);
                                 return [2 /*return*/];
@@ -143,7 +141,7 @@ export var assetCache;
     };
     assetCache.getFileCachePath = function (url) {
         console.log('getCachePath', url);
-        if (!isJssdkEnv) {
+        if (!OPLib.isLoadSuccess()) {
             console.log('非jssdk环境');
             return '';
         }
@@ -217,7 +215,7 @@ export var assetCache;
         if (!OPLib.dirExists(filePath)) {
             OPLib.makeDir(filePath);
         }
-        var fileName = tools.getHashStr(assetPrefix + url) + path.extname(url);
+        var fileName = sha1(assetPrefix + url).substring(0, 20) + path.extname(url);
         return path.join(filePath, fileName || '');
     };
 })(assetCache || (assetCache = {}));