@shijiu/jsview-vue 0.9.502 → 0.9.631

package/utils/JsViewVueWidget/JsvPosterImage.vue

@@ -1,30 +1,51 @@
 <!--
  * 【模块 export 内容】
  * JsvPosterImage：Vue高阶组件，海报描画，可设置color space 和 texture size
- *      props说明:
- *          colorSpace          {String}   颜色空间，默认RGBA_8888
+ *  props说明:
+ *      colorSpace          {String}   颜色空间，默认RGBA_8888
+ *      style    {Object}   包含left/top/width/height/border-radius的style设置
 -->
 
-<script>
-export default {
-  props: {
-    colorSpace: {
-      type: String,
-      default: "RGBA_8888",
-    },
+<script setup>
+
+import { reactive, watchEffect } from "vue";
+
+const props = defineProps({
+  colorSpace: {
+    type: String,
+    default: "RGBA_8888",
   },
-  inheritAttrs: false,
-};
+
+  style: Object,
+});
+
+let common_style = reactive({});
+let image_style = reactive({});
+
+watchEffect(()=>{
+  if (props.style) {
+    let {left, top, width, height, ...others} = props.style;
+
+    common_style.left = left;
+    common_style.top = top;
+
+    image_style.width = width;
+    image_style.height = height;
+    Object.assign(image_style, others)
+  }
+})
+
 </script>
 
 <template>
-  <div>
+  <div :style="common_style">
     <slot></slot>
     <img
       jsv_enable_fade="true"
       jsv_poster_on_top="true"
       jsv_img_scaledown_tex="true"
-      :jsv_img_color_space="{ colorSpace }"
+      :jsv_img_color_space="colorSpace"
+      :style="image_style"
       v-bind="$attrs"
     />
   </div>

package/utils/JsViewVueWidget/JsvPreload/JsvPreload.vue

@@ -7,8 +7,8 @@
  *                                  列表的内容可以是图片，音频等任何网络资源，下载后缓存在本地，归入本地缓存管理(LRU清理策略)
  *      onPreloading {Function(float percent)}: 预加载中回调，返回预加载进度
  *      onPreloadDone {Function(sizeArray)}: 预加载完成回调，sizeArray(格式Object[])，每个的格式为{width, height}
- *      onDownloadDone {Function(pathesArray)}: 预下载完成回调,pathesArray(格式为String[])为下载好回调的地址, 
- *                                         其中pathesArray为存储位置的路径列表
+ *      onDownloadDone {Function(pathesArray, extra)}: 预下载完成回调,pathesArray(格式为String[])为下载好回调的地址, 
+ *                                         其中pathesArray为存储位置的路径列表, extra为额外信息(目前只有下载图片时的尺寸)
  *
  * 注意事项:
  *      指定加载时的尺寸(0为不指定)，与img标签中的 jsv_img_scaledown_tex 属性一起使用
@@ -54,10 +54,11 @@ const buildPreloadInfo = (
   };
 };
 
