@shijiu/jsview-vue 2.0.999 → 2.0.1021

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shijiu/jsview-vue",
-  "version": "2.0.999",
+  "version": "2.0.1021",
   "license": "MIT",
   "repository": "system/jsview-framework",
   "author": "mengxk",

package/utils/JsViewEngineWidget/MetroWidget/MetroWidget.vue

@@ -135,6 +135,10 @@
         unlock
           @description 解锁
           @params {int} type 参考lock的type参数
+  slots:
+    renderItem: 该slot用于描画每个单元格
+    background: 该slot描画在item后, 一般用于描画需要跟随MetroWidget滚动的内容
+    foreground: 该slot描画在item前, 一般用于描画需要跟随MetroWidget滚动的内容
  * 【技巧说明】
  * Q: 插槽props如何使用？
  * A: data: 当前item的数据
@@ -1490,7 +1494,7 @@ const _calculateVisibleStart = (target_item, direction) => {
     new_visible_start =
       new_visible_start > boundary ? last_visible_start : new_visible_start;
   }
-  return new_visible_start;
+  return Math.round(new_visible_start);
 };
 
 const _onFocusableItemEdge = (edge_info) => {
@@ -1956,6 +1960,9 @@ defineExpose(exportObject);
           height: touchContainerH,
         }"
       >
+        <div>
+          <slot name="background"></slot>
+        </div>
         <div ref="locateDiv">
           <jsv-focus-block
             ref="focusNode"
@@ -2016,6 +2023,9 @@ defineExpose(exportObject);
             </div>
           </jsv-focus-block>
         </div>
+        <div>
+          <slot name="foreground"></slot>
+        </div>
       </div>
     </div>
   </div>

package/utils/JsViewPlugin/JsvAudio/AudioProxy.js

@@ -40,20 +40,9 @@ class AudioManager {
       this.audioMap[id].buildPlatformInstance();
     }
   }
-
-  onCreatePlayer(result) {
-    console.log("CreatePlayerResult: " + result);
-    let resultObj = JSON.parse(result);
-    if (resultObj.code == 0) {
-      this.audioMap[resultObj.key]?.initPlayer();
-    } else {
-      console.error("Create player failed, key=" + resultObj.key);
-    }
-  }
 }
 const sAudioManager = new AudioManager();
 
