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

package/utils/JsViewVueWidget/JsvSoundPool.js

@@ -49,22 +49,57 @@ class AudioController {
     this._SoundId = soundId;
     this._Url = url;
     this._StreamId = -1;
+    this._StreamStartTime = 0;
+    this._SubStreamId = -1; // 快速重复播放的第二路音轨
+    this._SubStreamStartTime = 0;
+    this._LatestStreamStartTime = 0;
 
     this._Rate = 1;
     this._Loop = 0;
     this._LeftVolume = 1;
     this._RightVolume = 1;
     this._Priority = 0;
+    this._FastRepeatGap = 0;
+  }
+
+  enableFastRepeat(mini_gap) {
+    this._FastRepeatGap = mini_gap;
   }
 
   /**
      * @description: 播放音频
      */
   play() {
+    if (this._FastRepeatGap == 0) {
+      this._playMainStream(0);
+    } else {
+      let now = Date.now();
+      if (now - this._LatestStreamStartTime > this._FastRepeatGap / 2 && now - this._StreamStartTime > this._FastRepeatGap) {
+        this._playMainStream(now);
+      } else {
+        if (now - this._LatestStreamStartTime > this._FastRepeatGap / 2 && now - this._SubStreamStartTime > this._FastRepeatGap) {
+          this._playSubStream(now);
+        }
+      }
+    }
+  }
+
+  _playMainStream(now) {
     if (this._StreamId !== -1) {
       this._SoundPool.stop(this._StreamId);
     }
     this._StreamId = this._SoundPool.play(this._SoundId, this._LeftVolume, this._RightVolume, this._Priority, this._Loop, this._Rate);
+    this._StreamStartTime = now;
+    this._LatestStreamStartTime = now;
+  }
+
+  _playSubStream(now) {
+    if (this._SubStreamId !== -1) {
+      this._SoundPool.stop(this._SubStreamId);
+    }
+    this._SubStreamId = this._SoundPool.play(this._SoundId, this._LeftVolume, this._RightVolume, this._Priority, this._Loop, this._Rate);
+    this._SubStreamStartTime = now;
+    this._LatestStreamStartTime = now;
   }
 
   /**
@@ -74,6 +109,11 @@ class AudioController {
     if (this._StreamId !== -1) {
       this._SoundPool.pause(this._StreamId);
     }
+    // 第二路直接停止即可
+    if (this._SubStreamId !== -1) {
+      this._SoundPool.stop(this._SubStreamId);
+      this._SubStreamId = -1;
+    }
   }
 
   /**
@@ -93,6 +133,10 @@ class AudioController {
       this._SoundPool.stop(this._StreamId);
       this._StreamId = -1;
     }
+    if (this._SubStreamId !== -1) {
+      this._SoundPool.stop(this._SubStreamId);
+      this._SubStreamId = -1;
+    }
   }
 
   /**
@@ -100,10 +144,8 @@ class AudioController {
      * @param {float} rate 播放的倍率
      */
   setRate(rate) {
+    // 在起播前设置
     this._Rate = rate;
-    if (this._Streamid !== -1) {
-      this._SoundPool.setRate(this._StreamId, this._Rate);
-    }
   }
 
   /**
@@ -112,11 +154,9 @@ class AudioController {
      * @param {float} rightVolume 右声道音量
      */
   setVolume(leftVolume, rightVolume) {
+    // 在起播前设置
     this._LeftVolume = leftVolume;
     this._RightVolume = rightVolume;
-    if (this._StreamId !== -1) {
-      this._SoundPool.setVolume(this._StreamId, this._LeftVolume, this._RightVolume);
-    }
   }
 
   /**
@@ -124,10 +164,8 @@ class AudioController {
      * @param {int} loop 循环次数
      */
   setLoop(loop) {
+    // 在起播前设置
     this._Loop = loop;
-    if (this._StreamId !== -1) {
-      this._SoundPool.setLoop(this._StreamId, this._Loop);
-    }
   }
 
   /**
@@ -135,10 +173,8 @@ class AudioController {
      * @param {int} priority 优先级
      */
   setPriority(priority) {
+    // 在起播前设置
     this._Priority = priority;
-    if (this._StreamId !== -1) {
-      this._SoundPool.setPriority(this._StreamId, this._Priority);
-    }
   }
 }
 
