@shijiu/jsview-vue 0.9.490 → 0.9.590

package/utils/JsViewPlugin/JsvPlayer/JsvPlayer.vue

@@ -22,6 +22,10 @@ export default {
 		 * 属性，int类型，底层使用的播放器类型。1：系统播放器；2:jsv播放器。默认2。
 		 */
 		playerType: {type: Number, default: 2},
+		/**
+		 * 属性，int类型，播放器解码方式。0：根据硬件能力自动匹配；1:硬解码；2:软解码。默认0（根据芯片能力自动匹配）。
+		 */
+		decodeType: {type: Number, default: 0},
 		/**
 		 * 属性，Boolean类型，层级关系，true表示在界面的下面，false表示在界面上面，默认true。
 		 */
@@ -222,7 +226,7 @@ export default {
 		let first_create = true;
 
 		if(!this.video){
-			this.video = new JsvMediaVideo(this.holeId, player_type, key, background, designMap.width);
+			this.video = new JsvMediaVideo(this.holeId, player_type, key, background, designMap.width, this.decodeType);
 		}else{
 			this.video.setRef();
 			first_create = false;

package/utils/JsViewPlugin/JsvPlayer/JsvPlayerBrowser.vue

@@ -8,25 +8,38 @@ export default {
     playerType: {type: Number, default: 1}, // PC 模拟时，不对接本功能
     background: {type: Boolean, default: true}, // PC 模拟时，不对接本功能
   },
+  setup() {
+    return {
+      VideoRef: null
+    };
+  },
   methods: {
     onRefProxy(video_ref) {
-        if (video_ref) {
-          // 补充插件扩展出来的接口
-          for (let method_name in playerExMethods) {
-              video_ref[method_name] = playerExMethods[method_name].bind(video_ref);
-          }
-        } else {
-          // video_ref为null，代表video标签卸载处理
-        }
+      this.VideoRef = video_ref;
 
-        // 将修改好的video回调返回给使用者
-        if (this.onRef) {
-            this.onRef(video_ref);
-        }
+      // 不在此直接回调 onRef，因为onRefProxy可能会因为 .src的设置导致重新触发一次调用(vue本身问题)
+      // 参照vue-core处理的 componentUpdateFn处理, onMounted 一次, src设置后会再次 onPatch 一次
     }  
   },
   mounted() {
+    if (this.VideoRef && this.onRef) {
+      let video_ref = this.VideoRef;
+      this.VideoRef = null;
+
+      // 补充插件扩展出来的接口
+      for (let method_name in playerExMethods) {
+          video_ref[method_name] = playerExMethods[method_name].bind(video_ref);
+      }
 
+      // 将修改好的video回调返回给使用者
+      this.onRef(video_ref);
+    }
+  },
+  beforeUnmount() {
+    if (this.onRef) {
+        // video_ref为null，代表video标签卸载处理
+        this.onRef(null);
+    }
   }
 };
 

package/utils/JsViewPlugin/JsvPlayer/version.js

@@ -1,17 +1,17 @@
 let PluginInfo={
-    //downloadUrl:"http://192.168.0.37:8080/plugin/JsvPlayer-6.0.zip", //插件下载地址
+    // downloadUrl:"http://192.168.0.34:8080/plugin/JsvPlayer-160.dat", //插件下载地址
     packageName:"com.qcode.jsvplayer",
     name:"播放器插件",
-    version:"1.4.8",  //插件需要的版本号
-    versionCodeMin:148,
-    versionCodeMax:148,
+    version:"1.6.2",  //插件需要的版本号
+    versionCodeMin:162,
+    versionCodeMax:162,
     bridgeName:"jsvPlayerBridge", //插件bridge注册到jsview的名称
     className:"com.qcode.jsvplayer.JsvPlayer",  //插件初始化类名称
     initMethod:"createInstance",   //插件初始化方法
     listener:"top.JsvPlayerPluginLoadResult",  //插件加载结果回调
     listener2: "top.JsvPlayerPluginStatus",
     // debug:true,
-    md5:"68be07d505e34d120ee95c5595ba6d73"
+    md5:"3efdfaa94325d7dbf81ae80fb4834143"
 };
 
 // 不要用export default，update-env脚本不能解析

package/utils/JsViewVueTools/JsvRefTaker.js

@@ -0,0 +1,35 @@
+
+/********************
+ * JsvRefTaker模块
+ * 
+ * 用于解决 script setup 写法，不容易通过 this.$ref.xxxx 拿到子模块的句柄，
+ * 但使用ref(null)的方式构筑的深度reactive对象又会严重影响element的内部处理性能的问题
+ * 
+ * 使用方法:
+ * <script setup>
+ * const element_ref = buildTaker();
+ * 
+ * onMounted(()=>{
+ *     // onMounted以后，可以用 .current 访问到引用
+ *     console.log(element.current)
+ * })
+ * </script>
+ * 
+ * <template>
+ *     <div :ref="element_ref.fnc" />
+ * </template>
+ * 
+ ********************/
+
+function buildTaker() {
+    let pack = {
+        fnc: null,
+        current: null
+    }
+    pack.fnc = (r)=>{
+        pack.current = r;
+    }
+    return pack;
+}
+
+export default buildTaker;

package/utils/JsViewVueTools/index.js

@@ -0,0 +1,19 @@
+/*
+ * @Author: ChenChanghua
+ * @Date: 2022-07-05 14:09:55
+ * @LastEditors: ChenChanghua
+ * @LastEditTime: 2022-07-06 11:03:34
+ * @Description: file content
+ */
+
+export * from "./JsvHashHistory";
+export * from "./JsvDynamicCssStyle.js";
+export * from "./JsvDynamicKeyFrames.js";
+export * from "./JsvRuntimeBridge.js";
+export * from "./NinePatchHelper";
+export * from "./TypeCheckAndSet";
+export * from "./JsvRefTaker.js";
+export * from "./JsvStyleClass.js";
+export * from "./DebugContentShellJBridge.js";
+export * from "./DebugTool.js";
+export { default as DefaultKeyCodeMap } from "./DefaultKeyMap.js";

package/utils/JsViewVueWidget/BrowserDebugWidget/BrowserQrcode.vue

@@ -4,16 +4,29 @@ export default {
     props: {
         value: String,
         size: Number,
-        fgColor: String,
-        bgColor: String,
-        level: String, // ，容错级别，分别是L(7%)、M(15%)、Q(25%)、H(30%),
+        fgColor: {
+            type: String,
+            default: "#000000"
+        },
+        bgColor: {
+            type: String,
+            default: "#ffffff"
+        },
+        level: {
+            type: String, // ，容错级别，分别是L(7%)、M(15%)、Q(25%)、H(30%),
+            default: "L"
+        },
         imageSettings: Object
     },
-    data() {
+    setup() {
         return {
             imageStyle: null,
+            qrcodeRes: null,
         }
     },
+    created() {
+        this.qrcodeRes = this.renderQrcode();
+    },
     methods: {
         convertStr(str) {
             let out = "";
@@ -90,7 +103,7 @@ export default {
             const imageSettings = props.imageSettings;
             const size = props.size;
             if (!imageSettings) {
-            return null;
+                return null;
             }
             const w = imageSettings.width;
             const h = imageSettings.height;
@@ -123,6 +136,8 @@ export default {
                     left: calculatedImageSettings.x + margin,
                     top: calculatedImageSettings.y + margin
                 }
+            } else {
+                this.imageStyle = {}
             }
             const fgPath = this.generatePath(cells, margin);
             return {numCells, fgPath};
@@ -133,16 +148,16 @@ export default {
 
 <template>
     <div>
-        <jsvsvg
+        <jsve-svg
             :type="'qrcode'"
             :shapeRendering="'crispEdges'"
             :height="size"
             :width="size"
-            :viewBox="'0 0 ' + renderQrcode().numCells + ' ' + renderQrcode().numCells"
+            :viewBox="'0 0 ' + qrcodeRes.numCells + ' ' + qrcodeRes.numCells"
         >
-            <jsvpath :fill="bgColor" :d="'M0,0 h' + renderQrcode().numCells + 'v' + renderQrcode().numCells + 'H0z'" />
-            <jsvpath :fill="fgColor" :d="renderQrcode().fgPath" />
-        </jsvsvg>
+            <jsve-path :fill="bgColor" :d="'M0,0 h' + qrcodeRes.numCells + 'v' + qrcodeRes.numCells + 'H0z'" />
+            <jsve-path :fill="fgColor" :d="qrcodeRes.fgPath" />
+        </jsve-svg>
         <div :style="imageStyle"></div>
     </div>
 </template>

package/utils/JsViewVueWidget/BrowserDebugWidget/JsvApic/BrowserApic.vue

@@ -120,5 +120,5 @@ export { LoopType };
 </script>
 
 <template>
-  <jsvcanvas :id="canvasId" :style="style" />
+  <jsve-canvas :id="canvasId" :style="style" />
 </template>

package/utils/JsViewVueWidget/JsvFilterView.vue

@@ -6,68 +6,76 @@
  *          height  {int}   高
  *          left    {int}   left位置
  *          top     {int}   top位置
- *      methods说明:
- *          enableFilter
-                @description 开关滤镜
-                @params {boolean} enable 滤镜是否生效
+ *          filterType  {String}  滤镜设置:
+ *                                null: 无滤镜
+ *                                "gray-down": 黑白滤镜(公祭日滤镜)
 -->
-<script>
+<script setup>
 import { Forge, ForgeExtension } from "../../dom/jsv-forge-define";
+import { onBeforeUnmount, watchEffect } from "vue";
 
-export default {
-  props: {
-    width: {
-      type: Number,
-    },
-    height: {
-      type: Number,
-    },
-    left: {
-      type: Number,
-      default: 0,
-    },
-    top: {
-      type: Number,
-      default: 0,
-    },
+const props = defineProps({
+  width: {
+    type: Number,
   },
-  setup() {
-    return {
-      filterView: null,
-    };
+  height: {
+    type: Number,
   },
-  created() {
-    this.filterView = new Forge.FilterView();
-    const view_store = ForgeExtension.RootActivity
-      ? ForgeExtension.RootActivity.ViewStore
-      : Forge.sViewStore;
-    this.viewId = view_store.add(
-      new Forge.ViewInfo(this.filterView, {
-        x: this.left,
-        y: this.top,
-        width: this.width,
-        height: this.height,
-      })
-    );
+  left: {
+    type: Number,
+    default: 0,
+  },
+  top: {
+    type: Number,
+    default: 0,
   },
-  beforeUnmount() {
-    const view_store = ForgeExtension.RootActivity
+  filterType: {
+    type: String,
+    default: null,
+  }
+});
+
+let filterView = new Forge.FilterView();
+const view_store = ForgeExtension.RootActivity
+  ? ForgeExtension.RootActivity.ViewStore
+  : Forge.sViewStore;
+
+let viewId = view_store.add(
+  new Forge.ViewInfo(filterView)
+);
+
+// 监控filter改变
+watchEffect(() => {
+  if (filterView) {
+    console.log(`filterType change to ${props.filterType}`)
+    switch (props.filterType) {
+      case "gray-down":
+        filterView.FilterSwitch(true);
+        break;
+      default:
+        filterView.FilterSwitch(false);
+    }
+  }
+});
+
+onBeforeUnmount(() => {
+  const view_store = ForgeExtension.RootActivity
       ? ForgeExtension.RootActivity.ViewStore
       : Forge.sViewStore;
-    view_store.remove(this.viewId);
-  },
-  methods: {
-    enableFilter(enable) {
-      if (this.filterView) {
-        this.filterView.FilterSwitch(enable);
-      }
-    },
-  },
-};
+  view_store.remove(viewId);
+});
+
 </script>
 
 <template>
-  <div :jsv_innerview="viewId">
+  <div 
+    :style="{
+      left: left,
+      top: top,
+      width: width,
+      height: height
+      }"
+    :jsv_innerview="viewId">
     <slot></slot>
   </div>
 </template>

package/utils/JsViewVueWidget/JsvGrid.vue

@@ -17,11 +17,18 @@
  *      gapInfo {Object} 格子间隔设置 {row: 行间距, colum: 列间距}
  *      verticalUpdate {boolean} 是否纵向滚动
  *      columnFirst {boolean} 单页是否列优先排布 
+ *      loopUpdate {boolean} 焦点移动到边界时循环滚动
  *      onEdge {function} 焦点移动到边缘时的回调
  *              @params {object} edgeInfo {
                                             "direction": {EdgeDirection}边缘方向, 
                                             "rect": 到达边缘时的区域{x: 0, y: 0, width: 0,height: 0}
                                           }
+ *      focusMoveType {int} 焦点移动的模式, 可通过 | 运算进行组合
+                            NO_ADJUST: 无特殊处理
+                            COLUMN_LOOP: 到达列首/尾后跳转到上/下一列, 只在水平滚动时生效
+                            ROW_LOOP: 到达行首/尾后跳转到上/下一行, 只在竖直滚动时生效
+                            COLUMN_FIND_NEAR: 一列中没有下一个元素时是否跳转到相邻列
+                            ROW_FIND_NEAR: 一行中没有下一个元素时是否跳转到相邻行
  *    methods:
         getFocusBlockRef
           @description 获取focusBlock的引用
@@ -38,7 +45,9 @@
                   {
                     dataIndex: {int} 当前格子数据的index,
                     gridIndex: {int} 当前格子的index,
+                    selected: {boolean} 格子是否选中
                     getCurrentFocusId: {function} 获取widget的当前焦点的dataIndex
+                    gridCoord: {{row: 0, column: 0}} 获取当前格子的行列坐标
                   }
  *    onAction: 单元格内控件需要通过onAction.register方法注册 item 的回调，回调函数有
                 onFocus， onBlur， onClick
@@ -84,7 +93,15 @@ class LineType extends UpdateType {
   }
 }
 
-export { PageType, LineType };
+const FocusMoveType = {
+  NO_ADJUST: 0x00000000,
+  COLUMN_LOOP: 0x00000001,
+  ROW_LOOP: 0x00000001 << 1,
+  COLUMN_FIND_NEAR: 0x00000001 << 2,
+  ROW_FIND_NEAR: 0x00000001 << 3,
+};
+
+export { PageType, LineType, FocusMoveType };
 
 export default {
   props: {
@@ -141,6 +158,14 @@ export default {
     onEdge: {
       type: Function,
     },
+    loopUpdate: {
+      type: Boolean,
+      default: false,
+    },
+    focusMoveType: {
+      type: Number,
+      default: FocusMoveType.NO_ADJUST,
+    },
   },
   setup(props) {
     return {
@@ -166,6 +191,11 @@ export default {
       this.focusDataIndex = this._indexConvert(this.initFocusId);
     }
     this._updateData(this._getStartIndex(this.focusDataIndex, 1));
+    if (this.divInfoList[this._getDivIndex(this.focusDataIndex)]) {
+      this.divInfoList[
+        this._getDivIndex(this.focusDataIndex)
+      ].widgetData.selected = true;
+    }
   },
   methods: {
     _getCurrentFocusId() {
@@ -196,6 +226,11 @@ export default {
               dataIndex: -1,
               gridIndex: i,
               getCurrentFocusId: this._getCurrentFocusId,
+              gridCoord: {
+                column: i % this.column,
+                row: Math.floor(i / this.column),
+              },
+              selected: false,
             }),
             userData: reactive({}),
           };
@@ -218,6 +253,11 @@ export default {
               dataIndex: -1,
               gridIndex: i,
               getCurrentFocusId: this._getCurrentFocusId,
+              gridCoord: {
+                column: Math.floor(i / this.row),
+                row: i % this.row,
+              },
+              selected: false,
             }),
             userData: reactive({}),
           };
@@ -349,56 +389,86 @@ export default {
     },
     _moveTo(hOffset, vOffset) {
       let nextIndex = -1;
+      let mainOffset, subOffset, lineNum, mainFindNear, subFindNear, lineLoop;
       if (this.verticalUpdate) {
-        if (hOffset != 0) {
-          if (
-            !(this.focusDataIndex % this.column == 0 && hOffset < 0) &&
-            !(
-              this.focusDataIndex % this.column == this.column - 1 &&
-              hOffset > 0
-            ) &&
-            this.dataList[this.focusDataIndex + hOffset]
-          ) {
-            nextIndex = this.focusDataIndex + hOffset;
-          }
-        }
-        if (vOffset != 0) {
-          nextIndex = this.focusDataIndex + vOffset * this.column;
-          if (nextIndex > 0 && !this.dataList[nextIndex]) {
-            if (nextIndex <= this.dataInfo.endIndex) {
-              nextIndex--;
-              while (!this.dataList[nextIndex]) {
-                nextIndex--;
+        mainOffset = vOffset;
+        subOffset = hOffset;
+        lineNum = this.column;
+        mainFindNear = this.focusMoveType & FocusMoveType.COLUMN_FIND_NEAR;
+        subFindNear = this.focusMoveType & FocusMoveType.ROW_FIND_NEAR;
+        lineLoop = this.focusMoveType & FocusMoveType.ROW_LOOP;
+      } else {
+        mainOffset = hOffset;
+        subOffset = vOffset;
+        lineNum = this.row;
+        mainFindNear = this.focusMoveType & FocusMoveType.ROW_FIND_NEAR;
+        subFindNear = this.focusMoveType & FocusMoveType.COLUMN_FIND_NEAR;
+        lineLoop = this.focusMoveType & FocusMoveType.COLUMN_LOOP;
+      }
+      if (mainOffset != 0) {
+        let i = this.focusDataIndex + mainOffset * lineNum;
+        if (this.dataList[i]) {
+          nextIndex = i;
+        } else if (i >= 0) {
+          //下一个为null, 找下一行的最后一个
+          if (mainFindNear) {
+            i = i - (i % this.column);
+            if (this.dataList[i]) {
+              while (this.dataList[i]) {
+                nextIndex = i;
+                i++;
               }
-            } else {
-              nextIndex = -1;
             }
           }
         }
-      } else {
-        if (vOffset != 0) {
-          if (
-            !(this.focusDataIndex % this.row == 0 && vOffset < 0) &&
-            !(this.focusDataIndex % this.row == this.row - 1 && vOffset > 0) &&
-            this.dataList[this.focusDataIndex + vOffset]
-          ) {
-            nextIndex = this.focusDataIndex + vOffset;
-          }
-        }
-        if (hOffset != 0) {
-          nextIndex = this.focusDataIndex + hOffset * this.row;
-          if (nextIndex >= 0 && !this.dataList[nextIndex]) {
-            if (nextIndex <= this.dataInfo.endIndex) {
-              nextIndex--;
-              while (!this.dataList[nextIndex]) {
-                nextIndex--;
+      }
+
+      if (subOffset != 0) {
+        let i = (this.focusDataIndex % lineNum) + subOffset;
+        if (
+          i >= 0 &&
+          i < lineNum &&
+          this.dataList[this.focusDataIndex + subOffset]
+        ) {
+          nextIndex = this.focusDataIndex + subOffset;
+        } else {
+          if (lineLoop) {
+            i =
+              this.focusDataIndex +
+              subOffset * lineNum -
+              (this.focusDataIndex % lineNum);
+            if (subOffset < 0) {
+              //往前是到上一行末尾
+              i = i + lineNum - 1;
+            }
+            if (this.dataList[i]) {
+              nextIndex = i;
+            }
+          } else if (subFindNear) {
+            //只有未到边界时才找临近
+            if (i >= 0 && i < lineNum) {
+              for (
+                i = this.focusDataIndex + subOffset;
+                i >= this.startIndex;
+                i -= lineNum
+              ) {
+                if (this.dataList[i]) {
+                  nextIndex = i;
+                  break;
+                }
               }
-            } else {
-              nextIndex = -1;
             }
           }
         }
       }
+
+      if (nextIndex < 0 && this.loopUpdate) {
+        if (this.verticalUpdate && vOffset != 0) {
+          nextIndex = vOffset > 0 ? 0 : this.dataInfo.endIndex;
+        } else if (!this.verticalUpdate && hOffset != 0) {
+          nextIndex = hOffset > 0 ? 0 : this.dataInfo.endIndex;
+        }
+      }
       if (nextIndex >= 0) {
         let offset;
         if (hOffset !== 0) {
@@ -414,10 +484,16 @@ export default {
             this._getDivIndex(this.preFocusDataIndex)
           ]?.onAction.onBlur?.();
         }
+        this.divInfoList[
+          this._getDivIndex(this.preFocusDataIndex)
+        ].widgetData.selected = false;
         this._updateData(this._getStartIndex(nextIndex, offset));
         this.divInfoList[
           this._getDivIndex(this.focusDataIndex)
         ]?.onAction.onFocus?.();
+        this.divInfoList[
+          this._getDivIndex(this.focusDataIndex)
+        ].widgetData.selected = true;
       } else {
         let edgeDirection;
         if (hOffset > 0) {
@@ -503,12 +579,23 @@ export default {
           //焦点跳跃时之前的焦点可能不在divInfoList中
           this.divInfoList[this._getDivIndex(preIndex)]?.onAction.onBlur?.();
         }
+        if (this.divInfoList[this._getDivIndex(preIndex)]) {
+          this.divInfoList[
+            this._getDivIndex(preIndex)
+          ].widgetData.selected = false;
+        }
+
         this._updateData(this._getStartIndex(this.focusDataIndex, 1));
         if (this.focused) {
           this.divInfoList[
             this._getDivIndex(this.focusDataIndex)
           ]?.onAction.onFocus?.();
         }
+        if (this.divInfoList[this._getDivIndex(this.focusDataIndex)]) {
+          this.divInfoList[
+            this._getDivIndex(this.focusDataIndex)
+          ].widgetData.selected = true;
+        }
       }
     },
 
@@ -519,6 +606,12 @@ export default {
           this._getDivIndex(this.focusDataIndex)
         ]?.onAction.onBlur?.();
       }
+      if (this.divInfoList[this._getDivIndex(this.focusDataIndex)]) {
+        this.divInfoList[
+          this._getDivIndex(this.focusDataIndex)
+        ].widgetData.selected = false;
+      }
+
       this._formatData();
       this.startIndex = -1;
       this._cleanOldData();
@@ -532,6 +625,11 @@ export default {
           this._getDivIndex(this.focusDataIndex)
         ]?.onAction.onFocus?.();
       }
+      if (this.divInfoList[this._getDivIndex(this.focusDataIndex)]) {
+        this.divInfoList[
+          this._getDivIndex(this.focusDataIndex)
+        ].widgetData.selected = true;
+      }
     },
   },
 };
@@ -559,7 +657,7 @@ export default {
         top: item.top,
         width: itemSize.width,
         height: itemSize.height,
-        visibility: item.widgetData.visibility ? 'visible' : 'hidden',
+        visibility: item.widgetData.visibility ? 'inherit' : 'hidden',
       }"
     >
       <slot

package/utils/JsViewVueWidget/JsvMaskClipDiv.vue

@@ -134,7 +134,7 @@ export default {
         // 初始化View
         this.innerView = new Forge.LayoutView();
         this.innerViewId = ForgeExtension.RootActivity.ViewStore.add(
-          new Forge.ViewInfo(this.innerView, null)
+          new Forge.ViewInfo(this.innerView)
         );
       }
 
@@ -211,6 +211,8 @@ export default {
     :style="{
       top: style.top,
       left: style.left,
+      width: style.width,
+      height: style.height
     }"
   ></div>
 </template>