@shijiu/jsview-vue 0.9.490 → 0.9.590

package/utils/JsViewEngineWidget/MetroWidget/PageUpdater.js

@@ -0,0 +1,136 @@
+/*
+ * @Author: ChenChanghua
+ * @Date: 2022-06-10 10:17:35
+ * @LastEditors: ChenChanghua
+ * @LastEditTime: 2022-06-10 10:17:36
+ * @Description: file content
+ */
+class ItemRange {
+  constructor(start, end) {
+    this.start = start;
+    this.end = end;
+  }
+
+  _merge(from, to) {
+    if (to.ifOverlap(from)) {
+      to.start = Math.min(from.start, to.start);
+      to.end = Math.max(from.end, to.end);
+      return true;
+    }
+    return false;
+  }
+
+  merge(from) {
+    let to = this.clone();
+    this._merge(from, to);
+    return to;
+  }
+
+  selfMerge(from) {
+    return this._merge(from, this);
+  }
+
+  ifOverlap(range) {
+    return this.start <= range.end && range.start <= this.end;
+  }
+
+  clone() {
+    return new ItemRange(this.start, this.end);
+  }
+}
+
+function mergeRangeList(list_1, list_2) {
+  const result_list = list_1.concat();
+  for (let list_2_item of list_2) {
+    let item = list_2_item.clone();
+    for (let i = result_list.length - 1; i >= 0; i--) {
+      if (item.selfMerge(result_list[i])) {
+        result_list.splice(i, 1);
+      }
+    }
+    result_list.push(item);
+  }
+  return result_list;
+}
+
+class PageUpdater {
+  constructor(update_func) {
+    this.tmpRangeList = [];
+    this.rangeList = [];
+
+    this._updateFunc = update_func;
+  }
+
+  update(
+    template,
+    visible_start,
+    visible_end,
+    anchor_id,
+    merge_tmp,
+    permanent_list,
+    extension_range = 0
+  ) {
+    if (!template || template.GetLength() === 0) return;
+    let visible_range = template.GetVisibleItemList(
+      visible_start - extension_range,
+      visible_end + extension_range,
+      anchor_id
+    );
+    if (!visible_range) {
+      return;
+    }
+    let pre_tmp = this.tmpRangeList;
+    let pre_list = this.rangeList;
+    let range = new ItemRange(
+      visible_range.visibleStart,
+      visible_range.visibleEnd
+    );
+    this.rangeList = [range];
+    if (permanent_list) {
+      let permanent_show_list = permanent_list.filter((item) => {
+        let result = false;
+        if (item.alreadyShow || item.index <= range.end) {
+          item.alreadyShow = true;
+          result = true;
+        }
+        return result;
+      });
+      let permanent_range_list = permanent_show_list.map((item) => {
+        return new ItemRange(item.index, item.index);
+      });
+      this.rangeList = mergeRangeList([range], permanent_range_list);
+    }
+    if (pre_list.length > 0) {
+      this.tmpRangeList = mergeRangeList(this.rangeList, pre_list);
+      if (merge_tmp) {
+        this.tmpRangeList = mergeRangeList(this.tmpRangeList, pre_tmp);
+      }
+    }
+  }
+
+  debugPrint() {
+    return (
+      "list: " +
+      JSON.stringify(this.rangeList) +
+      ", tmplist: " +
+      JSON.stringify(this.tmpRangeList)
+    );
+  }
+
+  apply() {
+    this.tmpRangeList = [];
+    this._updateFunc(this.rangeList);
+  }
+
+  applyTmp() {
+    if (this.tmpRangeList.length > 0) {
+      this._updateFunc(this.tmpRangeList);
+    }
+  }
+
+  getRange() {
+    return this.rangeList[0];
+  }
+}
+
+export { PageUpdater };

package/utils/JsViewEngineWidget/MetroWidget/ToolFunctions.js

@@ -0,0 +1,18 @@
+/*
+ * @Author: ChenChanghua
+ * @Date: 2022-06-17 15:51:19
+ * @LastEditors: ChenChanghua
+ * @LastEditTime: 2022-06-17 16:02:28
+ * @Description: file content
+ */
+const bindFunctions = (obj, target) => {
+  for (let key in obj) {
+    if (typeof obj[key] === "function") {
+      obj[key] = obj[key].bind(target);
+    } else if (typeof obj[key] === "object") {
+      bindFunctions(obj[key], target);
+    }
+  }
+};
+
+export { bindFunctions };