-const buildDownloadInfo = (url, net_setting = null) => {
+const buildDownloadInfo = (url, net_setting = null, get_image_size) => {
   return {
     url,
     netSetting: net_setting,
+    getImageSize: get_image_size,
     magicToken: CONST_FORMAT_TOKEN, // 用于格式校验
   };
 };
@@ -79,6 +80,7 @@ export default {
       downloadViewList: [],
       preloadStateList: [],
       downloadStateList: [],
+      downloadResultMap: {},
       preloadResultMap: {},
       CONST_FORMAT_TOKEN: "_JsvP_",
       preloadIsNullNum: 0, // 纪录传入的preload为null的数量，由于vue不支持在子组件修改props值，所有在删除值为null时，需要++，这样才能保证与传入数据的length相等从而触发回调
@@ -136,29 +138,6 @@ export default {
       }
     },
 
-    // shouldComponentUpdate(nextProps, nextState) {
-    //     if (
-    //         nextProps.preloadList.length === this.preloadList.length &&
-    //         nextProps.downloadList.length === this.downloadList.length
-    //     ) {
-    //     let same = true;
-    //     for (let i = 0; i < nextProps.preloadList.length; i++) {
-    //         if (nextProps.preloadList[i].url !== this.preloadList[i].url) {
-    //             same = false;
-    //             break;
-    //         }
-    //     }
-    //     for (let i = 0; i < nextProps.downloadList.length; i++) {
-    //         if (nextProps.downloadList[i].url !== this.downloadList[i].url) {
-    //             same = false;
-    //             break;
-    //         }
-    //     }
-    //     return !same;
-    //     }
-    //     return true;
-    // },
-
     _checkPreload() {
       let loadedNum = 0;
       this.preloadStateList.forEach((state) => {
@@ -248,12 +227,7 @@ export default {
         const preload_view = new Forge.PreloadView(texture_setting);
         return {
           viewId: ForgeExtension.RootActivity.ViewStore.add(
-            new Forge.ViewInfo(preload_view, {
-              x: 0,
-              y: 0,
-              width: 0,
-              height: 0,
-            })
+            new Forge.ViewInfo(preload_view)
           ),
           textureRef: texture,
           callToken: callback_token,
@@ -266,7 +240,10 @@ export default {
         if (!state) return;
       }
       if (this.$props.onDownloadDone) {
-        this.$props.onDownloadDone(this.downloadStateList);
+        this.$props.onDownloadDone(
+          this.downloadStateList,
+          this.downloadResultMap
+        );
       }
     },
 
@@ -274,7 +251,6 @@ export default {
       if (!this.downloadList) {
         return;
       }
-      this.downloadStateList = new Array(this.downloadList.length).fill(null);
       // 直接在map前将url为null的值清除掉
       let downloadListData = this.downloadList;
       for (let i = 0; i < downloadListData.length; i++) {
@@ -282,13 +258,14 @@ export default {
           downloadListData.splice(i, 1);
         }
       }
+      this.downloadStateList = new Array(downloadListData.length).fill(null);
       this.downloadViewList = downloadListData.map((item, index) => {
         if (item.magicToken !== this.CONST_FORMAT_TOKEN) {
           console.error(
             "Error:format mismatch, data should comes from function buildDownloadInfo()"
           );
         }
-        console.log(`OnDownload get${index} url=${item.url}`)
+        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) {
@@ -297,19 +274,33 @@ export default {
             image_url = new window.JsView.Dom.UrlRef(base_url).href;
           }
         }
-        const texture =
-          ForgeExtension.TextureManager.GetDownloadTexture(image_url);
+        const texture = ForgeExtension.TextureManager.GetDownloadTexture(
+          image_url,
+          null,
+          item.getImageSize
+        );
         if (!texture) {
-        console.error("Error: Down view build texture failed for " + image_url);
-        // 无法创建texture的图片先认为加载完成
-        this.downloadStateList[index] = "invalid";
-        return;
-      }
-      const callback_token = texture.RegisterLoadImageCallback(null, (texture_info) => {
-        console.log(`OnDownload done index${index}`)
-        this.downloadStateList[index] = texture_info.extra.absolutePath;
-        this._checkDownload();
-      });
+          console.error(
+            "Error: Down view build texture failed for " + image_url
+          );
+          // 无法创建texture的图片先认为加载完成
+          this.downloadStateList[index] = "invalid";
+          return;
+        }
+        const callback_token = texture.RegisterLoadImageCallback(
+          null,
+          (texture_info) => {
+            console.log(`OnDownload done index${index}`);
+            this.downloadStateList[index] = texture_info.extra.absolutePath;
+            if (item.getImageSize && texture_info.extra.width && texture_info.extra.height) {
+              this.downloadResultMap[texture_info.extra.absolutePath] = {
+                width: texture_info.extra.width,
+                height: texture_info.extra.height,
+              };
+            }
+            this._checkDownload();
+          }
+        );
         if (texture.EnableBackgroundLoad) {
           texture.EnableBackgroundLoad(this);
         }
@@ -318,12 +309,7 @@ export default {
 
         return {
           viewId: ForgeExtension.RootActivity.ViewStore.add(
-            new Forge.ViewInfo(preload_view, {
-              x: 0,
-              y: 0,
-              width: 0,
-              height: 0,
-            })
+            new Forge.ViewInfo(preload_view)
           ),
           textureRef: texture,
           callToken: callback_token,

package/utils/JsViewVueWidget/JsvQrcode/JsvQrcode.vue

@@ -116,7 +116,7 @@ export default {
     if (this.jsvBaseView === null) {
       this.jsvBaseView = new Forge.LayoutView();
       this.innerViewId = ForgeExtension.RootActivity.ViewStore.add(
-        new Forge.ViewInfo(this.jsvBaseView, { x: 0, y: 0 })
+        new Forge.ViewInfo(this.jsvBaseView)
       );
     }
     // 构建QRCdoe view

package/utils/JsViewVueWidget/JsvSpray/JsvSpray.vue

@@ -34,7 +34,7 @@
 <script>
 import { Forge, ForgeExtension } from "../../../dom/jsv-forge-define";
 
-let buildForgeView = (pointRes, sprayStyle) => {
+let buildForgeView = (pointRes, sprayStyle, sizeRef) => {
   if (!pointRes) {
     return -1;
   }
@@ -88,13 +88,10 @@ let buildForgeView = (pointRes, sprayStyle) => {
     sprayStyle.deltaWidth === 0 ? 1 : 2 * sprayStyle.deltaWidth;
   const view_height =
     sprayStyle.deltaHeight === 0 ? 1 : 2 * sprayStyle.deltaHeight;
+  sizeRef.width = view_width;
+  sizeRef.height = view_height;
   return ForgeExtension.RootActivity.ViewStore.add(
-    new Forge.ViewInfo(spray_view, {
-      x: 0,
-      y: 0,
-      width: view_width,
-      height: view_height,
-    })
+    new Forge.ViewInfo(spray_view)
   );
 };
 
@@ -111,6 +108,10 @@ export default {
   },
   data() {
     return {
+      size: {
+        width: 0,
+        height: 0
+      },
       viewId: -1,
     };
   },
@@ -123,11 +124,11 @@ export default {
     },
   },
   created() {
-    this.viewId = buildForgeView(this.pointRes, this.sprayStyle);
+    this.viewId = buildForgeView(this.pointRes, this.sprayStyle, this.size);
   },
   updated() {
     this.unloadView();
-    this.viewId = buildForgeView(this.pointRes, this.sprayStyle);
+    this.viewId = buildForgeView(this.pointRes, this.sprayStyle, this.size);
   },
   beforeUnmount() {
     this.unloadView();
@@ -136,5 +137,7 @@ export default {
 </script>
 
 <template>
-  <div :jsv_innerview="viewId"></div>
+  <div 
+    :style="{width: size.width, height: size.height}"
+    :jsv_innerview="viewId"></div>
 </template>