@shijiu/jsview-vue 2.1.200 → 2.1.339-test.0

package/utils/JsViewVueWidget/JsvVisibleSensor/index.js

@@ -1,4 +1,4 @@
-//考虑到.vue文件除了export default的component外，还有可能export其他对象,因此使用import * as
+//! 考虑到.vue文件除了export default的component外，还有可能export其他对象,因此使用import * as
 import * as JsvVisibleSensor from "./JsvVisibleSensor.vue";
 
 let _JsvVisibleSensor = JsvVisibleSensor;

package/utils/JsViewVueWidget/index.js

@@ -7,7 +7,9 @@
  */
 export { default as JsvActorMove, JsvActorMoveControl } from "./JsvActorMove";
 export * from "./JsvFreeMoveActor";
-export { default as JsvApic, LoopType } from "./JsvApic";
+export { default as JsvApic } from "./JsvApic/JsvApic";
+export { default as JsvApic2 } from "./JsvApic/JsvApic2";
+export { LoopType, ApicEndState } from "./JsvApic/JsvCommonLoopToolBase.js";
 export { default as JsvInput, InputType } from "./JsvInput";
 export {
   default as JsvPreload,
@@ -16,7 +18,7 @@ export {
 } from "./JsvPreload";
 export { default as JsvQrcode } from "./JsvQrcode";
 export { default as JsvSpray } from "./JsvSpray";
-export { default as JsvSpriteAnim, SpriteController } from "./JsvSpriteAnim";
+export * from "./JsvSpriteAnim";
 export { default as JsvSwiper } from "./JsvSwiper";
 export { default as JsvSwiper3D } from "./JsvSwiper3D";
 export { default as JsvTextureAnim, TexAlignAnchor, DECORATE_NINEPATCH_ALPHA_MIX, DECORATE_BORDER_RADIUS } from "./JsvTextureAnim";
@@ -44,7 +46,9 @@ export { default as JsvRipple, JsvRippleShape } from "./JsvRipple"
 export { default as JsvLine } from "./JsvLine";
 export { default as JsvPieChart } from "./JsvPieChart.vue";
 export { default as JsvSector } from "./JsvSector.vue";
-// 合并透过层样例, 更便于有声音无画面问题的调试
+export { default as JsvConnectLine } from "./JsvConnectLine";
+export { default as JsvProgressBar } from "./JsvProgressBar.vue"
+//! 合并透过层样例, 更便于有声音无画面问题的调试
 import JsvNativeSharedDiv from "./JsvNativeSharedDiv.vue";
 export {
   JsvNativeSharedDiv as JsvTransparentDiv,

package/utils/index.js

@@ -0,0 +1,4 @@
+export * from "./JsViewEngineWidget";
+export * from "./JsViewPlugin";
+export * from "./JsViewVueTools";
+export * from "./JsViewVueWidget";

package/utils/JsViewVueWidget/JsvApic/BrowserApic/LoopToolBase.js

@@ -1,25 +0,0 @@
-/*
- * @Author: ChenChanghua
- * @Date: 2021-10-13 14:01:14
- * @LastEditors: ChenChanghua
- * @LastEditTime: 2021-10-13 15:20:48
- * @Description: file content
- */
-
-class LoopToolBase {
-  getNextIndex() {
-    return -1;
-  }
-  reset() {}
-}
-
-const LoopType = {
-  LOOP_DEFAULT: 0,
-  LOOP_INFINITE: 1,
-  LOOP_FINITE: 2,
-  LOOP_PART: 3,
-};
-
-export default LoopToolBase;
-
-export { LoopType };

package/utils/JsViewVueWidget/JsvApic/BrowserApic/PartLoopTool.js

@@ -1,119 +0,0 @@
-/*
- * @Author: ChenChanghua
- * @Date: 2021-10-13 14:01:36
- * @LastEditors: ChenChanghua
- * @LastEditTime: 2021-10-13 16:17:46
- * @Description: file content
- */
-import LoopToolBase from "./LoopToolBase";
-
-class PartLoopTool extends LoopToolBase {
-  constructor(info_list, frame_num) {
-    super();
-    if (info_list == null) {
-      console.error("PartLoopTool info is null.");
-      this.mDataError = true;
-      return;
-    }
-    this.mLoopPeriod = 0;
-    this.mFrameIndex = 0;
-
-    this.mCurLoopStartFrame = 0;
-    this.mCurLoopEndFrame = 0;
-    this.mCurLoopNum = 0;
-    this.mCurLoopCount = 0;
-
-    this.mDataError = false;
-    this.mFrameNum = frame_num;
-    this.mLoopInfo = info_list;
-    if (this.mLoopInfo.length > 0) {
-      let has_next = this.updateLoop();
-      if (!has_next) {
-        console.error("PartLoopTool init loop info error.", info_list);
-        this.mDataError = true;
-      }
-    } else {
-      console.error("PartLoopTool init loop info error.", info_list);
-      this.mDataError = true;
-    }
-  }
-
-  getNextIndex() {
-    if (this.mDataError) {
-      return -1;
-    }
-    let next_index = -1;
-    let loop_period_num = this.mLoopInfo.length;
-    if (this.mLoopPeriod < loop_period_num) {
-      if (this.mFrameIndex < this.mCurLoopEndFrame) {
-        next_index = this.mFrameIndex + 1;
-      } else {
-        if (this.mCurLoopNum <= 0) {
-          //无限循环
-          next_index = this.mCurLoopStartFrame;
-        } else {
-          this.mCurLoopCount++;
-          if (this.mCurLoopCount >= this.mCurLoopNum) {
-            //出当前循环更新循环信息
-            this.mLoopPeriod++;
-            if (this.mLoopPeriod < loop_period_num) {
-              let has_next = this.updateLoop();
-              if (has_next) {
-                this.mCurLoopCount = 0;
-                next_index = this.mFrameIndex + 1;
-              }
-            } else {
-              //所有循环已完成
-              if (this.mFrameIndex < this.mFrameNum - 1) {
-                next_index = this.mFrameIndex + 1;
-              }
-            }
-          } else {
-            next_index = this.mCurLoopStartFrame;
-          }
-        }
-      }
-    } else {
-      //所有循环已完成
-      if (this.mFrameIndex < this.mFrameNum - 1) {
-        next_index = this.mFrameIndex + 1;
-      }
-    }
-
-    if (next_index >= 0) {
-      this.mFrameIndex = next_index;
-    }
-    return next_index;
-  }
-
-  updateLoop() {
-    let loop = this.mLoopInfo[this.mLoopPeriod];
-    this.mCurLoopNum = loop[0];
-    this.mCurLoopStartFrame = loop[1];
-    this.mCurLoopEndFrame = loop[2];
-    if (
-      this.mCurLoopStartFrame >= this.mFrameNum ||
-      this.mCurLoopEndFrame >= this.mFrameNum
-    ) {
-      this.mDataError = true;
-      console.error("data error, frame number out of size.", this.mLoopInfo);
-      this.reset();
-      return false;
-    } else {
-      return true;
-    }
-  }
-
-  reset() {
-    this.mLoopPeriod = 0;
-    this.mFrameIndex = 0;
-    this.mCurLoopCount = 0;
-
-    let loop = this.mLoopInfo[this.mLoopPeriod];
-    this.mCurLoopNum = loop[0];
-    this.mCurLoopStartFrame = loop[1];
-    this.mCurLoopEndFrame = loop[2];
-  }
-}
-
-export default PartLoopTool;

package/utils/JsViewVueWidget/JsvApic/BrowserApic/Viewer.js

@@ -1,106 +0,0 @@
-/*
- * @Author: ChenChanghua
- * @Date: 2021-10-13 14:01:45
- * @LastEditors: ChenChanghua
- * @LastEditTime: 2021-10-13 17:09:17
- * @Description: file content
- */
-
-import { LoopType } from "./LoopToolBase";
-import PartLoopTool from "./PartLoopTool";
-import NormalLoopTool from "./NormalLoopTool";
-
-class Viewer {
-  constructor(
-    apic_data,
-    canvas,
-    listener,
-    auto_play,
-    loop_type,
-    loop_info_list
-  ) {
-    this._ApicData = apic_data;
-    this._Canvas = canvas;
-    this._Context = this._Canvas.getContext("2d");
-    this._Listener = listener;
-    this._TimeoutId = -1;
-
-    this._LoopType = loop_type;
-    this._LoopInfo = loop_info_list;
-    this._createLoopTool();
-    let duration = this.renderFrame(0);
-    if (auto_play) {
-      this._TimeoutId = setTimeout(() => {
-        this.renderLoop();
-      }, duration);
-      if (this._Listener?.onstart) {
-        this._Listener.onstart();
-      }
-    }
-  }
-
-  _createLoopTool() {
-    let loop_num = null;
-    switch (this._LoopType) {
-      case LoopType.LOOP_DEFAULT:
-      case LoopType.LOOP_INFINITE:
-      case LoopType.LOOP_FINITE:
-        loop_num =
-          this._LoopType == LoopType.LOOP_DEFAULT
-            ? this._ApicData.LoopCount
-            : this._LoopInfo[0][0];
-        this._LoopTool = new NormalLoopTool(
-          this._LoopType,
-          loop_num,
-          this._ApicData.FrameCount
-        );
-        break;
-      case LoopType.LOOP_PART:
-        this._LoopTool = new PartLoopTool(
-          this._LoopInfo,
-          this._ApicData.FrameCount
-        );
-        break;
-    }
-  }
-
-  stop() {
-    clearTimeout(this._TimeoutId);
-    if (this._Listener?.onend) {
-      this._Listener.onend();
-    }
-  }
-
-  play() {
-    clearTimeout(this._TimeoutId);
-    let duration = this.renderFrame(0);
-    this._LoopTool.reset();
-    this._TimeoutId = setTimeout(() => {
-      this.renderLoop();
-    }, duration);
-    if (this._Listener?.onstart) {
-      this._Listener.onstart();
-    }
-  }
-
-  renderLoop() {
-    let next_index = this._LoopTool.getNextIndex();
-    if (next_index < 0) {
-      console.log("loop finished");
-      if (this._Listener?.onend) {
-        this._Listener.onend();
-      }
-    } else {
-      let duration = this.renderFrame(next_index);
-      this._TimeoutId = setTimeout(() => {
-        this.renderLoop();
-      }, duration);
-    }
-  }
-
-  renderFrame(frame_index) {
-    return this._ApicData.toImage(frame_index, this._Canvas, this._Context);
-  }
-}
-
-export default Viewer;