-window.top.CreatePlayerResult = sAudioManager.onCreatePlayer.bind(sAudioManager);
 
 const AUDIO_PROPS = {
   "src": { type: Object },
@@ -83,11 +72,14 @@ class AudioProxy {
       console.error("no jsvAudioBridge");
       return;
     }
-    let result = JsvAudioBridgeProxy.CreateAudio(this._playerId, "top.CreatePlayerResult");
-    console.log("JsvAudio CreateAudio result ", result);
-    if (result > 0) {
-      this.initPlayer();
-    }
+    JsvAudioBridgeProxy.CreateAudio(this._playerId).then((data) => {
+      const info = JSON.parse(data);
+      if (info.state == 0) {
+        this.initPlayer();
+      } else {
+        console.error(TAG, "create audio failed", info.errorInfo);
+      }
+    });
   }
 
   initPlayer() {
@@ -143,7 +135,7 @@ class AudioProxy {
     switch (event) {
       case Events.EVENT_END:
         this.setProperty("paused", true);
-        this.callEventListener("onend");
+        this.callEventListener("onended");
         break;
       case Events.EVENT_LOAD_START:
         this.callEventListener("onloadstart");
@@ -310,4 +302,4 @@ class AudioProxy {
   }
 }
 
-export { sAudioManager };
+export { sAudioManager };

package/utils/JsViewPlugin/JsvAudio/JsvAudio.vue

@@ -135,7 +135,7 @@ export default {
   methods: {
     registerEvent() {
       if (this.audio) {
-        this.audio.addEventListener("end", this.onEnded);
+        this.audio.addEventListener("ended", this.onEnded);
         this.audio.addEventListener("error", this.onError);
         this.audio.addEventListener("loadstart", this.onLoadStart);
         this.audio.addEventListener("loadedmetadata", this.onLoadedMetaData);

package/utils/JsViewPlugin/JsvAudio/JsvAudioBridgeProxy.js

@@ -7,12 +7,15 @@ export default class {
   static isReady() {
     return typeof window.jsvAudioBridge != "undefined" && !!window.jsvAudioBridge;
   }
-  static CreateAudio(key, callback) {
+  static CreateAudio(key) {
     if (typeof window.jsvAudioBridge != "undefined"
       && typeof window.jsvAudioBridge.CreateAudio != "undefined") {
-      return window.jsvAudioBridge.CreateAudio(key, callback);
+      return window.jsvAudioBridge.CreateAudio(key);
     }
-    return -1;
+    return Promise.reject(JSON.stringify({
+      state: -2,
+      errorInfo: "jsvAudioBridge is null."
+    }));
   }
 
   static ReleasePlayer(key) {

package/utils/JsViewPlugin/JsvAudio/version.js

@@ -7,9 +7,9 @@ let PluginInfo = {
     // downloadUrl:"http://192.168.0.63:8080/plugin/JsvAudio-164.zip", //插件下载地址
     packageName: "com.qcode.jsvaudio",
     name: "音频插件",
-    version: "1.0.19",  //插件需要的版本号
-    versionCodeMin: 19,
-    versionCodeMax: 19,
+    version: "1.0.21",  //插件需要的版本号
+    versionCodeMin: 21,
+    versionCodeMax: 21,
     bridgeName: "jsvAudioBridge", //插件bridge注册到jsview的名称
     className: "com.qcode.jsvaudio.JsvAudio",  //插件初始化类名称
     initMethod: "createInstance",   //插件初始化方法

package/utils/JsViewPlugin/JsvAudio/version.mjs

@@ -7,9 +7,9 @@ let PluginInfo = {
   // downloadUrl:"http://192.168.0.63:8080/plugin/JsvAudio-164.zip", //插件下载地址
   packageName: "com.qcode.jsvaudio",
   name: "音频插件",
-  version: "1.0.19",  //插件需要的版本号
-  versionCodeMin: 19,
-  versionCodeMax: 19,
+  version: "1.0.21",  //插件需要的版本号
+  versionCodeMin: 21,
+  versionCodeMax: 21,
   bridgeName: "jsvAudioBridge", //插件bridge注册到jsview的名称
   className: "com.qcode.jsvaudio.JsvAudio",  //插件初始化类名称
   initMethod: "createInstance",   //插件初始化方法

package/utils/JsViewPlugin/JsvPlayer/version.mjs

@@ -1,18 +1,18 @@
 let PluginInfo={
-    // downloadUrl:"http://192.168.0.63:8080/plugin/JsvPlayer-164.zip", //插件下载地址
+    // downloadUrl:"http://192.168.0.85:8080/plugin/JsvPlayer-199.zip", //插件下载地址
     packageName:"com.qcode.jsvplayer",
     name:"播放器插件",
-    version:"1.9.0",  //插件需要的版本号
-    versionCodeMin:190,
-    versionCodeMax:190,
+    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:"77f0b26e2751998e94220df133bd9b3e"
+    md5:"6de8d620492bf0143bbccc62636a6271"
 };
 
 // 导出字段要含有 pluginVersionInfo 信息，作为npm时版本参考
-export default PluginInfo;
+export default PluginInfo;

package/utils/JsViewVueTools/JsvDemoTester.js

@@ -0,0 +1,80 @@
+let interfaceLoaded = false;
+let idGeneratoer = 1;
+let idObjectMap = {};
+
+const ensureInterface = ()=>{
+    return new Promise((resolve, reject)=>{
+        if (interfaceLoaded) {
+            // 已经加载完成
+            resolve();
+            return;
+        }
+    
+        if (window.JsView) {
+            let cb = ()=>{
+                // dynamic加载完成
+                if (window.jJsvDemoTester) {
+                    console.log("window.jJsvDemoTester ready")
+                } else {
+                    console.log("window.jJsvDemoTester failed")
+                }
+
+                console.log("remove cb=" + cb);
+
+                // 移除回调
+                window.JsView.removeEventListener(cb);
+
+                // 无论成功失败，暂且都论为加载完成
+                interfaceLoaded = true;
+                resolve();
+            };
+            window.JsView.addEventListener("__DemoTesterReady", cb);
+            window.JsView.ensureTesterUtils();
+        } else {
+            interfaceLoaded = true;
+            resolve(); // 非JsView场景,默认为完成状态
+        }
+    });
+}
+
+const enableNativeViewListener = (nativeViewId)=>{
+    let listenerId = idGeneratoer;
+    idGeneratoer++;
+    idObjectMap[listenerId] = {
+        eventCallback: (ret)=>{
+            console.log("JsvDemoTester nativeView info=" + ret.info);
+        }
+    };
+
+    (async ()=>{
+        await ensureInterface();
+
+        if (idObjectMap.hasOwnProperty(listenerId)) {
+            let eventName = "__enableNativeViewListener_" + listenerId;
+        
+            window.JsView?.addEventListener(eventName, idObjectMap[listenerId].eventCallback);
+            window.jJsvDemoTester?.enableNativeViewListener(nativeViewId, listenerId, eventName);
+        }
+    })();
+
+    return listenerId; // 用于 disableNativeViewListener() 调用
+}
+
+const disableNativeViewListener = (listenerId)=>{
+    (async ()=>{
+        await ensureInterface();
+
+        if (idObjectMap.hasOwnProperty(listenerId)) {
+            window.JsView?.removeEventListener(idObjectMap[listenerId].eventCallback);
+            window.jJsvDemoTester?.disableNativeViewListener(listenerId);
+            delete idObjectMap[listenerId];
+        } else {
+            console.warn("disableNativeViewListener id gone");
+        }
+    })();
+}
+
+export {
+    enableNativeViewListener,
+    disableNativeViewListener
+}

package/utils/JsViewVueTools/index.js

@@ -18,3 +18,4 @@ export * from "./JsvImpactTracer.js";
 export * from "./JsvTextTools.js";
 export * from "./JsvPreDownloader.ts"
 export { default as DefaultKeyCodeMap } from "./DefaultKeyMap.js";
+export * from "./JsvDemoTester.js"

package/utils/JsViewVueWidget/JsvApic/index.js

@@ -11,7 +11,7 @@ let _JsvApic;
 if (window.JsView) {
   _JsvApic = JsvApic.default;
 } else {
-  const BrowserApic = await import("./BrowserApic/index.js");
+  const BrowserApic = await import("./BrowserApic/BrowserApic.vue");
   _JsvApic = BrowserApic.default;
 }
 let LoopType = JsvApic.LoopType;

package/utils/JsViewVueWidget/JsvNinePatch.vue

@@ -14,6 +14,7 @@
  *          borderOutset {int}      (必填)原图信息: 图片边缘到中心内容区域边缘的距离, 快速计算: (原图宽度 - 原图中放内容宽度) / 2
  *          animTime    {int}       (必填)缩放动画的时长(单位秒)
  *          waitForInit {boolean}  (选填)尺寸为0时是否进行描画(例如: 首次显示不展示动画的场合，设置为true),默认值为true
+ *          onTransitionEnd { Function } (选填)transition动画结束的回调
 -->
 
 <script setup>
@@ -37,6 +38,7 @@ const props = defineProps({
   centerWidth: { type: Number, default: -1, required: true },
   borderOutset: { type: Number, required: true },
   animTime: { type: Number, default: 0 },
+  onTransitionEnd: { type: Function },
 });
 
 const isReady = () => {
@@ -99,5 +101,6 @@ watchEffect(() => {
       borderImageWidth: `${borderDspWidth}px`,
       borderImageOutset: `${convertedBorderOutset}px`,
     }"
+    @transitionend="props.onTransitionEnd"
   />
 </template>

package/utils/JsViewVueWidget/JsvSystemAudio.vue

@@ -0,0 +1,177 @@
+<template>
+  <div :style="{ width: 1, height: 1 }" backgroundColor="rgba(0,0,0,1)"></div>
+</template>
+<script >
+export default {
+  props: {
+    /**
+     * 回调函数，播放器对象通知接口
+     * @param {Object} video对象，可以通过此video对象调用video相关属性和方法，具体属性和方法定义见JsvMedia.js文件里相关说明。
+     */
+    onRef: { type: Function, default: () => { } },
+    /**
+     * 属性，Boolean类型，true表示自动播放，默认false。
+     */
+    autoplay: { type: Boolean, default: false },
+    /**
+     * 属性，String类型，播放器实例索引，同样的key使用同一个播放器实例。
+     */
+    playerKey: { type: String, default: null },
+    /**
+     * 属性，Boolean类型，true表示静音，默认false。
+     */
+    muted: { type: Boolean, default: false },
+    /**
+     * 属性，Boolean类型，true表示循环播放，默认false。
+     */
+    loop: { type: Boolean, default: false },
+    /**
+     * 属性，String类型，播放地址。
+     */
+    src: { type: String, default: "" },
+    /**
+     * 回调函数，播放结束时通过此回调接口通知。
+     */
+    onEnded: {
+      type: Function,
+      default: () => {
+        return {};
+      },
+    },
+    /**
+     * 回调函数，播放错误时通过此接口通知。
+     * @param {int} 错误类型，当前定义了四种错误。1是异常中断；2是网络错误；3是解码错误；4是格式不支持。
+     */
+    onError: {
+      type: Function,
+      default: () => {
+        return {};
+      },
+    },
+    /**
+     * 回调函数，开始加载，设置完播放地址后，上报此事件。
+     */
+    onLoadStart: {
+      type: Function,
+      default: () => {
+        return {};
+      },
+    },
+    /**
+     * 回调函数，视频准备好后触发。
+     */
+    onLoadedMetaData: {
+      type: Function,
+      default: () => {
+        return {};
+      },
+    },
+    /**
+     * 回调函数，视频准备好后触发，这个时候可以正常seek。
+     */
+    onLoad: {
+      type: Function,
+      default: () => {
+        return {};
+      },
+    },
+    /**
+     * 回调函数，音频失去焦点后触发此事件，可能会导致pause（点播）或者离开频道（直播）。
+     */
+    onAudioFocusLoss: {
+      type: Function,
+      default: () => {
+        return {};
+      },
+    },
+    /**
+     * 回调函数，音频获取焦点后触发此事件，可能会触发resume（点播）或者加入频道（直播）。
+     */
+    onAudioFocusGain: {
+      type: Function,
+      default: () => {
+        return {};
+      },
+    },
+    /*
+     *预下载音频
+     */
+    preDownload: {
+      type: Boolean,
+      default: false
+    }
+  },
+  setup() {
+    return {
+      audio: null,
+    };
+  },
+  mounted() {
+    let key = "JsvAudio_" + Math.floor(Math.random() * 10000);
+    if (this.playerKey) {
+      key = this.playerKey;
+    }
+    console.log("player key:" + key);
+
+    this.audio = new Audio();
+    this.registerEvent();
+    if (this.src && this.src !== "") {
+      let realUrl
+      if (window.JsView) {
+        // jsview上
+        realUrl = new window.JsView.Dom.UrlRef(this.src).href;
+      } else {
+        realUrl = this.src;
+      }
+      this.audio.src = realUrl;
+    }
+
+    if (this.autoplay) {
+      this.audio.autoplay = this.autoplay;
+    }
+
+    if (this.muted) {
+      this.audio.muted = this.muted;
+    }
+
+    if (this.loop) {
+      this.audio.loop = this.loop;
+    }
+    if (this.preDownload) {
+      this.audio.predownload = this.preDownload;
+    }
+    this.onRef?.(this.audio);
+    //初始化
+    Promise.resolve().then(() => {
+      if (this.audio) {
+        this.audio.confirmInitSetup?.();
+      }
+    });
+  },
+
+  beforeUnmount() {
+    if (this.audio != null) {
+      this.audio.unload?.();
+      this.audio.releaseResource?.();
+      this.audio.onPlatformDestroy?.();
+      this.onRef?.(null);
+    }
+  },
+
+  methods: {
+    registerEvent() {
+      if (this.audio) {
+        this.audio.addEventListener("ended", this.onEnded);
+        this.audio.addEventListener("error", this.onError);
+        this.audio.addEventListener("loadstart", this.onLoadStart);
+        this.audio.addEventListener("loadedmetadata", this.onLoadedMetaData);
+        this.audio.addEventListener("load", this.onLoad);
+        this.audio.addEventListener("audiofocusloss", this.onAudioFocusLoss);
+        this.audio.addEventListener("audiofocusgain", this.onAudioFocusGain);
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped></style>

package/utils/JsViewVueWidget/index.js

@@ -40,3 +40,4 @@ export { default as JsvTextBox } from "./JsvTextBox.vue";
 export { default as JsvTouchContainer } from "./JsvTouchContainer.vue";
 export { default as JsvTransparentDiv } from "./JsvTransparentDiv.vue";
 export { default as JsvVideo } from "./JsvVideo.vue";
+export { default as JsvSystemAudio } from "./JsvSystemAudio.vue";

package/utils/JsViewPlugin/JsvPlayer/version.js

@@ -1,19 +0,0 @@
-let PluginInfo={
-    // downloadUrl:"http://192.168.0.63:8080/plugin/JsvPlayer-164.zip", //插件下载地址
-    packageName:"com.qcode.jsvplayer",
-    name:"播放器插件",
-    version:"1.8.4",  //插件需要的版本号
-    versionCodeMin:184,
-    versionCodeMax:184,
-    bridgeName:"jsvPlayerBridge", //插件bridge注册到jsview的名称
-    className:"com.qcode.jsvplayer.JsvPlayer",  //插件初始化类名称
-    initMethod:"createInstance",   //插件初始化方法
-    listener:"top.JsvPlayerPluginLoadResult",  //插件加载结果回调
-    listener2: "top.JsvPlayerPluginStatus",
-    // debug:true,
-    md5:"7d6d28f8eda9c4b2725eecb578b553ab"
-};
-
-// 不要用export default，update-env脚本不能解析
-// 导出字段要含有 pluginVersionInfo 信息，作为npm时版本参考
-module.exports = PluginInfo;

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

@@ -1 +0,0 @@
-export * from "./BrowserApic.vue"