@shijiu/jsview-vue 0.9.783 → 0.9.804

package/samples/GiftRain/components/SpriteTranslate.vue

@@ -0,0 +1,72 @@
+<template>
+    <JsvActorMove :key="`translate${item.key}`" ref="translateF"
+        :style="{ left: item.left, top: item.top, width: item.width, height: item.height }" :control="_Control">
+        <div :key="`bg${item.key}`" ref="translate"
+            :style="{ backgroundImage: `url(${item.src})`, left: 0, top: 0, width: item.width, height: item.height }" />
+    </JsvActorMove>
+</template>
+
+<script setup>
+import { shallowRef, defineProps, onMounted, onBeforeMount } from 'vue';
+import { JsvActorMove, JsvActorMoveControl, createImpactTracer, createImpactCallback, createImpactAutoFroze } from 'jsview'
+//定义子ref
+let translate = shallowRef(null)
+//定义父ref
+let translateF=shallowRef(null)
+//定义props
+const props = defineProps({
+    onDestory: Function,
+    item: Object,
+    onImpactTracer: Function,
+    MoneyBag: Object
+})
+const control = new JsvActorMoveControl();
+const _Control = control;
+const item = props.item;
+//销毁方法
+const _onDestroy = () => {
+    if (props.onDestory) {
+        props.onDestory(props.item.key);
+    }
+}
+
+let sensor = null;
+
+const _InitItemEle = (item, ele) => {
+    if (ele && !item.ele) {
+        item.ele = ele;
+        if (props.MoneyBag) {
+            const giftrain_sensor = createImpactTracer(props.MoneyBag, ele, createImpactCallback(
+                () => {
+                    props.onImpactTracer(item);
+                    _onDestroy();
+                },
+            ),        //碰撞即停
+                createImpactAutoFroze(
+                    [props.MoneyBag,translateF.value.mainDiv],
+                    null
+                )
+            );
+            sensor = giftrain_sensor;
+        }
+    }
+}
+
+
+//挂载时初始化
+onMounted(() => {
+    _InitItemEle(item, translate.value)
+    _Control.moveToY(720 * 1.5 + 30, 720 * 1.5 / item.duration, () => {
+        _onDestroy();
+    });
+})
+//卸载之前释放碰撞监听者
+onBeforeMount(()=>{
+    if(sensor!=null){
+    sensor.Recycle()
+    sensor=null
+    }
+})
+</script>
+
+<style lang="scss" scoped></style>

package/samples/GridDemo/Item.vue

