@shijiu/jsview-vue 2.2.373 → 2.2.426-test.0

package/utils/JsViewVueWidget/JsvPreload/JsvPreload.vue

@@ -71,8 +71,7 @@ export { buildPreloadInfo, buildDownloadInfo };
 import { Forge } from "@shijiu/jsview/dom/jsv-forge-define";
 import ForgeHandles from "../../JsViewVueTools/ForgeHandles";
 import { reactive, onBeforeUnmount, watchEffect } from "vue";
-
-const CONST_FORMAT_TOKEN = "_JsvP_";
+import { urlCheckSet } from "../../JsViewVueTools";
 
 const props = defineProps({
   preloadList: Object,
@@ -98,37 +97,29 @@ let preloadToken = 1;
 let downloadToken = 1;
 
 const _releasePreloadView = () => {
-  if (window.JsView) {
-    if (loadViewList.preloadViewList.length > 0) {
-      for (const view_info of loadViewList.preloadViewList) {
-        if (view_info) {
-          // 当预加载url为null时view_info为null
-          const id = view_info.viewId;
-          view_info.textureRef?.DisableBackgroundLoad();
-          view_info.textureRef?.UnregisterLoadImageCallback(
-            view_info.callToken
-          );
-          Forge.sViewStore.remove(id);
-        }
+  if (loadViewList.preloadViewList.length > 0) {
+    for (const view_info of loadViewList.preloadViewList) {
+      if (view_info) {
+        // 当预加载url为null时view_info为null
+        const id = view_info.viewId;
+        view_info.textureRef?.DisableBackgroundLoad();
+        view_info.textureRef?.UnregisterLoadImageCallback(view_info.callToken);
+        Forge.sViewStore.remove(id);
       }
     }
-    loadViewList.preloadViewList = [];
-    preloadStateList = [];
   }
+  loadViewList.preloadViewList = [];
+  preloadStateList = [];
 };
 const _releaseDownloadView = () => {
-  if (window.JsView) {
-    if (loadViewList.downloadViewList.length > 0) {
-      for (const view_info of loadViewList.downloadViewList) {
-        if (view_info) {
-          // 当预加载url为null时view_info为null
-          const id = view_info.viewId;
-          view_info.textureRef?.DisableBackgroundLoad();
-          view_info.textureRef?.UnregisterLoadImageCallback(
-            view_info.callToken
-          );
-          Forge.sViewStore.remove(id);
-        }
+  if (loadViewList.downloadViewList.length > 0) {
+    for (const view_info of loadViewList.downloadViewList) {
+      if (view_info) {
+        // 当预加载url为null时view_info为null
+        const id = view_info.viewId;
+        view_info.textureRef?.DisableBackgroundLoad();
+        view_info.textureRef?.UnregisterLoadImageCallback(view_info.callToken);
+        Forge.sViewStore.remove(id);
       }
     }
   }
@@ -176,14 +167,7 @@ const _getPreloadViewIdList = () => {
         "Error:format mismatch, data should comes from function buildPreloadInfo()"
       );
     }
-    const base_url = item.url;
-    let image_url = base_url;
-    if (base_url && base_url.indexOf("http") < 0) {
-      // 包含http和https两种请求
-      if (window.JsView.Dom.UrlRef) {
-        image_url = new window.JsView.Dom.UrlRef(base_url).href;
-      }
-    }
+    let image_url = urlCheckSet(item.url);
     let target_size = null;
     if (item.width !== 0 && item.height !== 0) {
       target_size = { width: item.width, height: item.height };
@@ -267,14 +251,7 @@ const _getDownloadViewIdList = () => {
       );
     }
     console.log(`OnDownload get${index} url=${item.url}`);
-    const base_url = item.url;
-    let image_url = base_url;
-    if (base_url && base_url.indexOf("http") < 0) {
-      // 包含http和https两种请求
-      if (window.JsView.Dom.UrlRef) {
-        image_url = new window.JsView.Dom.UrlRef(base_url).href;
-      }
-    }
+    let image_url = urlCheckSet(item.url);
     const texture = ForgeHandles.TextureManager.GetDownloadTexture(
       image_url,
       null,

package/utils/JsViewVueWidget/JsvPreload/index.js

@@ -6,17 +6,6 @@
  * @Description: file content
  */
 //! 考虑到.vue文件除了export default的component外，还有可能export其他对象,因此使用import * as
-import * as JsvPreload from "./JsvPreload.vue";
+export * from "./JsvPreload.vue";
+export { default } from "./JsvPreload.vue";
 
-let _JsvPreload;
-if (window.JsView) {
-  _JsvPreload = JsvPreload.default;
-} else {
-  const BrowserPreload = await import("./BrowserPreload.vue");
-  _JsvPreload = BrowserPreload.default;
-}
-
-let buildPreloadInfo = JsvPreload.buildPreloadInfo;
-let buildDownloadInfo = JsvPreload.buildDownloadInfo;
-export default _JsvPreload;
-export { buildPreloadInfo, buildDownloadInfo };

package/utils/JsViewVueWidget/JsvQrcode/JsvQrcode.vue

@@ -22,6 +22,7 @@
 import { Forge } from "@shijiu/jsview/dom/jsv-forge-define";
 import ForgeHandles from "../../JsViewVueTools/ForgeHandles";
 import { TextureInstantType } from "../../JsViewVueTools/JsvTextureDefines.ts";
+import { urlCheckSet } from "../../JsViewVueTools/TypeCheckAndSet.ts";
 
 export default {
   props: {
@@ -96,7 +97,7 @@ export default {
       if (this.imageSettings && calculatedImageSettings) {
         let url = this.imageSettings.src;
         if (typeof url === "string") {
-          url = new window.JsView.Dom.UrlRef(this.imageSettings.src).href;
+          url = urlCheckSet(this.imageSettings.src);
         }
         const img_texture = texture_manager.GetImage(url);
         const img_view = new Forge.LayoutView(

package/utils/JsViewVueWidget/JsvSoundPool.js

@@ -40,6 +40,8 @@
  *              功能: 设置播放优先级
  */
 
+import { urlCheckSet } from "../JsViewVueTools";
+
 const supportSoundPool = !!window.SoundPool;
 class AudioController {
   constructor(soundPool, soundId, url) {
@@ -165,13 +167,7 @@ class JsvSoundPool {
       return;
     }
 
-    let realUrl;
-    if (window.JsView) {
-      // jsview上
-      realUrl = new window.JsView.Dom.UrlRef(url).href;
-    } else {
-      realUrl = url;
-    }
+    let realUrl = urlCheckSet(url);
     if (this._SoundIdMap[realUrl]) {
       this._SoundIdMap[realUrl].referCount++;
       const controller = new AudioController(this._SoundPool, this._SoundIdMap[realUrl].soundId);

package/utils/JsViewVueWidget/JsvSpray/JsvSpray.vue

@@ -42,6 +42,7 @@
 <script>
 import { Forge } from "@shijiu/jsview/dom/jsv-forge-define";
 import ForgeHandles from "../../JsViewVueTools/ForgeHandles";
+import { urlCheckSet } from "../../JsViewVueTools";
 
 let buildForgeView = (pointRes, sprayStyle, sizeRef, ignoreClip) => {
   if (!pointRes) {
@@ -54,19 +55,13 @@ let buildForgeView = (pointRes, sprayStyle, sizeRef, ignoreClip) => {
       texture_manager.GetColorTexture(pointRes)
     );
   } else {
-    const base_url = pointRes;
-    let image_url = base_url;
-    if (base_url && base_url.indexOf("http") === 0) {
-      image_url = base_url;
-    } else if (window.JsView.Dom.UrlRef) {
-      image_url = new window.JsView.Dom.UrlRef(pointRes).href;
-    }
+    let image_url = urlCheckSet(pointRes);
     texture_setting = new Forge.ExternalTextureSetting(
       texture_manager.GetImage2(image_url, false, null, "RGB_8888", null)
     );
   }
   const spray_view = new Forge.SprayView(texture_setting);
-  let add_speed  = .1;
+  let add_speed = 0.1;
   if (typeof sprayStyle.particleAddSpeed == "number") {
     add_speed = sprayStyle.particleAddSpeed;
   }
@@ -94,16 +89,24 @@ let buildForgeView = (pointRes, sprayStyle, sizeRef, ignoreClip) => {
     alphaMin = sprayStyle.alphaMin;
     alphaMax = sprayStyle.alphaMax;
   }
-  let lifeMin = sprayStyle.lifeMin, lifeMax = sprayStyle.lifeMax;
+  let lifeMin = sprayStyle.lifeMin,
+    lifeMax = sprayStyle.lifeMax;
   if (sprayStyle.lifeMax > 50 * 1000) {
-    console.warn("JsvSpray: particle maximum lifetime is 50000ms, current value is", sprayStyle.lifeMax);
+    console.warn(
+      "JsvSpray: particle maximum lifetime is 50000ms, current value is",
+      sprayStyle.lifeMax
+    );
     /**某些设备上float值过大会导致精度问题, 因此粒子生命需要限制范围*/
     lifeMin = sprayStyle.lifeMin > 50000 ? 50000 : sprayStyle.lifeMin;
     lifeMax = sprayStyle.lifeMax > 50000 ? 50000 : sprayStyle.lifeMax;
   }
 
-  let angleMin = 0, angleMax = 0;
-  if (typeof sprayStyle.angleMin == "number" && typeof sprayStyle.angleMax == "number") {
+  let angleMin = 0,
+    angleMax = 0;
+  if (
+    typeof sprayStyle.angleMin == "number" &&
+    typeof sprayStyle.angleMax == "number"
+  ) {
     if (sprayStyle.angleMin <= sprayStyle.angleMax) {
       angleMin = (sprayStyle.angleMin / 180) * 3.1415;
       angleMax = (sprayStyle.angleMax / 180) * 3.1415;
@@ -133,7 +136,7 @@ let buildForgeView = (pointRes, sprayStyle, sizeRef, ignoreClip) => {
     alphaMin,
     alphaMax,
     angleMin,
-    angleMax,
+    angleMax
   );
   const view_width =
     sprayStyle.deltaWidth === 0 ? 1 : 2 * sprayStyle.deltaWidth;
@@ -204,4 +207,4 @@ export default {
     :style="{ width: size.width, height: size.height }"
     :data-jsv-vw-innerview="viewId"
   ></div>
-</template>
+</template>

package/utils/JsViewVueWidget/JsvSpriteAnim/JsvSpriteAnim.vue

@@ -353,11 +353,6 @@ onUnmounted(() => {
 const onAnimEndDelegate = () => {
   // 在onAnimEnd之前进行Stop，以防onAnimEnd内部继续发生别的操作
   if (props.onAnimEnd) {
-    if (!window.JsView) {
-      console.log(
-        "JsvSpriteAnim 结束回调时进行隐藏在PC环境会有一帧残留，盒子环境是正常,可忽略这个问题"
-      );
-    }
     props.onAnimEnd();
   }
 

package/utils/JsViewVueWidget/JsvTextureAnim/JsvTextureAnim.vue

@@ -11,7 +11,7 @@ import ForgeHandles from "../../JsViewVueTools/ForgeHandles";
 import {
   numberCheckSet,
   urlCheckSet,
-} from "../../JsViewVueTools/TypeCheckAndSet";
+} from "../../JsViewVueTools/TypeCheckAndSet.ts";
 import { toNinePatchForgeViewSet } from "../../JsViewVueTools/NinePatchHelper";
 import {
   DECORATE_BORDER_RADIUS,
@@ -84,11 +84,6 @@ const TexAlignAnchor = {
 };
 export { TexAlignAnchor };
 
-const STATE_IDLE = 0;
-const STATE_RUNNING = 1;
-const STATE_PAUSED = 2;
-const STATE_END = 3;
-
 export default {
   props: {
     src: String,
@@ -133,7 +128,7 @@ export default {
   },
   setup() {
     return {
-      runningState: STATE_IDLE, // 0:未开始, 1:运行中, 2:暂停, 3:正常结束
+      forgeAnimation: null,
       innerViewId: -1,
     };
   },
@@ -249,10 +244,7 @@ export default {
       return new Forge.LayoutView(texture_set);
     },
 
-    _onAnimationEnd(normal_end) {
-      if (normal_end) {
-        this.runningState = STATE_END;
-      }
+    _onAnimationEnd() {
       this.onAnimationEnd?.();
     },
 
@@ -281,34 +273,9 @@ export default {
       }
     },
 
-    _buildAnimation() {
-      if (this.animation) {
-        let anim = new Forge.CssKeyframeAnimation(
-          "@keyframes texAnimDef" + this.animation,
-          this.duration,
-          null,
-          1,
-          1
-        );
-        anim.EnableDelay(this.delay).SetRepeat(this.repeat);
-        anim.Enable(Forge.AnimationEnable.ReleaseAfterEndCallback);
-        anim.SetAnimationListener(
-          new Forge.AnimationListener(null, this._onAnimationEnd, null)
-        );
-
-        return anim;
-      } else {
-        return null;
-      }
-    },
-
     start() {
-      if (this.innerView) {
-        let anim = this._buildAnimation();
-        if (anim) {
-          this.runningState = STATE_RUNNING;
-          this.innerView.StartTextureAnimation(anim);
-        }
+      if (this.forgeAnimation && this.innerView) {
+        this.innerView.StartTextureAnimation(this.forgeAnimation);
       }
     },
 
@@ -331,41 +298,55 @@ export default {
   },
 
   created() {
-    if (window.JsView) {
-      const textureManager = ForgeHandles.TextureManager;
+    const textureManager = ForgeHandles.TextureManager;
 
-      // 1.获得主view的展示内容图片 texture
-      let image_url = urlCheckSet(this.src);
-      let view_texture = textureManager.GetImage2(
-        image_url,
-        false,
-        null,
-        "RGB_8888",
-        null
-      );
-      // 1.1 兼容border转为decorate
-      let decorate = this.$props.decorate;
-      if (this.$props.borderRadius) {
-        decorate = this._readRadius(this.$props.borderRadius);
-      }
+    // 1.获得主view的展示内容图片 texture
+    let image_url = urlCheckSet(this.src);
+    let view_texture = textureManager.GetImage2(
+      image_url,
+      false,
+      null,
+      "RGB_8888",
+      null
+    );
+    // 1.1 兼容border转为decorate
+    let decorate = this.$props.decorate;
+    // if (this.$props.borderRadius) {
+    //   decorate = this._readRadius(this.$props.borderRadius);
+    // }
 
-      // 2.创建view
-      this.innerView = this._createForgeView(view_texture, decorate);
-      // 3.设置texture基本形变
-      if (this.transform) {
-        this.innerView.ResetTextureCssTransform(
-          this.transform,
-          this.transformOrigin
-        );
-      }
-      this._updateTexCoord();
-
-      // 5. inner view标准处理
+    // 2.创建view
+    this.innerView = this._createForgeView(view_texture, decorate);
+    // 3.设置texture基本形变
+    if (this.transform) {
+      this.innerView.ResetTextureCssTransform(
+        this.transform,
+        this.transformOrigin
+      );
+    }
+    this._updateTexCoord();
 
-      this.innerViewId = Forge.sViewStore.add(
-        new Forge.ViewInfo(this.innerView)
+    // 4.设置texture的动画形变
+    if (this.animation) {
+      this.forgeAnimation = new Forge.CssKeyframeAnimation(
+        "@keyframes texAnimDef" + this.animation,
+        this.duration,
+        null,
+        1,
+        1
+      );
+      this.forgeAnimation.EnableDelay(this.delay).SetRepeat(this.repeat);
+      this.forgeAnimation.Enable(Forge.AnimationEnable.ReleaseAfterEndCallback);
+      this.forgeAnimation.SetAnimationListener(
+        new Forge.AnimationListener(null, this._onAnimationEnd, null)
       );
+    } else {
+      this.forgeAnimation = null;
     }
+
+    // 5. inner view标准处理
+
+    this.innerViewId = Forge.sViewStore.add(new Forge.ViewInfo(this.innerView));
   },
   beforeUnmount() {
     if (this.innerViewId !== -1) {
@@ -379,19 +360,33 @@ export default {
     }
   },
   activated() {
-    if (this.innerView && this.runningState == STATE_PAUSED) {
-      // 动画未正常结束，重新开始动画
-      let anim = this._buildAnimation();
-      this.innerView.StartTextureAnimation(anim); // pause状态，一定有值
+    if (this.innerView) {
+      if (this.animation && this.forgeAnimation == null) {
+        this.forgeAnimation = new Forge.CssKeyframeAnimation(
+          "@keyframes texAnimDef" + this.animation,
+          this.duration,
+          null,
+          1,
+          1
+        );
+        this.forgeAnimation.EnableDelay(this.delay).SetRepeat(this.repeat);
+        this.forgeAnimation.Enable(
+          Forge.AnimationEnable.ReleaseAfterEndCallback
+        );
+        this.forgeAnimation.SetAnimationListener(
+          new Forge.AnimationListener(null, this._onAnimationEnd, null)
+        );
+        this.innerView.StartTextureAnimation(this.forgeAnimation);
+      } else {
+        this.forgeAnimation = null;
+      }
     }
   },
   deactivated() {
     if (this.innerView) {
       this.innerView.StopTextureAnimation();
-      if (this.runningState == STATE_RUNNING) {
-        this.runningState = STATE_PAUSED;
-      }
     }
+    this.forgeAnimation = null;
   },
 };
 </script>

package/utils/JsViewVueWidget/JsvTextureAnim/index.js

@@ -3,17 +3,10 @@
  * @Date: 2021-10-13 15:14:29
  * @Description: file content
  */
-import * as JsvTextureAnim from "./JsvTextureAnim.vue";
 
-let _JsvTextureAnim;
-if (window.JsView) {
-  _JsvTextureAnim = JsvTextureAnim.default;
-} else {
-  const BrowserTextureAnim = await import("./BrowserTextureAnim.vue");
-  _JsvTextureAnim = BrowserTextureAnim.default;
-}
+import JsvTextureAnim from "./JsvTextureAnim.vue"
 
 export * from "./CommonType";
-export default _JsvTextureAnim;
+export default JsvTextureAnim;
 const TexAlignAnchor = JsvTextureAnim.TexAlignAnchor;
 export { TexAlignAnchor };

package/utils/JsViewVueWidget/index.js

@@ -17,8 +17,8 @@ export {
   buildPreloadInfo,
   buildDownloadInfo,
 } from "./JsvPreload";
-export { default as JsvQrcode } from "./JsvQrcode";
-export { default as JsvSpray } from "./JsvSpray";
+export { default as JsvQrcode } from "./JsvQrcode/JsvQrcode.vue";
+export { default as JsvSpray } from "./JsvSpray/JsvSpray.vue"
 export * from "./JsvSpriteAnim";
 export { default as JsvSwiper } from "./JsvSwiper";
 export { default as JsvSwiper3D } from "./JsvSwiper3D";

package/bin/browser/BrowserJsvFragShaderView.vue.mjs

@@ -1,79 +0,0 @@
-import { onMounted, onUnmounted, openBlock, createElementBlock, normalizeStyle } from 'vue';
-
-/* 
- + @file {@link file://./../../../../utils/JsViewVueWidget/JsvFragShaderView/BrowserJsvFragShaderView.vue}
- */
-const _sfc_main = {
-  __name: "BrowserJsvFragShaderView",
-  props: {
-    style: {
-      type: Object,
-      required: true
-    },
-    duration: {
-      type: Number,
-      default: -1
-    },
-    autoplay: {
-      type: Boolean,
-      default: false
-    },
-    shaderStr: {
-      type: String,
-      required: true
-    },
-    // [{ name: string, value: number }]
-    uniforms: {
-      type: Array
-    },
-    // [{ name: string, type: number, resource: object/string }]
-    textures: {
-      type: Array
-    },
-    onEnd: {
-      type: Function
-    },
-    onStart: {
-      type: Function
-    }
-  },
-  setup(__props, { expose }) {
-    const props = __props;
-    let vMounted = false;
-    onMounted(() => {
-      vMounted = true;
-    });
-    onUnmounted(() => {
-      vMounted = false;
-    });
-    expose({
-      startAnim: () => {
-        props.onStart?.();
-        setTimeout(() => {
-          if (vMounted) {
-            props.onEnd?.();
-          }
-        }, 0);
-      },
-      stopAnim: () => {
-      }
-    });
-    return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("div", {
-        style: normalizeStyle({
-          left: __props.style.left,
-          top: __props.style.top,
-          width: __props.style.width,
-          height: __props.style.height,
-          backgroundColor: "#00000077",
-          fontSize: 50,
-          color: "#ffffff",
-          textAlign: "center",
-          lineHeight: __props.style.height
-        })
-      }, " 浏览器端未支持JsvFragShaderView ", 4);
-    };
-  }
-};
-
-export { _sfc_main as default };