@shijiu/jsview-vue 2.3.0 → 2.3.151-test.0

package/utils/JsViewVueTools/JsvRuntimeBridge.js

@@ -112,6 +112,31 @@ function openWindow(url, startup_image, startup_video, startup_duration, add_his
     return window.jJsvRuntimeBridge.openWindow(url, JSON.stringify(setting))
 }
 
+/**
+ * 打开另外一个小程序
+ * @param {string} url 小程序url
+ * @param {string} startup_image 启动图url
+ * @param {string} startup_video 启动视频url
+ * @param {int} startup_duration 启动图时长，默认0
+ * @param {int} add_history 是否添加历史，0不添加，1添加
+ * @returns {Promise} 
+ */
+function openApp(url, startup_image, startup_video, startup_duration, add_history) {
+    let setting = {};
+    if (startup_image !== null && startup_image !== "")
+        setting.startupImage = startup_image;
+
+    if (startup_video !== null && startup_video !== "") {
+        setting.startupVideo = startup_video;
+    }
+
+    setting.startupDuration = startup_duration;
+    setting.addHistory = (add_history ? 1 : 0); // 兼容true/false传值
+
+    // direct_call("openWindow", url, JSON.stringify(setting));
+    return window.jJsvRuntimeBridge.openApp(url, JSON.stringify(setting))
+}
+
 /**
  * 用新的进程打开另外一个小程序
  * @param {string} url 小程序url
@@ -136,6 +161,30 @@ function startUrlInNewTab(url, startup_image, startup_video, startup_duration, a
     return window.jJsvRuntimeBridge.startUrlInNewTab(url, JSON.stringify(setting))
 }
 
+/**
+ * 用新的进程打开另外一个小程序
+ * @param {string} url 小程序url
+ * @param {string} startup_image 启动图url
+ * @param {string} startup_video 启动视频url
+ * @param {int} startup_duration 启动图时长，默认0
+ * @param {int} add_history 是否添加历史，0不添加，1添加
+ * @returns {Promise} 
+ */
+function openAppInNewTab(url, startup_image, startup_video, startup_duration, add_history) {
+    let setting = {};
+    if (startup_image !== null && startup_image !== "")
+        setting.startupImage = startup_image;
+
+    if (startup_video !== null && startup_video !== "") {
+        setting.startupVideo = startup_video;
+    }
+
+    setting.startupDuration = startup_duration;
+    setting.addHistory = (add_history ? 1 : 0); // 兼容true/false传值
+
+    return window.jJsvRuntimeBridge.openAppInNewTab(url, JSON.stringify(setting))
+}
+
 /**
  * 用于给上一个小程序返回结果，通常与startUrlInNewTab和openWindow配合使用
  * @param {string} data 返回给上一个小程序的结果
@@ -202,9 +251,10 @@ function getInstalledApps() {
  * @param {string} uri Uri方式启动
  * @param {Array} flags 数组，用于intent.addFlags
  * @param {Array} param JSON格式数组，数组元素是 object ，object中的内容用于intent.putExtra
+ * @param {Array} category string数组，用于intent.addCategory
  *
  */
