@shijiu/jsview-vue 2.3.0 → 2.3.728-alpha.0

package/utils/JsViewPlugin/JsvPlayer/index-0.9.js

@@ -1,23 +1,35 @@
-//! 考虑到.vue文件除了export default的component外，还有可能export其他对象,因此使用import * as
+//考虑到.vue文件除了export default的component外，还有可能export其他对象,因此使用import * as
 import { default as JsvPlayer }  from "./JsvPlayer.vue";
-import { globalLoadJsvPlayerPlugin as initPlugin } from "./JsvMedia.js"
-import { globalPreLoadJsvPlayerPlugin as preLoadPlugin } from "./JsvMedia.js"
-import { getJsvPlayerCapabilitySet as getCapabilitySet } from "./JsvMedia.js"
-import { setJsvPlayerDebugMode as setDebugMode } from "./JsvMedia.js"
-import { getJsvPlayerRunningNum as getRunningPlayerNum } from "./JsvMedia.js"
-import { globalLoadSetOperator as setOperator } from "./JsvMedia.js"
-import {default as BrowserPlayer} from "./BrowserJsvPlayer-0.9.vue"
-let _JsvPlayer = JsvPlayer;
+import { globalLoadJsvPlayerPlugin as initPlugin } from "./JsvPlayer.vue"
+import { globalPreLoadJsvPlayerPlugin as preLoadPlugin } from "./JsvPlayer.vue"
+import { getJsvPlayerCapabilitySet as getCapabilitySet } from "./JsvPlayer.vue"
+import { setJsvPlayerDebugMode as setDebugMode } from "./JsvPlayer.vue"
+import { getJsvPlayerRunningNum as getRunningPlayerNum } from "./JsvPlayer.vue"
+import { globalLoadSetOperator as setOperator } from "./JsvPlayer.vue"
+import { setProbeMulticastChannelID as setProbeMulticastChannelID } from "./JsvPlayer.vue"
+import { setProbeMulticastUrl as setProbeMulticastUrl } from "./JsvPlayer.vue"
+import { registerStreamChangedListener as registerStreamChangedListener } from "./JsvPlayer.vue"
+import {default as BrowserPlayer} from "./JsvPlayerBrowser-0.9.vue"
+import { setMobileEventParam as setMobileEventParam } from "./JsvPlayer.vue"
+import { setStbID as setStbID } from "./JsvPlayer.vue"
+import {setGlobalEventListener as setGlobalEventListener} from "./JsvPlayer.vue"
 
+let _JsvPlayer = JsvPlayer;
 let globalLoadJsvPlayerPlugin = initPlugin;
 let globalPreLoadJsvPlayerPlugin = preLoadPlugin;
 let getJsvPlayerCapabilitySet = getCapabilitySet;
 let setJsvPlayerDebugMode = setDebugMode;
 let getJsvPlayerRunningNum = getRunningPlayerNum;
 let globalLoadSetOperator = setOperator;