@@ -69,6 +69,7 @@ onMounted(() => {
       height: 50,
       fontSize: '30px',
       color: '#FFFFFF',
+      whiteSpace: 'nowrap',
     }"
   >
     {{ userData.content }}

package/samples/ImpactStop/App.vue

@@ -362,7 +362,7 @@ onBeforeUnmount(() => {
       class="text"
       :style="{ top: 528, left: 40, width: 405, height: 40 }"
     >
-      JSV下,立刻起跳会精确到边缘
+    {{ "JSV下,立刻起跳会精确到边缘" }}
     </div>
 
     <div
@@ -370,7 +370,7 @@ onBeforeUnmount(() => {
       class="text"
       :style="{ top: 625, left: 370, width: 540, height: 40 }"
     >
-      左右键调整跳跃起点，按OK键进行跳跃
+    {{ "左右键调整跳跃起点，按OK键进行跳跃" }}
     </div>
     <div
       key="DirectText"

package/samples/Swiper/App.vue

@@ -139,7 +139,7 @@ onMounted(() => {
               dataIndex == currentIndex
                 ? 'rgba(100, 100, 100, 0.7)'
                 : '#ff0000',
-            borderRadius: '15px',
+            borderRadius: 10,
           }"
         ></div>
       </template>

package/utils/JsViewPlugin/JsvAudio/AudioProxy.js

@@ -247,8 +247,24 @@ class AudioProxy {
   get currentTime() { return this.getProperty("currentTime"); }
 
   setSrc(url, head) {
+    if (!url) {
+      console.error("JsvAudio: src is null");
+      return;
+    }
+    let realUrl = url.trim();
+    if (window.JsView) {
+      // jsview上
+      if (realUrl.startsWith("/") || realUrl.startsWith("file://")) {
+        //本地文件
+        realUrl = url;
+      } else {
+        realUrl = new window.JsView.Dom.UrlRef(url).href;
+      }
+    } else {
+      realUrl = url;
+    }
     const param = {
-      url: url,
+      url: realUrl,
       head: JSON.stringify(head),
     };
     this.setProperty("src", param);

package/utils/JsViewPlugin/JsvAudio/JsvAudio.vue

@@ -92,22 +92,6 @@ export default {
         return {};
       },
     },
-    /**
-     * 属性，Boolean类型，活跃状态
-     */
-    active: { type: Boolean, default: true },
-  },
-
-  watch: {
-    active(newValue) {
-      console.log("active newValue: " + newValue);
-      if (this.audio) {
-        if (newValue) {
-          //同key的player切换时需要切换回调
-          this.registerEvent();
-        }
-      }
-    },
   },
   setup() {
     return {
@@ -122,26 +106,22 @@ export default {
     console.log("player key:" + key);
 
     this.audio = sAudioManager.createAudio(key);
+    this.registerEvent();
+    if (this.src && this.src !== "") {
+      this.audio.src = this.src;
+    }
 
-    if (this.active) {
-      this.registerEvent();
-      if (this.src && this.src !== "") this.audio.src = this.src;
-
-      if (this.currentTime !== 0) this.audio.currentTime = this.currentTime;
-
-      if (this.autoplay) {
-        this.audio.autoplay = this.autoplay;
-      }
-
-      if (this.muted) {
-        this.audio.muted = this.muted;
-      }
+    if (this.autoplay) {
+      this.audio.autoplay = this.autoplay;
+    }
 
-      if (this.loop) {
-        this.audio.loop = this.loop;
-      }
+    if (this.muted) {
+      this.audio.muted = this.muted;
     }
 
+    if (this.loop) {
+      this.audio.loop = this.loop;
+    }
     this.onRef?.(this.audio);
   },
 
@@ -154,13 +134,10 @@ export default {
 
   methods: {
     registerEvent() {
-      if (this.audio && this.active) {
+      if (this.audio) {
         this.audio.addEventListener("end", this.onEnded);
         this.audio.addEventListener("error", this.onError);
-        this.audio.addEventListener("loadstart", () => {
-          console.log("JsAudio received loadstart event.");
-          this.onLoadStart();
-        });
+        this.audio.addEventListener("loadstart", this.onLoadStart);
         this.audio.addEventListener("loadedmetadata", this.onLoadedMetaData);
         this.audio.addEventListener("load", this.onLoad);
         this.audio.addEventListener("audiofocusloss", this.onAudioFocusLoss);
@@ -172,5 +149,5 @@ export default {
 </script>
 
 <template>
-  <div :style="{width: 1, height: 1}" backgroundColor="rgba(0,0,0,1)"></div>
+  <div :style="{ width: 1, height: 1 }" backgroundColor="rgba(0,0,0,1)"></div>
 </template>

package/utils/JsViewPlugin/JsvAudio/version.js

@@ -3,17 +3,17 @@
  * @Date: 2023-02-22 18:22:26
  * @Description: file content
  */
-let PluginInfo={
+let PluginInfo = {
     // downloadUrl:"http://192.168.0.63:8080/plugin/JsvAudio-164.zip", //插件下载地址
-    packageName:"com.qcode.jsvaudio",
-    name:"音频插件",
-    version:"1.0.1",  //插件需要的版本号
-    versionCodeMin:1,
-    versionCodeMax:1,
-    bridgeName:"jsvAudioBridge", //插件bridge注册到jsview的名称
-    className:"com.qcode.jsvaudio.JsvAudio",  //插件初始化类名称
-    initMethod:"createInstance",   //插件初始化方法
-    listener:"top.JsvAudioPluginLoadResult",  //插件加载结果回调
+    packageName: "com.qcode.jsvaudio",
+    name: "音频插件",
+    version: "1.0.19",  //插件需要的版本号
+    versionCodeMin: 19,
+    versionCodeMax: 19,
+    bridgeName: "jsvAudioBridge", //插件bridge注册到jsview的名称
+    className: "com.qcode.jsvaudio.JsvAudio",  //插件初始化类名称
+    initMethod: "createInstance",   //插件初始化方法
+    listener: "top.JsvAudioPluginLoadResult",  //插件加载结果回调
     listener2: "top.JsvAudioPluginStatus",
     // debug:true,
     // md5:"baafc8ea737adcad5443f44cc0112498"

package/utils/JsViewPlugin/JsvPlayer/version.js

@@ -1,17 +1,17 @@
 let PluginInfo={
-    // downloadUrl:"http://10.61.2.170:8080/plugin/JsvPlayer-194.zip", //插件下载地址
+    // downloadUrl:"http://192.168.0.85:8080/plugin/JsvPlayer-199.zip", //插件下载地址
     packageName:"com.qcode.jsvplayer",
     name:"播放器插件",
-    version:"1.9.8",  //插件需要的版本号
-    versionCodeMin:198,
-    versionCodeMax:198,
+    version:"2.0.2",  //插件需要的版本号
+    versionCodeMin:202,
+    versionCodeMax:202,
     bridgeName:"jsvPlayerBridge", //插件bridge注册到jsview的名称
     className:"com.qcode.jsvplayer.JsvPlayer",  //插件初始化类名称
     initMethod:"createInstance",   //插件初始化方法
     listener:"top.JsvPlayerPluginLoadResult",  //插件加载结果回调
     listener2: "top.JsvPlayerPluginStatus",
     // debug:true,
-    md5:"2e7ee4fa5776346ecf2d4cecf002d74c"
+    md5:"6de8d620492bf0143bbccc62636a6271"
 };
 
 // 不要用export default，update-env脚本不能解析

package/utils/JsViewVueTools/JsvTextTools.js

@@ -5,6 +5,8 @@
  * @LastEditTime: 2023-03-09 13:34:59
  * @Description: file content
  */
+import { Forge } from "../../dom/jsv-forge-define";
+
 const getTextWidth = (text, style) => {
   const textParams = {
     str: text ? text : "",

package/utils/JsViewVueWidget/JsvActorMove/JsvActorMove.vue

@@ -35,7 +35,7 @@
 -->
 <script setup>
 import JsvActorMoveControl from "./JsvActorMoveControl";
-import { shallowRef, onMounted } from "vue";
+import { shallowRef, onMounted, defineProps, defineExpose } from "vue";
 
 const props = defineProps({
   control: {

package/utils/JsViewVueWidget/JsvFilterView.vue

@@ -12,7 +12,7 @@
 -->
 <script setup>
 import { Forge, ForgeExtension } from "../../dom/jsv-forge-define";
-import { onBeforeUnmount, watchEffect } from "vue";
+import { onBeforeUnmount, watchEffect, defineProps } from "vue";
 
 const props = defineProps({
   width: {

package/utils/JsViewVueWidget/JsvMarquee.vue

@@ -14,7 +14,7 @@
 <script setup>
 import { Forge } from "../../dom/jsv-forge-define";
 import { TextTools } from "../JsViewVueTools/JsvTextTools";
-import { shallowRef, computed, toRaw, onMounted, onBeforeUnmount } from "vue";
+import { shallowRef, computed, toRaw, onMounted, onBeforeUnmount, defineProps } from "vue";
 
 const defaultFontStyle = () => {
   return {

package/utils/JsViewVueWidget/JsvNinePatch.vue

@@ -17,7 +17,7 @@
 -->
 
 <script setup>
-import { ref, watchEffect, computed } from "vue";
+import { ref, watchEffect, computed, defineProps } from "vue";
 
 const props = defineProps({
   style: {

package/utils/JsViewVueWidget/JsvPosterDiv.vue

@@ -10,7 +10,7 @@
 -->
 <script setup>
 
-import { reactive, watchEffect } from "vue";
+import { reactive, watchEffect, defineProps } from "vue";
 
 const props = defineProps({
   style: Object,

package/utils/JsViewVueWidget/JsvPosterImage.vue

@@ -8,7 +8,7 @@
 
 <script setup>
 
-import { reactive, watchEffect } from "vue";
+import { reactive, watchEffect, defineProps } from "vue";
 
 const props = defineProps({
   colorSpace: {

package/utils/JsViewVueWidget/JsvSpray/JsvSpray.vue

@@ -57,7 +57,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, ignoreClip);
+  const spray_view = new Forge.SprayView(texture_setting);
   const add_num_per_frame = sprayStyle.addNumSpeed
     ? sprayStyle.addNumSpeed
     : 0.001;
@@ -67,6 +67,24 @@ let buildForgeView = (pointRes, sprayStyle, sizeRef, ignoreClip) => {
     typeof sprayStyle.accelerateY !== "undefined"
       ? sprayStyle.accelerateY
       : -100;
+  let angularVelocityMin = 0,
+    angularVelocityMax = 0;
+  if (
+    typeof sprayStyle.angularVelocityMin === "number" &&
+    typeof sprayStyle.angularVelocityMax === "number"
+  ) {
+    angularVelocityMin = sprayStyle.angularVelocityMin;
+    angularVelocityMax = sprayStyle.angularVelocityMax;
+  }
+  let alphaMin = 1,
+    alphaMax = 1;
+  if (
+    typeof sprayStyle.alphaMin === "number" &&
+    typeof sprayStyle.alphaMax === "number"
+  ) {
+    alphaMin = sprayStyle.alphaMin;
+    alphaMax = sprayStyle.alphaMax;
+  }
   spray_view.SetSprayInfo(
     sprayStyle.type,
     sprayStyle.particleNum,
@@ -83,7 +101,12 @@ let buildForgeView = (pointRes, sprayStyle, sizeRef, ignoreClip) => {
     accelerate_x,
     accelerate_y,
     sprayStyle.enableFade,
-    sprayStyle.enableShrink
+    sprayStyle.enableShrink,
+    ignoreClip,
+    angularVelocityMin,
+    angularVelocityMax,
+    alphaMin,
+    alphaMax
   );
   const view_width =
     sprayStyle.deltaWidth === 0 ? 1 : 2 * sprayStyle.deltaWidth;
@@ -109,13 +132,13 @@ export default {
     ignoreClip: {
       type: Boolean,
       default: false,
-    }
+    },
   },
   data() {
     return {
       size: {
         width: 0,
-        height: 0
+        height: 0,
       },
       viewId: -1,
     };
@@ -129,11 +152,21 @@ export default {
     },
   },
   created() {
-    this.viewId = buildForgeView(this.pointRes, this.sprayStyle, this.size, this.ignoreClip);
+    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);
+    this.viewId = buildForgeView(
+      this.pointRes,
+      this.sprayStyle,
+      this.size,
+      this.ignoreClip
+    );
   },
   beforeUnmount() {
     this.unloadView();
@@ -142,7 +175,8 @@ export default {
 </script>
 
 <template>
-  <div 
-    :style="{width: size.width, height: size.height}"
-    :jsv_innerview="viewId"></div>
+  <div
+    :style="{ width: size.width, height: size.height }"
+    :jsv_innerview="viewId"
+  ></div>
 </template>

package/utils/JsViewVueWidget/JsvTextBox.vue

@@ -12,7 +12,7 @@
 -->
 
 <script setup>
-import { ref, shallowRef, computed } from "vue";
+import { ref, shallowRef, computed, defineProps } from "vue";
 
 const props = defineProps({
   style: Object,

package/utils/JsViewVueWidget/JsvVisibleSensor/JsvVisibleSensor.vue

@@ -29,7 +29,7 @@
 </template>
 
 <script setup>
-import { reactive, ref, shallowRef, toRaw, watchEffect, onMounted, defineExpose } from 'vue'
+import { reactive, ref, shallowRef, toRaw, watchEffect, onMounted, defineProps, defineExpose } from 'vue'
 import { Forge } from "jsview/dom/jsv-forge-define";
 
 const props = defineProps({