-function startNativeApp(package_name, activity, action, uri, flags, param) {
+function startNativeApp(package_name, activity, action, uri, flags, param, category) {
     var obj = {};
     if (package_name !== null && package_name !== "")
         obj.packageName = package_name;
@@ -224,9 +274,52 @@ function startNativeApp(package_name, activity, action, uri, flags, param) {
     if (param !== null && param.length > 0)
         obj.param = param;
 
+    if (category!==null && category.length > 0)
+        obj.category = category
+
     direct_call("startNativeApp", JSON.stringify(obj));
 }
 
+/**
+ * 启动安卓APP
+ * @param {string} package_name 包名
+ * @param {string} activity Activity方式启动
+ * @param {string} action Action方式启动
+ * @param {string} uri Uri方式启动
+ * @param {Array} flags 数组，用于intent.addFlags
+ * @param {Array} param JSON格式数组，数组元素是 object ，object中的内容用于intent.putExtra
+ * @param {Array} category string数组，用于intent.addCategory
+ *
+ */
+function openNativeApp(package_name, activity, action, uri, flags, param, category) {
+    var obj = {};
+    if (package_name !== null && package_name !== "")
+        obj.packageName = package_name;
+
+    if (activity !== null && activity !== "")
+        obj.activity = activity;
+
+    if (action !== null && action !== "")
+        obj.action = action;
+
+    if (uri !== null && uri !== "")
+        obj.uri = uri;
+
+    if (flags !== null && flags.length > 0)
+        obj.flags = flags;
+
+    if (param !== null && param.length > 0)
+        obj.param = param;
+
+    if (category!==null && category.length > 0)
+        obj.category = category
+
+
+    // return window.jJsvRuntimeBridge.openNativeApp(JSON.stringify(obj));
+    return direct_call("openNativeApp", JSON.stringify(obj));
+}
+
+
 /**
  * 发送安卓广播
  * @param {string} package_name 包名
@@ -617,7 +710,9 @@ const bridge = {
     getDeviceUUID,
     getAndroidId,
     openWindow,
+    openApp,
     startUrlInNewTab,
+    openAppInNewTab,
     onWindowResult,
     reloadWindow,
     closePage,
@@ -625,6 +720,7 @@ const bridge = {
     getSystemProperty,
     getInstalledApps,
     startNativeApp,
+    openNativeApp,
     sendNativeBroadcast,
     startService,
     getDeviceInfo,

package/utils/JsViewVueTools/JsvTextTools.ts

@@ -24,7 +24,9 @@ declare interface FontStyleDefine {
  * @return {int} 文字宽度
  **/
 const getTextWidth = (text: string, style: FontStyleDefine) => {
-  let forgeRef = Forge;
+  if (text && typeof text != "string") {
+    text = "" + text; // 规避text为非字符串导致接口调用错误的问题
+  }
   return Forge.TextUtils.GetTextWidth(text, style);
 };
 

package/utils/JsViewVueTools/JsvTextureStore/CapturedTexture/CapturedTexture.ts

@@ -6,18 +6,19 @@ export type CapturedCallback = (
   textureAccessName: string,
   autoRecycleSet: boolean,
   width: number,
-  height: number) => void;
+  height: number,
+  isCannceled: boolean) => void;
 
 export class CapturedTexture extends TextureBase {
-  private _AutoRecycle: boolean;
   private _Callback: CapturedCallback | null;
   private _CaptureDiv: any;
   private _Canceled: boolean = false;
-
+  private _PostProcessParams: any = null;
   constructor(
     captureDiv: any,
     callback: CapturedCallback,
-    autoRecycle: boolean) {
+    autoRecycle: boolean,
+    postProcessParams: any = null) {
     super(null);
 
     // 激活引擎的功能支持
@@ -25,12 +26,14 @@ export class CapturedTexture extends TextureBase {
 
     this._CaptureDiv = captureDiv;
     this._Callback = callback;
-    this._AutoRecycle = autoRecycle;
+    this.autoRecycle = autoRecycle;
+    this._PostProcessParams = postProcessParams;
   }
 
   // 清理对Callback和div的引用，防止泄露
   cancel() {
     if (!this._Canceled) {
+      this._Callback?.("", this.autoRecycle, 0, 0, true);
       this._Callback = null;
       this._CaptureDiv = null;
       this._Canceled = true;
@@ -47,18 +50,18 @@ export class CapturedTexture extends TextureBase {
           return;
         }
 
-        // 处理自动回收
-        if (!this._AutoRecycle) {
-          this.addToStore(); // 用TextureStore来跟进引用状态
-        }
+        //由于自动回收是三帧后回收, 所以需要先添加到store
+        this.addToStore();
 
         // 回调
         this._Callback?.(
           this.getStoreName(),
-          this._AutoRecycle,
+          this.autoRecycle,
           resultObj.width as number,
-          resultObj.height as number);
-      }
+          resultObj.height as number,
+          false);
+      },
+      this._PostProcessParams
     );
     return '';
   }

package/utils/JsViewVueTools/JsvTextureStore/DominantColor/GetDominantColor.ts

@@ -0,0 +1,36 @@
+import ForgeHandles from "../../../JsViewVueTools/ForgeHandles";
+/**
+ * 使用ForgeTexture获取图片的dominant color, 注意, 此方法会hold住texture资源, 需要保证组件unmount时调用释放处理
+ * @param src 图片的src
+ * @param cbk 回调函数, 参数: info
+ * @returns 用于cancel的句柄，当cancel时，会清理对div和Callback的引用
+ */
+export function getDominantColorByForgeTexture(
+  src: string,
+  cbk: (i: any) => void
+) {
+  if (!src) {
+    console.warn("getDominantColorByForgeTexture: src is empty");
+    return () => {};
+  }
+  const setting = { src };
+  let texture = (ForgeHandles.TextureManager as any).GetImageProcessTexture(
+    JSON.stringify(setting)
+  );
+  let canceled = false;
+  const callback = (info: any) => {
+    if (canceled) {
+      return;
+    }
+    cbk(info.extra);
+    texture?.RequestToUnload();
+    texture = null;
+  };
+  texture.DisableAutoRecycle();
+  texture.RegisterLoadImageCallback(src, callback, null);
+  return () => {
+    canceled = true;
+    texture?.RequestToUnload();
+    texture = null;
+  };
+}