+let globalJsvPlayerProbeMulticastChannelID = setProbeMulticastChannelID;
+let globalJsvPlayerProbeMulticastUrl = setProbeMulticastUrl;
+let globalJsvPlayerRegisterStreamChangedListener = registerStreamChangedListener;
+let setJsvPlayerMobileEventParam = setMobileEventParam;
+let setJsvPlayerStbID = setStbID;
+let SetJsvPlayerGlobalEventListener = setGlobalEventListener;
 
 if (window.jsvIsBrowserDebug) {
-    // const BrowserPlayer =  await import("./BrowserJsvPlayer.vue");
+    // const BrowserPlayer =  await import("./JsvPlayerBrowser.vue");
     // 浏览器版本
     _JsvPlayer = BrowserPlayer;
 
@@ -47,6 +59,30 @@ if (window.jsvIsBrowserDebug) {
     globalLoadSetOperator = (operator)=>{
         console.log("operator is "+operator);
     }
+
+    globalJsvPlayerProbeMulticastChannelID = (mixNo)=>{
+        console.log("mixNo is "+mixNo);
+    }
+
+    globalJsvPlayerProbeMulticastUrl = (url)=>{
+        console.log("url is "+url);
+    }
+
+    globalJsvPlayerRegisterStreamChangedListener = (listener)=>{
+        console.log("listener is "+listener);
+    }
+
+    setJsvPlayerMobileEventParam = (param)=>{
+        console.log("param: "+param);
+    }
+
+    setJsvPlayerStbID = (stbid)=>{
+        console.log("param: "+stbid);
+    }
+
+    SetJsvPlayerGlobalEventListener = (listener)=>{
+        console.log("SetJsvPlayerGlobalEventListener");
+    }
 }
 
 export {
@@ -57,4 +93,10 @@ export {
     setJsvPlayerDebugMode, //设置调试模式，可以查看帧率等信息
     getJsvPlayerRunningNum, //获取正在运行的播放器个数
     globalLoadSetOperator,// 设置运营商
+    globalJsvPlayerProbeMulticastChannelID, //设置组播网络连通性探测频道号
+    globalJsvPlayerProbeMulticastUrl, //设置组播网络连通性探测url
+    globalJsvPlayerRegisterStreamChangedListener, //注册视频流重试时的全局事件通知
+    setJsvPlayerMobileEventParam,//设置移动探针相关参数
+    setJsvPlayerStbID,//设置机顶盒stbid
+    SetJsvPlayerGlobalEventListener,//设置全局事件监听
 }

package/utils/JsViewPlugin/JsvPlayer/index.js

@@ -1,22 +1,41 @@
-//! 考虑到.vue文件除了export default的component外，还有可能export其他对象,因此使用import * as
+//考虑到.vue文件除了export default的component外，还有可能export其他对象,因此使用import * as
 import { default as JsvPlayer }  from "./JsvPlayer.vue";
-import { globalLoadJsvPlayerPlugin as initPlugin } from "./JsvMedia.js"
-import { globalPreLoadJsvPlayerPlugin as preLoadPlugin } from "./JsvMedia.js"
-import { getJsvPlayerCapabilitySet as getCapabilitySet } from "./JsvMedia.js"
-import { setJsvPlayerDebugMode as setDebugMode } from "./JsvMedia.js"
-import { getJsvPlayerRunningNum as getRunningPlayerNum } from "./JsvMedia.js"
-import { globalLoadSetOperator as setOperator } from "./JsvMedia.js"
-let _JsvPlayer = JsvPlayer;
+import { globalLoadJsvPlayerPlugin as initPlugin } from "./JsvPlayer.vue"
+import { globalPreLoadJsvPlayerPlugin as preLoadPlugin } from "./JsvPlayer.vue"
+import { getJsvPlayerCapabilitySet as getCapabilitySet } from "./JsvPlayer.vue"
+import { setJsvPlayerDebugMode as setDebugMode } from "./JsvPlayer.vue"
+import { getJsvPlayerRunningNum as getRunningPlayerNum } from "./JsvPlayer.vue"
+import { globalLoadSetOperator as setOperator } from "./JsvPlayer.vue"
+import { setProbeMulticastChannelID as setProbeMulticastChannelID } from "./JsvPlayer.vue"
+import { setProbeMulticastUrl as setProbeMulticastUrl } from "./JsvPlayer.vue"
+import { registerStreamChangedListener as registerStreamChangedListener } from "./JsvPlayer.vue"
+import { setMobileEventParam as setMobileEventParam } from "./JsvPlayer.vue"
+import { setStbID as setStbID } from "./JsvPlayer.vue"
+import {setGlobalEventListener as setGlobalEventListener} from "./JsvPlayer.vue"
 
+let _JsvPlayer = JsvPlayer;
 let globalLoadJsvPlayerPlugin = initPlugin;
 let globalPreLoadJsvPlayerPlugin = preLoadPlugin;
 let getJsvPlayerCapabilitySet = getCapabilitySet;
 let setJsvPlayerDebugMode = setDebugMode;
 let getJsvPlayerRunningNum = getRunningPlayerNum;
 let globalLoadSetOperator = setOperator;
+let globalJsvPlayerProbeMulticastChannelID = setProbeMulticastChannelID;
+let globalJsvPlayerProbeMulticastUrl = setProbeMulticastUrl;
+let globalJsvPlayerRegisterStreamChangedListener = registerStreamChangedListener;
+let setJsvPlayerMobileEventParam = setMobileEventParam;
+let setJsvPlayerStbID = setStbID;
+let SetJsvPlayerGlobalEventListener = setGlobalEventListener;
 
 if (window.jsvIsBrowserDebug) {
-    const BrowserPlayer =  await import("./BrowserJsvPlayer.vue");
+    let BrowserPlayer = null;
+    if(window.JsvCoreApi?.Platform == "pc-wasm"){
+        console.log("pc-wasm")
+        BrowserPlayer =  await import("./JsvPlayerBrowser-wasm.vue");
+    }else{
+        console.log("no pc-wasm")
+        BrowserPlayer =  await import("./JsvPlayerBrowser.vue");
+    }
     // 浏览器版本
     _JsvPlayer = BrowserPlayer.default;
 
@@ -46,6 +65,30 @@ if (window.jsvIsBrowserDebug) {
     globalLoadSetOperator = (operator)=>{
         console.log("operator is "+operator);
     }
+
+    globalJsvPlayerProbeMulticastChannelID = (mixNo)=>{
+        console.log("mixNo is "+mixNo);
+    }
+
+    globalJsvPlayerProbeMulticastUrl = (url)=>{
+        console.log("url is "+url);
+    }
+
+    globalJsvPlayerRegisterStreamChangedListener = (listener)=>{
+
+    }
+
+    setJsvPlayerMobileEventParam = (param)=>{
+        console.log("param: "+param);
+    }
+
+    setJsvPlayerStbID = (stbid)=>{
+        console.log("param: "+stbid);
+    }
+
+    SetJsvPlayerGlobalEventListener = (listener)=>{
+        console.log("SetJsvPlayerGlobalEventListener");
+    }
 }
 
 export {
@@ -56,4 +99,10 @@ export {
     setJsvPlayerDebugMode, //设置调试模式，可以查看帧率等信息
     getJsvPlayerRunningNum, //获取正在运行的播放器个数
     globalLoadSetOperator,// 设置运营商
+    globalJsvPlayerProbeMulticastChannelID, //设置组播网络连通性探测频道号
+    globalJsvPlayerProbeMulticastUrl, //设置组播网络连通性探测url
+    globalJsvPlayerRegisterStreamChangedListener, //注册视频流重试时的全局事件通知
+    setJsvPlayerMobileEventParam,//设置移动探针相关参数
+    setJsvPlayerStbID,//设置机顶盒stbid
+    SetJsvPlayerGlobalEventListener,//设置全局事件监听
 }

package/utils/JsViewPlugin/JsvPlayer/package.json

@@ -0,0 +1,8 @@
+{
+  "name": "jsvplayer",
+  "version": "2.7.4-master.1",
+  "branch": "master",
+  "description": "Jsview player plugin",
+  "main": "index.js",
+  "author": "qiancheng.li"
+}

package/utils/JsViewVueTools/BlobApi.ts

@@ -0,0 +1,55 @@
+/**
+ * BlobApi
+ *
+ * 说明:
+ * - 提供与浏览器 URL.createObjectURL / URL.revokeObjectURL 对齐的接口。
+ * 使用场景
+ * 1. blob内容是图片并且希望在JsView体系的div或者img元素中展示时使用。
+ * 2. 希望获得PC模拟环境和android环境同样的Blob展示和上传需求时
+ * 
+ * 特别说明: 在PC模拟环境中, 第三方库仅在PC上进行Blob展示时, 不用改造，
+ *    使用原URL.createObjectURL / URL.revokeObjectURL即可
+ *    例如m3u8视频转blob播放的第三方库
+ * 
+ */
+
+/**
+ * createObjectURL
+ * 为 Blob 对象创建临时 URL。
+ *
+ */
+async function createObjectURL(blob: Blob): Promise<string> {
+  // 兼容PC模拟环境下 jsvCreateObjectURL 是异步的情况
+  return await (URL as any).jsvCreateObjectURL(blob);
+}
+
+/**
+ * createObjectURLSync
+ * 为 Blob 对象创建临时 URL。为在android设备上的同步接口
+ *
+ */
+function createObjectURLSync(blob: Blob): undefined | string {
+  if ((window as any).JsvCoreApi.ProcessType == "wasm") {
+    console.warn("createObjectURLSync: wasm环境不支持同步创建ObjectURL");
+    return undefined;
+  }
+  return (URL as any).jsvCreateObjectURL(blob);
+}
+
+/**
+ * revokeObjectURL
+ * 释放由 createObjectURL 创建的临时 URL。
+ *
+ */
+function revokeObjectURL(url: string): void {
+  return (URL as any).jsvRevokeObjectURL(url);
+}
+
+let sBlobApi = {
+  createObjectURLSync,
+  createObjectURL,
+  revokeObjectURL,
+}
+
+export default sBlobApi;
+

package/utils/JsViewVueTools/FeatureActive.ts

@@ -17,6 +17,9 @@ namespace FeatureNames {
 
     // 'Capture2Texture': div拷屏
     export const Capture2Texture: String = "Capture2Texture";
+
+    export const MouseHover: String = "MouseHover";
+
 }
 
 // 激活内核中的模块
@@ -53,7 +56,8 @@ function JsvUseFeature(from: String, comp_name: String) {
         return;
     }
 
-    console.error(`Error: ${comp_name}(from ${from}) is not activated, need JsvActiveFeature(JsvFeatureNames.${comp_name}) in boot`);
+    // 未激活简易提示, need JsvActiveFeature(JsvFeatureNames.${ comp_name }) in boot`);
+    console.log(`LOG: ${comp_name}(from ${from}) is not activated`);
 }
 
 // 备用接口: 防止未授权组件被错误激活引起的崩溃和水印显示

package/utils/JsViewVueTools/ForgeHandles.ts

@@ -1,11 +1,16 @@
+// ForgeHandles的所有内容仅在 node_modules/@shijiu/jsview-vue 库中使用, 
+// 非公开API, 有版本升级后被调整的可能, 不要在应用层的项目中直接使用
+
 let handles: {
     TextureManager: any,
     RootView: any,
-    RootActivity: any
+    RootActivity: any,
+    sRenderBridge: any
 } = {
     TextureManager: null,
     RootView: null,
-    RootActivity: null
+    RootActivity: null,
+    sRenderBridge: null
 }
 
 const jsvCode = (window as any).JsvCode;
@@ -13,6 +18,7 @@ jsvCode.ForgeHandles.listenToReady(() => {
     handles.TextureManager = jsvCode.ForgeHandles.TextureManager;
     handles.RootView = jsvCode.ForgeHandles.RootView;
     handles.RootActivity = jsvCode.ForgeHandles.RootActivity;
+    handles.sRenderBridge = jsvCode.ForgeHandles.sRenderBridge;
 })
 
 export default handles;

package/utils/JsViewVueTools/JsvInteractionMode.js

@@ -0,0 +1,16 @@
+import { ref } from "vue";
+
+export const KEY_MODE = 1;
+export const TOUCH_MODE = 2;
+export const JsvInteractionMode = ref(KEY_MODE);
+
+let JsvTouchModeSwitcherCount = 0;
+export const jsvTouchModeSwitcherCreate = () => {
+  JsvTouchModeSwitcherCount++;
+};
+export const jsvTouchModeSwitcherDestroy = () => {
+  JsvTouchModeSwitcherCount--;
+};
+export const hasJsvTouchModeSwitcher = () => {
+  return JsvTouchModeSwitcherCount > 0;
+};

package/utils/JsViewVueTools/JsvPreDownloader.ts

@@ -32,14 +32,14 @@ interface infoObject {
 }
 
 const TAG = "JSvPreDownload";
-let isNullNumber: number = 0;
-let workNumber: number = 0;
 abstract class JsvPreDownloaderBase {
   public download(url: string | Array<DownloadListItem>, netSetting: string = "", isImage: boolean = false) {
     return new Promise((resolve, reject) => {
       if (typeof url === "string") {
         this.downloadInner(url, netSetting, isImage).then(resolve, reject);
       } else if (Array.isArray(url) && url.length > 0) {
+        let isNullNumber: number = 0;
+        let workNumber: number = 0;
         const downloadResult = new Array(url.length);
         const check = () => {
           let allDone = false;

package/utils/JsViewVueTools/JsvRuntimeBridge.js

@@ -112,6 +112,31 @@ function openWindow(url, startup_image, startup_video, startup_duration, add_his
     return window.jJsvRuntimeBridge.openWindow(url, JSON.stringify(setting))
 }
 
+/**
+ * 打开另外一个小程序
+ * @param {string} url 小程序url
+ * @param {string} startup_image 启动图url
+ * @param {string} startup_video 启动视频url
+ * @param {int} startup_duration 启动图时长，默认0
+ * @param {int} add_history 是否添加历史，0不添加，1添加
+ * @returns {Promise} 比openWindow返回信息更丰富, 可获取启动者的更多返回信息
+ */
+function openMiniApp(url, startup_image, startup_video, startup_duration, add_history) {
+    let setting = {};
+    if (startup_image !== null && startup_image !== "")
+        setting.startupImage = startup_image;
+
+    if (startup_video !== null && startup_video !== "") {
+        setting.startupVideo = startup_video;
+    }
+
+    setting.startupDuration = startup_duration;
+    setting.addHistory = (add_history ? 1 : 0); // 兼容true/false传值
+
+    // direct_call("openWindow", url, JSON.stringify(setting));
+    return window.jJsvRuntimeBridge.openMiniApp(url, JSON.stringify(setting))
+}
+
 /**
  * 用新的进程打开另外一个小程序
  * @param {string} url 小程序url
@@ -136,6 +161,30 @@ function startUrlInNewTab(url, startup_image, startup_video, startup_duration, a
     return window.jJsvRuntimeBridge.startUrlInNewTab(url, JSON.stringify(setting))
 }
 
+/**
+ * 用新的进程打开另外一个小程序
+ * @param {string} url 小程序url
+ * @param {string} startup_image 启动图url
+ * @param {string} startup_video 启动视频url
+ * @param {int} startup_duration 启动图时长，默认0
+ * @param {int} add_history 是否添加历史，0不添加，1添加
+ * @returns {Promise} 
+ */
+function openAppInNewTab(url, startup_image, startup_video, startup_duration, add_history) {
+    let setting = {};
+    if (startup_image !== null && startup_image !== "")
+        setting.startupImage = startup_image;
+
+    if (startup_video !== null && startup_video !== "") {
+        setting.startupVideo = startup_video;
+    }
+
+    setting.startupDuration = startup_duration;
+    setting.addHistory = (add_history ? 1 : 0); // 兼容true/false传值
+
+    return window.jJsvRuntimeBridge.openAppInNewTab(url, JSON.stringify(setting))
+}
+
 /**
  * 用于给上一个小程序返回结果，通常与startUrlInNewTab和openWindow配合使用
  * @param {string} data 返回给上一个小程序的结果
@@ -202,31 +251,75 @@ function getInstalledApps() {
  * @param {string} uri Uri方式启动
  * @param {Array} flags 数组，用于intent.addFlags
  * @param {Array} param JSON格式数组，数组元素是 object ，object中的内容用于intent.putExtra
+ * @param {Array} category string数组，用于intent.addCategory
  *
  */
-function startNativeApp(package_name, activity, action, uri, flags, param) {
+function startNativeApp(package_name, activity, action, uri, flags, param, category) {
     var obj = {};
-    if (package_name !== null && package_name !== "")
+    if (package_name && package_name !== "")
         obj.packageName = package_name;
 
-    if (activity !== null && activity !== "")
+    if (activity && activity !== "")
         obj.activity = activity;
 
-    if (action !== null && action !== "")
+    if (action  && action !== "")
         obj.action = action;
 
-    if (uri !== null && uri !== "")
+    if (uri  && uri !== "")
         obj.uri = uri;
 
-    if (flags !== null && flags.length > 0)
+    if (flags && flags.length > 0)
         obj.flags = flags;
 
-    if (param !== null && param.length > 0)
+    if (param && param.length > 0)
         obj.param = param;
 
+    if (category && category.length > 0)
+        obj.category = category
+
     direct_call("startNativeApp", JSON.stringify(obj));
 }
 
+/**
+ * 启动安卓APP
+ * @param {string} package_name 包名
+ * @param {string} activity Activity方式启动
+ * @param {string} action Action方式启动
+ * @param {string} uri Uri方式启动
+ * @param {Array} flags 数组，用于intent.addFlags
+ * @param {Array} param JSON格式数组，数组元素是 object ，object中的内容用于intent.putExtra
+ * @param {Array} category string数组，用于intent.addCategory
+ *
+ */
+function openNativeApp(package_name, activity, action, uri, flags, param, category) {
+    var obj = {};
+    if (package_name && package_name !== "")
+        obj.packageName = package_name;
+
+    if (activity && activity !== "")
+        obj.activity = activity;
+
+    if (action && action !== "")
+        obj.action = action;
+
+    if (uri && uri !== "")
+        obj.uri = uri;
+
+    if (flags && flags.length > 0)
+        obj.flags = flags;
+
+    if (param && param.length > 0)
+        obj.param = param;
+
+    if (category && category.length > 0)
+        obj.category = category
+
+
+    // return window.jJsvRuntimeBridge.openNativeApp(JSON.stringify(obj));
+    return direct_call("openNativeApp", JSON.stringify(obj));
+}
+
+
 /**
  * 发送安卓广播
  * @param {string} package_name 包名
@@ -311,6 +404,19 @@ function getAppInfo() {
     return direct_call("getAppInfo");
 }
 
+/**
+ * 通知JsView页面可见性准备好, 主要用于JsView界面从不可见到可见切换时,
+ * 避免JsView的未绘制的黑屏被看见, 一般会在android层用张图来进行遮盖, 然后通过此接口来通知拿掉遮盖
+ * @returns 
+ */
+function notifyVisibleReady() {
+    // 触发一次swap, 并在绘制完成后再回调, 以保证绘制界面完整
+    window.JsvCoreApi.AddSwappedOnceListener(()=>{
+        direct_call("notifyVisibleReady");
+    });
+    window.Forge.sRenderBridge.RequestSwap();
+}
+
 /**
  * 页面加载成功后调用去除启动图
  *
@@ -321,7 +427,7 @@ function notifyPageLoadDone() {
 
 function notifyPageLoaded() {
     // 激活JsView的按键优化处理逻辑
-    window.JsvCoreApi.enableReceivingUserInput?.();
+    window.JsvCoreApi.notifyPageLoaded?.();
 
     direct_call("notifyPageLoaded");
 }
@@ -608,6 +714,13 @@ function getBootTime(){
     return direct_call("getBootTime")
 }
 
+/**
+ * reload页面并尝试下一个备份启动地址
+ */
+function tryNextBackupIntent() {
+    direct_call("tryNextBackupIntent");
+}
+
 
 // 显示声明，可以提高执行速度和利用上编辑器的成员名提示功能
 const bridge = {
@@ -617,7 +730,9 @@ const bridge = {
     getDeviceUUID,
     getAndroidId,
     openWindow,
+    openMiniApp,
     startUrlInNewTab,
+    openAppInNewTab,
     onWindowResult,
     reloadWindow,
     closePage,
@@ -625,10 +740,12 @@ const bridge = {
     getSystemProperty,
     getInstalledApps,
     startNativeApp,
+    openNativeApp,
     sendNativeBroadcast,
     startService,
     getDeviceInfo,
     getAppInfo,
+    notifyVisibleReady,
     notifyPageLoadDone,
     notifyPageLoaded,
     hasFavouriteFunction,

package/utils/JsViewVueTools/JsvTextTools.ts

@@ -24,7 +24,9 @@ declare interface FontStyleDefine {
  * @return {int} 文字宽度
  **/
 const getTextWidth = (text: string, style: FontStyleDefine) => {
-  let forgeRef = Forge;
+  if (text && typeof text != "string") {
+    text = "" + text; // 规避text为非字符串导致接口调用错误的问题
+  }
   return Forge.TextUtils.GetTextWidth(text, style);
 };
 
@@ -56,6 +58,13 @@ const getOneLineTextDrawWidth = (text: string, style: FontStyleDefine) => {
   return Forge.TextUtils.GetOneLineTextDrawWidth(text, style);
 }
 
+const breakLines = (text: string, style: FontStyleDefine, width: number) => {
+  if (text && typeof text != "string") {
+    text = "" + text; // 规避text为非字符串导致接口调用错误的问题
+  }
+  return Forge.TextUtils.BreakLines(text, style, width);
+}
+
 const isRtl = (str: string) => {
   //arabic
   for (let i = 0; i < str.length; i++) {
@@ -150,7 +159,8 @@ const TextTools = {
   isRtl,
   getCursorPosition,
   getCursorPositionCached,
-  recycleCursorPositionCache
+  recycleCursorPositionCache,
+  breakLines
 }
 
 export { getTextWidth, TextTools };