@@ -161,6 +197,30 @@ class JsvSoundPool {
      * @param {function} callback 资源加载完成回调 function(int state, AudioController controller) {}
      */
   request(url, netSetting, priority, callback) {
+    this._request(url, 0, netSetting, priority, callback);
+  }
+
+  /**
+     * @description: 准备音频资源
+     * @param {string} url 音频url
+     * @param {int} fastRepeatGap 最小间隔时间, 如果不为0则启用快速重复播放, 用两路音轨解决快速播放的漏音问题
+     * @param {string} netSetting http请求配置
+     * @param {int} priority 优先级
+     * @param {function} callback 资源加载完成回调 function(int state, AudioController controller) {}
+     */
+  requestInRepeatMode(url, fastRepeatGap, netSetting, priority, callback) {
+    this._request(url, fastRepeatGap, netSetting, priority, callback);
+  }
+
+  /**
+     * @description: 准备音频资源
+     * @param {string} url 音频url
+     * @param {int} repeatFastMiniGap 最小间隔时间, 如果不为0则启用快速重复播放, 用两路音轨解决快速播放的漏音问题
+     * @param {string} netSetting http请求配置
+     * @param {int} priority 优先级
+     * @param {function} callback 资源加载完成回调 function(int state, AudioController controller) {}
+     */
+  _request(url, repeatFastMiniGap, netSetting, priority, callback) {
     if (!supportSoundPool) {
       callback(-1, null);
       console.log("not support sound pool.");
@@ -181,6 +241,9 @@ class JsvSoundPool {
             referCount: 1
           };
           const controller = new AudioController(this._SoundPool, sound_id, realUrl);
+          if (repeatFastMiniGap > 0) {
+            controller.enableFastRepeat(repeatFastMiniGap);
+          }
           this._StreamIdMap.add(controller);
           callback(state, controller);
         } else {

package/utils/JsViewVueWidget/JsvSpray/JsvSpray.vue

@@ -13,6 +13,7 @@
  *          pointRes {string} (必需)粒子图案 可选值: 绝对路径url|url(相对路径url)|#FFFFFF|rbga(255,0,0,1.0)
  *          sprayStyle {object}  (必需)粒子效果配置
  *          ignoreClip {boolean} 无视clipView描画
+ *          onStop      {() => void} 停止喷射回调
  *
  * prop中的sprayStyle说明:
  *      type {int} (必需)喷射类型 0: 一次喷射 1: 持续喷射
@@ -38,13 +39,56 @@
  *      alphaMax {float} 透明度最大值, 默认为1
  *      angleMin {float} 角度最小值(角度)
  *      angleMax {float} 角度最大值(角度)
+ * 方法
+ *    start { () => void }
+ *      @descripe 开始喷射
+ *    stop { (immediate: boolean) => void }
+ *      @descripe 停止喷射
+ *      @param immediate { boolean } 是否立即消除粒子, false时会停止喷射,等待已有粒子消失
 -->
-<script>
+<script setup>
 import { Forge } from "@shijiu/jsview/dom/jsv-forge-define";
 import ForgeHandles from "../../JsViewVueTools/ForgeHandles";
 import { urlCheckSet } from "../../JsViewVueTools";
+import { ref, onBeforeUnmount, onUpdated, onMounted } from "vue";
 
-let buildForgeView = (pointRes, sprayStyle, sizeRef, ignoreClip) => {
+const props = defineProps({
+  pointRes: {
+    type: String,
+    required: true,
+  },
+  sprayStyle: {
+    type: Object,
+    required: true,
+  },
+  ignoreClip: {
+    type: Boolean,
+    default: false,
+  },
+  onStop: {
+    type: Function,
+    default: null,
+  },
+});
+
+const widthSize = ref(0);
+const heightSize = ref(0);
+let sprayView = null;
+
+function unloadView() {
+  if (viewId.value != -1) {
+    Forge.sViewStore.remove(viewId.value);
+    viewId.value = -1;
+  }
+}
+
+let buildForgeView = (
+  pointRes,
+  sprayStyle,
+  ignoreClip,
+  widthRef,
+  heightRef
+) => {
   if (!pointRes) {
     return -1;
   }
@@ -60,7 +104,7 @@ let buildForgeView = (pointRes, sprayStyle, sizeRef, ignoreClip) => {
       texture_manager.GetImage2(image_url, false, null, "RGB_8888", null)
     );
   }
-  const spray_view = new Forge.SprayView(texture_setting);
+  sprayView = new Forge.SprayView(texture_setting);
   let add_speed = 0.1;
   if (typeof sprayStyle.particleAddSpeed == "number") {
     add_speed = sprayStyle.particleAddSpeed;
@@ -113,7 +157,7 @@ let buildForgeView = (pointRes, sprayStyle, sizeRef, ignoreClip) => {
     }
   }
 
-  spray_view.SetSprayInfo(
+  sprayView.SetSprayInfo(
     sprayStyle.type,
     sprayStyle.particleNum,
     add_speed,
@@ -142,69 +186,63 @@ let buildForgeView = (pointRes, sprayStyle, sizeRef, ignoreClip) => {
     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 Forge.sViewStore.add(new Forge.ViewInfo(spray_view, null));
+  widthRef.value = view_width;
+  heightRef.value = view_height;
+  return Forge.sViewStore.add(new Forge.ViewInfo(sprayView, null));
 };
+const viewId = ref(
+  buildForgeView(
+    props.pointRes,
+    props.sprayStyle,
+    props.ignoreClip,
+    widthSize,
+    heightSize
+  )
+);
 
-export default {
-  props: {
-    pointRes: {
-      type: String,
-      required: true,
-    },
-    sprayStyle: {
-      type: Object,
-      required: true,
-    },
-    ignoreClip: {
-      type: Boolean,
-      default: false,
-    },
-  },
-  data() {
-    return {
-      size: {
-        width: 0,
-        height: 0,
-      },
-      viewId: -1,
-    };
-  },
-  methods: {
-    unloadView() {
-      if (this.viewId != -1) {
-        Forge.sViewStore.remove(this.viewId);
-        this.viewId = -1;
-      }
-    },
-  },
-  created() {
-    this.viewId = buildForgeView(
-      this.pointRes,
-      this.sprayStyle,
-      this.size,
-      this.ignoreClip
-    );
-  },
-  updated() {
-    this.unloadView();
-    this.viewId = buildForgeView(
-      this.pointRes,
-      this.sprayStyle,
-      this.size,
-      this.ignoreClip
-    );
-  },
-  beforeUnmount() {
-    this.unloadView();
-  },
-};
+function onStop() {
+  props.onStop?.();
+}
+
+sprayView.RegisterOnStop(onStop);
+sprayView.RegisterEventListener();
+
+function start() {
+  sprayView.Start();
+}
+
+function stop(immediate) {
+  sprayView.Stop(immediate);
+}
+
+onMounted(() => {
+  start();
+});
+
+onUpdated(() => {
+  unloadView();
+  viewId.value = buildForgeView(
+    props.pointRes,
+    props.sprayStyle,
+    props.ignoreClip,
+    widthSize,
+    heightSize
+  );
+});
+
+onBeforeUnmount(() => {
+  unloadView();
+});
+
+defineExpose({
+  start,
+  stop,
+});
 </script>
 
 <template>
   <div
-    :style="{ width: size.width, height: size.height }"
+    :style="{ width: widthSize, height: heightSize }"
     :data-jsv-vw-innerview="viewId"
   ></div>
 </template>