package/utils/JsViewVueTools/JsvTextureStore/JsvTextureStore.ts

@@ -19,6 +19,7 @@
 import CanvasTexture from "./CanvasTexture/CanvasTexture";
 import { CapturedTexture, CapturedCallback } from "./CapturedTexture/CapturedTexture";
 import sStore from "./Store";
+import { getDominantColorByForgeTexture } from "./DominantColor/GetDominantColor";
 
 let sJsvTextureConst = {
     LEFT: 1,
@@ -65,14 +66,16 @@ let sTextureStoreApi = {
                                     不需要主动调用deleteTexture释放.
                                     false: 此场景在callback收到资源名后, 需要使用完毕后调用 deleteTexture 手动释放
                                     在手动释放之前，可以赋给其他div/img来复用 
+     * @param {any} postProcessParams 可选, 截图处理的参数
      * @return {CapturedTexture} 用于cancel的句柄，当cancel时，会清理对div和Callback的引用
      */
     capture2Texture: (
         captureDiv: any,
         callback: CapturedCallback,
-        autoRecycle: boolean = true): CapturedTexture => {
+        autoRecycle: boolean = true,
+        postProcessParams: any = null): CapturedTexture => {
 
-        let texture = new CapturedTexture(captureDiv, callback, autoRecycle);
+        let texture = new CapturedTexture(captureDiv, callback, autoRecycle, postProcessParams);
         texture.commit();
 
         return texture;
@@ -91,8 +94,26 @@ let sTextureStoreApi = {
             textureRef.recycle();
         }
     },
+
+    /**
+     * getDominantColor
+     * 获取图片的 dominant color
+     * 
+     * @param src 图片的src
+     * @param callback 回调函数, 参数: info
+     * @return 用于cancel的句柄，当cancel时，会清理对div和Callback的引用
+     */
+    getDominantColor: (src: string, callback: (info: any) => void) => {
+        return getDominantColorByForgeTexture(src, (i: any) => {
+            callback(i);
+        });
+    }
 }
 
+export enum CaptureProcessType {
+    Blur = 1,
+  }
+
 export {
     sTextureStoreApi as JsvTextureStoreApi,
     sJsvTextureConst as JsvTextureConst,

package/utils/JsViewVueTools/JsvTextureStore/Store.ts

@@ -1,32 +1,44 @@
 import { TextureBase } from "./Texture";
+import ForgeHandles from "../../JsViewVueTools/ForgeHandles";
 
 class JsvTextureStore {
-    private textureMap: Map<String, TextureBase> = new Map();
+  private textureMap: Map<String, TextureBase> = new Map();
+  private hasAutoRecycle: boolean = false;
 
-    constructor() {
+  constructor() { }
 
+  public addToStore(storeName: String, textureRef: TextureBase) {
+    if (!this.hasAutoRecycle && textureRef && textureRef.isAutoRecycle()) {
+      this.hasAutoRecycle = true;
+      ForgeHandles.sRenderBridge.AddWillSwapListener("jsv-texture-store", this.onWillSwap.bind(this));
     }
-
-    public addToStore(storeName: String, textureRef: TextureBase) {
-        this.textureMap.set(storeName, textureRef);
-    }
-
-    public getFromStore(storeName: String): TextureBase | undefined {
-        return this.textureMap.get(storeName);
-    }
-
-    public removeFromStore(storeName: String): TextureBase | undefined {
-        if (this.textureMap.has(storeName)) {
-            let textureBaseRef = this.textureMap.get(storeName);
-            this.textureMap.delete(storeName);
-            return textureBaseRef;
-        } else {
-            console.error(`Error: name=${storeName} not in map`);
-            return undefined;
-        }
+    this.textureMap.set(storeName, textureRef);
+  }
+
+  public getFromStore(storeName: String): TextureBase | undefined {
+    return this.textureMap.get(storeName);
+  }
+
+  public removeFromStore(storeName: String): TextureBase | undefined {
+    if (this.textureMap.has(storeName)) {
+      let textureBaseRef = this.textureMap.get(storeName);
+      this.textureMap.delete(storeName);
+      return textureBaseRef;
+    } else {
+      console.error(`Error: name=${storeName} not in map`);
+      return undefined;
     }
+  }
+
+  private onWillSwap() {
+    this.textureMap.forEach((texture, key) => {
+      if (texture && texture.isAutoRecycle()) {
+        texture.tryRecycle();
+      }
+    });
+  }
 }
 
 let sStore: JsvTextureStore = new JsvTextureStore();
 
-export default sStore;
+export default sStore;

package/utils/JsViewVueTools/JsvTextureStore/Texture.ts

@@ -1,53 +1,68 @@
 import sStore from "./Store";
 
+const AUTO_RECYCLE_DELAY = 3;
 export class TextureBase {
-    private baseName: String = 'T';
-    protected textureRef: any = null; // Forge.ImageTexture
-    public storeName: String = '';
-
-    constructor(baseName: String | null) {
-        if (baseName) {
-            this.baseName = baseName;
-        }
-    }
+  private baseName: String = "T";
+  protected textureRef: any = null; // Forge.ImageTexture
+  public storeName: String = "";
+  protected autoRecycle: boolean = false;
+  private autoRecycleDelay: number = AUTO_RECYCLE_DELAY;
 
-    protected addToStore() {
-        this.storeName = this.getStoreName();
-        this.textureRef.DisableAutoRecycle(); // 被store管理的，取消自动清理
-        sStore.addToStore(this.storeName, this);
+  constructor(baseName: String | null) {
+    if (baseName) {
+      this.baseName = baseName;
     }
+  }
 
-    protected getStoreName() {
-        return `${this.baseName}-${this.textureRef?.GetTextureId()}`;
+  tryRecycle() {
+    if (!this.autoRecycle) return;
+    this.autoRecycleDelay--;
+    if (this.autoRecycleDelay < 0) {
+      this.recycle();
     }
+  }
 
-    /**
-     * commit
-     * 完成绘制设置，出发制作目标texture
-     * 
-     * @return {String} BaseName-textureId 格式的名字，用于 jsvtexturestore:// 的访问链接
-     */
-    public commit(): String {
-        // Should override by extends to create Forge.ImageTexture -> textureRef
-        return this.storeName;
-    }
+  isAutoRecycle() {
+    return this.autoRecycle;
+  }
 
-    /**
-     * getTextureRef
-     * 内部接口，获取内联的Forge.ImageTexture的句柄
-     * 
-     * @return {String} BaseName-textureId 格式的名字，用于 jsvtexturestore:// 的访问链接
-     */
-    public getTextureRef(): any {
-        return this.textureRef;
-    }
+  protected addToStore() {
+    this.storeName = this.getStoreName();
+    this.textureRef.DisableAutoRecycle(); // 被store管理的，取消自动清理
+    sStore.addToStore(this.storeName, this);
+  }
+
+  protected getStoreName() {
+    return `${this.baseName}-${this.textureRef?.GetTextureId()}`;
+  }
+
+  /**
+   * commit
+   * 完成绘制设置，出发制作目标texture
+   *
+   * @return {String} BaseName-textureId 格式的名字，用于 jsvtexturestore:// 的访问链接
+   */
+  public commit(): String {
+    // Should override by extends to create Forge.ImageTexture -> textureRef
+    return this.storeName;
+  }
+
+  /**
+   * getTextureRef
+   * 内部接口，获取内联的Forge.ImageTexture的句柄
+   *
+   * @return {String} BaseName-textureId 格式的名字，用于 jsvtexturestore:// 的访问链接
+   */
+  public getTextureRef(): any {
+    return this.textureRef;
+  }
 
-    public recycle() {
-        // 释放native端的texture实体
-        let textureRef = sStore.removeFromStore(this.storeName);
-        if (textureRef) {
-            // 释放native端的texture实体
-            this.textureRef?.RequestToUnload();
-        }
+  public recycle() {
+    // 释放native端的texture实体
+    let textureRef = sStore.removeFromStore(this.storeName);
+    if (textureRef) {
+      // 释放native端的texture实体
+      this.textureRef?.RequestToUnload();
     }
+  }
 }

package/utils/JsViewVueWidget/JsvDashPath.vue

@@ -0,0 +1,150 @@
+<!--
+ * @file
+ * 
+ * 【模块 export 内容】
+ * JsvDashPath：Vue组件，用于绘制虚线路径
+ *      layout {Object}: (必填)组件位置，格式为 {left: number, top: number}
+ *      points {Array}: (必填)点数组，每个点包含 x 和 y 坐标，坐标是相对于layout中指定的left和top
+ *                     格式为 [{x: number, y: number}, ...]
+ *      dash {Array}: 虚线配置数组，例如 [10, 5] 表示10px实线，5px空白，默认值 [10, 10]
+ *      phase {Number}: 虚线起始位置偏移，默认值 0
+ *      color {String}: 线条颜色，默认值 "#FFFFFF"
+ *      lineWidth {Number}: 线条宽度，默认值 2
+ * 
+ * 注意事项:
+ *      组件会根据传入的points自动计算所需画布大小
+ *      组件会在卸载时自动清理创建的纹理资源
+ -->
+
+<template>
+  <div
+    :style="{
+      left: layout.left,
+      top: layout.top,
+    }"
+  >
+    <div
+      :style="{
+        left: canvasInfo.minX,
+        top: canvasInfo.minY,
+        width: canvasInfo.width,
+        height: canvasInfo.height,
+        backgroundImage: `url(jsvtexturestore://${sourceId})`,
+      }"
+    />
+  </div>
+</template>
+
+<script setup>
+import { JsvTextureStoreApi } from "../JsViewVueTools";
+import { onBeforeUnmount, computed } from "vue";
+
+const props = defineProps({
+  // 组件位置 {left: number, top: number}
+  layout: {
+    type: Object,
+    required: true,
+  },
+  // 点数组，每个点包含 x 和 y 坐标, 坐标是相对与layout中指定的left和top
+  points: {
+    type: Array,
+    required: true,
+    validator: (value) => {
+      return value.every((point) => "x" in point && "y" in point);
+    },
+  },
+  // 虚线配置，例如 [10, 5] 表示10px实线，5px空白
+  dash: {
+    type: Array,
+    default: () => [10, 10],
+  },
+  // 虚线起始位置偏移
+  phase: {
+    type: Number,
+    default: 0,
+  },
+  // 线条颜色
+  color: {
+    type: String,
+    default: "#FFFFFF",
+  },
+  // 线条宽度
+  lineWidth: {
+    type: Number,
+    default: 2,
+  },
+});
+
+// 计算坐标系调整值和画布尺寸
+const canvasInfo = computed(() => {
+  const xValues = props.points.map((p) => p.x);
+  const yValues = props.points.map((p) => p.y);
+
+  // 找出最小坐标值
+  const minX = Math.min(...xValues);
+  const minY = Math.min(...yValues);
+
+  // 计算偏移量（考虑线宽）
+  const lineOffset = Math.ceil(props.lineWidth / 2);
+
+  // 计算画布尺寸（考虑线宽）
+  const width = Math.max(...xValues) - minX + props.lineWidth * 2;
+  const height = Math.max(...yValues) - minY + props.lineWidth * 2;
+
+  return {
+    minX,
+    minY,
+    lineOffset,
+    width,
+    height,
+  };
+});
+
+// 创建画布纹理
+let sourceId = "";
+const canvasRef = JsvTextureStoreApi.canvasTexture(
+  canvasInfo.value.width,
+  canvasInfo.value.height
+);
+
+// 绘制透明背景
+canvasRef.drawColor("rgba(0,0,0,0)");
+
+// 创建自定义路径
+const path = canvasRef.customPath();
+
+// 移动到第一个调整后的点
+if (props.points.length > 0) {
+  const firstPoint = props.points[0];
+  path.moveTo(
+    firstPoint.x - canvasInfo.value.minX + canvasInfo.value.lineOffset,
+    firstPoint.y - canvasInfo.value.minY + canvasInfo.value.lineOffset
+  );
+
+  // 连接后续的调整后的点
+  for (let i = 1; i < props.points.length; i++) {
+    const point = props.points[i];
+    path.lineTo(
+      point.x - canvasInfo.value.minX + canvasInfo.value.lineOffset,
+      point.y - canvasInfo.value.minY + canvasInfo.value.lineOffset
+    );
+  }
+  path.close();
+}
+
+// 使用虚线样式绘制路径
+path.strokeWithSetting({
+  lineWidth: props.lineWidth,
+  color: props.color,
+  dash: props.dash,
+  phase: props.phase,
+});
+
+// 提交纹理并获取sourceId
+sourceId = canvasRef.commit();
+
+// 组件卸载时清理纹理
+onBeforeUnmount(() => {
+  JsvTextureStoreApi.deleteTexture(sourceId);
+});
+</script>

package/utils/JsViewVueWidget/JsvFlexCell/JsvFullScrAdjust.vue

@@ -145,7 +145,9 @@ defineExpose({
         transform: rScaleSet,
       }"
     >
-      <slot />
+      <div data-jsv-vw-as-bound-anchor="true">
+        <slot />
+      </div>
     </div>
   </jsv-screen-flex>
 </template>