package/utils/JsViewEngineWidget/SimpleWidget/SimpleWidget.vue

@@ -65,6 +65,8 @@
  *      flingPageWidth {}
  *      flingPageEdge {}
  *    methods:
+        getFocusBlockRef 获取此SimpleWidget的 jsv-focus-block句柄，可以使用requestFocus完成获焦
+
         slideTo
           @description 滚动到指定位置
           @params {int} position 滚动目标位置

package/utils/JsViewEngineWidget/TemplateParser.js

@@ -172,6 +172,10 @@ class MetroTemplate {
 
     return this._IdsTotal;
   }
+
+  GetLastId() {
+    return this.IdsMap.length - 1;
+  }
 }
 
 class Fence {
@@ -1021,6 +1025,10 @@ class TemplateParser {
     return this._Template.List[this._Template.IdsMap[id]];
   }
 
+  GetLastId() {
+    return this._Template.GetLastId();
+  }
+
   GetItem(index) {
     return index >= 0
       ? this._Template.List[index]
@@ -1837,4 +1845,106 @@ class TemplateParser {
   }
 }
 
-export { TemplateParser };
+class TemplateItemAdder {
+  constructor(template_parser, data, measure_func, page_range, side_effect) {
+    this._TemplateParser = template_parser;
+    this._Data = data;
+    this._PageRange = page_range;
+    this._MeasureFunc = measure_func;
+    this._CurIndex = 0;
+    this._CurPage = 0;
+    this._KeyIndex = 0; //分页处的item
+    this._SideEffect = side_effect;
+    this._Key =
+      this._TemplateParser._Template.Orient.type === HORIZONTAL
+        ? "xPos"
+        : "yPos";
+  }
+
+  tryAddItem(cur_item = null, page_num = 1) {
+    let added = false;
+    if (
+      this._CurIndex < this._Data.length &&
+      (!cur_item ||
+        cur_item[this._Key] >= (this._CurPage - 1) * this._PageRange)
+    ) {
+      while (this._CurIndex < this._Data.length) {
+        let item = this._TemplateParser.ParseTemplateItem(
+          this._MeasureFunc(this._Data[this._CurIndex]),
+          this._Data[this._CurIndex]
+        );
+        this._SideEffect?.(item);
+        this._CurIndex++;
+        if (item[this._Key] >= (this._CurPage + page_num) * this._PageRange) {
+          this._CurPage += page_num;
+          break;
+        }
+      }
+      this._TemplateParser.CalculateNeighborWhenAddStop();
+      added = true;
+    }
+    // 添加完成需要计算neighbor
+    return added;
+  }
+
+  tryAddItemByPosition(position) {
+    const page_num = Math.ceil(position / this._PageRange + 1);
+    if (page_num > this._CurPage) {
+      this.tryAddItem(null, page_num - this._CurPage);
+    }
+  }
+
+  tryAddItemByIndex(index) {
+    let _index = Math.min(index, this._Data.length - 1);
+    let added = false;
+    while (this._CurIndex <= _index) {
+      added = true;
+      let item = this._TemplateParser.ParseTemplateItem(
+        this._MeasureFunc(this._Data[this._CurIndex]),
+        this._Data[this._CurIndex]
+      );
+      this._SideEffect?.(item);
+      this._CurIndex++;
+      if (item[this._Key] >= (this._CurPage + 1) * this._PageRange) {
+        this._CurPage++;
+      }
+    }
+    if (added) {
+      this._TemplateParser.CalculateNeighborWhenAddStop();
+    }
+    //再添加一屏
+    this.tryAddItem(this._TemplateParser.GetItem(index), 2);
+  }
+
+  tryAddItemById(id) {
+    let _id = Math.min(id, this._Data.length - 1); // id小于等于index, 因此为了避免过界取小值
+    const last_id = this._TemplateParser.GetLastId();
+    if (last_id < _id) {
+      let added = false;
+      let cur_id = last_id;
+      while (cur_id < _id && this._CurIndex < this._Data.length) {
+        added = true;
+        const item = this._TemplateParser.ParseTemplateItem(
+          this._MeasureFunc(this._Data[this._CurIndex]),
+          this._Data[this._CurIndex]
+        );
+        cur_id = item.id;
+        this._SideEffect?.(item);
+        if (item[this._Key] >= (this._CurPage + 1) * this._PageRange) {
+          this._CurPage++;
+        }
+        this._CurIndex++;
+      }
+      if (added) {
+        this._TemplateParser.CalculateNeighborWhenAddStop();
+      }
+    }
+    //再添加一屏
+    this.tryAddItem(this._TemplateParser.GetItemById(id), 2);
+  }
+
+  updateData(data) {
+    this._Data = data;
+  }
+}
+export { TemplateParser, TemplateItemAdder };

package/utils/JsViewEngineWidget/WidgetCommon.js

@@ -2,7 +2,7 @@
  * @Author: ChenChanghua
  * @Date: 2020-12-30 14:08:38
  * @LastEditors: ChenChanghua
- * @LastEditTime: 2022-01-21 13:50:45
+ * @LastEditTime: 2022-06-09 17:16:41
  * @Description: file content
  */
 class BaseDispatcher {
@@ -82,7 +82,7 @@ function getPositionRelativeToView(divElement, targetElement) {
     width: elementLayoutParams.Width,
     height: elementLayoutParams.Height,
   };
-  while (element.parentElement && element.parentElement !== targetElement) {
+  while (element && element !== targetElement) {
     position.left += element.style.left ? element.style.left : 0;
     position.top += element.style.top ? element.style.top : 0;
     element = element.parentElement;
@@ -185,6 +185,12 @@ class FixPositionSlide extends SlideSetting {
   }
 }
 
+// randomColor() {
+//   let randomColor = Math.round(Math.random() * 2 ** 24).toString(16);
+//   return (
+//     "#" + new Array(6 - randomColor.length).fill("0").join("") + randomColor
+//   );
+// },
 export {
   BaseDispatcher,
   EdgeDirection,

package/utils/JsViewEngineWidget/index.js

@@ -2,14 +2,14 @@
  * @Author: ChenChanghua
  * @Date: 2021-06-16 10:07:20
  * @LastEditors: ChenChanghua
- * @LastEditTime: 2022-03-08 15:52:24
+ * @LastEditTime: 2022-07-05 15:44:06
  * @Description: file content
  */
-
 export * from "./WidgetCommon";
 export * from "./SimpleWidget/Dispatcher";
 
 export { default as SimpleWidget } from "./MetroWidget/MetroWidget.vue";
-export { default as JsvFocusBlock } from "./JsvFocusBlock.vue";
 export { default as MetroWidget } from "./MetroWidget/MetroWidget.vue";
-export { jsvCreateFocusManager } from "./JsvFocusManager";
+
+export { default as JsvFocusBlock } from "./JsvFocusBlock.vue";
+export { jsvCreateFocusManager, useFocusHub } from "./JsvFocusManager";

package/utils/JsViewPlugin/JsvPlayer/GetVersion.js

@@ -4,7 +4,7 @@ function reconfigPluginInfo() {
     if(typeof window.jJsvRuntimeBridge!=='undefined' && window.jJsvRuntimeBridge && typeof window.jJsvRuntimeBridge.getPluginBaseUrl !== "undefined"){
         let plugin_base_url = window.jJsvRuntimeBridge.getPluginBaseUrl();
         if(plugin_base_url){
-            PluginInfo.downloadUrl = (plugin_base_url[plugin_base_url.length-1]==="/"?plugin_base_url:(plugin_base_url+"/"))+PluginInfo.packageName+"/JsvPlayer-"+PluginInfo.versionCodeMax+".zip?md5="+PluginInfo.md5;
+            PluginInfo.downloadUrl = (plugin_base_url[plugin_base_url.length-1]==="/"?plugin_base_url:(plugin_base_url+"/"))+PluginInfo.packageName+"/JsvPlayer-"+PluginInfo.versionCodeMax+".dat?md5="+PluginInfo.md5;
         }
     }
 }