@shijiu/jsview-vue 2.2.373 → 2.3.0

package/utils/JsViewPlugin/JsvPlayer/BrowserJsvPlayer.vue

@@ -1,7 +1,9 @@
 <script>
 import { Forge } from "@shijiu/jsview/dom/jsv-forge-define";
+import { AckEventDefine } from "./AckEventDefine.ts";
 import playerExMethods from "./JsvMediaBrowserInterface.js";
 import { shallowRef } from "vue";
+import { JsvNativeSharedDiv } from "jsview";
 
 let logDebug = console.log;
 
@@ -276,14 +278,16 @@ export default {
      */
     corner: { type: Number, default: 0 },
   },
-  components: {},
+  components: {
+    JsvNativeSharedDiv,
+  },
   watch: {
     active(newValue) {
-      console.log("LudlDebug active newValue: " + newValue);
+      console.log("active newValue: " + newValue);
       if (this.video) {
         if (newValue) {
           this.registerEvent();
-          this.video.setHoleID(this.holeId);
+          // this.video.setHoleID?.(this.holeId);
           this.holeStyle = {
             left: 0,
             top: 0,
@@ -332,8 +336,7 @@ export default {
     return {
       video: null,
       holeId: "",
-      jsvMainView: shallowRef(null),
-      innerViewId: shallowRef(-1),
+      positionAckFunc: null,
     };
   },
 
@@ -370,8 +373,35 @@ export default {
     if (!this.video) {
       // 创建PC版本的video标签
       this.video = window.originDocument.createElement("video");
+      this.video.style.position = "absolute";
+      this.video.style.zIndex = -100;
       this._extendsApi(this.video);
-      this.video.style.borderRadius = this.corner + "px";
+
+      const appElement = window.originDocument.getElementById("app");
+      document.body.insertBefore(this.video, appElement);
+
+      // 跟踪视频显示位置
+      let _this = this;
+      this.positionAckFunc = (event_json) => {
+        // 跟踪JsvNativeShared的位置变化
+        let new_pos = JSON.parse(event_json);
+        this.video.style.left =
+          window.JsvCoreApi.WasmExt.measurePosition(new_pos.x) + "px";
+        this.video.style.top =
+          window.JsvCoreApi.WasmExt.measurePosition(new_pos.y) + "px";
+
+        this.video.style.width =
+          window.JsvCoreApi.WasmExt.measurePosition(new_pos.width) + "px";
+        this.video.style.height =
+          window.JsvCoreApi.WasmExt.measurePosition(new_pos.height) + "px";
+      };
+
+      window.JsvCoreApi.WasmExt.listenerToAckEvent(
+        AckEventDefine.CATEGORY_VIEW,
+        AckEventDefine.TYPE_SHARED_VIEW_LAYOUT,
+        this.holeId,
+        this.positionAckFunc
+      );
     } else {
       this.video.setRef();
       first_create = false;
@@ -421,24 +451,20 @@ export default {
         }
       }
 
-      // 创建挂载的VideoView
-      this.jsvMainView = new Forge.VideoView(this.video, null);
-      this.innerViewId = Forge.sViewStore.add(
-        new Forge.ViewInfo(this.jsvMainView)
-      );
-
       this.onRef?.(this.video);
     }
   },
 
   unmounted() {
     if (this.video != null) {
-      // 清理View管理缓存
-      if (this.innerViewId !== -1) {
-        Forge.sViewStore.remove(this.innerViewId);
-        this.innerViewId = -1;
-        this.jsvMainView = null;
+      // 清理video标签
+      document.body.removeChild(this.video);
+
+      // 解除NativeSharedDiv对应的位置监听
+      if (this.positionAckFunc != null) {
+        window.JsvCoreApi.WasmExt.recycleAckListener(this.positionAckFunc);
       }
+
       this.onRef?.(null);
     }
   },
@@ -495,23 +521,15 @@ export default {
 </script>
 
 <template>
-  <div
+  <jsv-native-shared-div
     :style="{
       ...holeStyle,
-      backgroundColor: 'rgba(0,0,0,1)',
-      borderRadius: corner,
+      left: this.style.left,
+      top: this.style.top,
     }"
-  >
-    <div
-      :style="{
-        left: holeStyle.left,
-        top: holeStyle.top,
-        width: holeStyle.width,
-        height: holeStyle.height,
-      }"
-      :data-jsv-vw-innerview="innerViewId"
-    />
-  </div>
+    :getId="getHoleId"
+    :corner="corner"
+  />
 </template>
 
 <style scoped></style>

package/utils/JsViewVueTools/JsvHashHistory.js

@@ -1,12 +1,9 @@
-import { createMemoryHistory, createWebHashHistory }  from "vue-router";
+import { createMemoryHistory, /*createWebHashHistory*/ } from "vue-router";
+// import { urlCheckSet } from "./TypeCheckAndSet.ts";
 
 class JsvHashHistory {
   constructor(base) {
-    if(window.jsvIsBrowserDebug) {
-      this.#history = createWebHashHistory(base)
-    } else {
-      this.#history = this.#createMockHashHistory(base);
-    }
+    this.#history = this.#createMockHashHistory(base);
   }
 
   get location() {
@@ -32,7 +29,7 @@ class JsvHashHistory {
   replace(to, data) {
     this.#history.replace(to, data);
     this.#updateLocation(this.#history.location);
-  } 
+  }
 
   push(to, data) {
     this.#history.push(to, data);
@@ -53,16 +50,16 @@ class JsvHashHistory {
     // base = location.host ? base || location.pathname + location.search : '';
     base = (location.host || location.protocol === 'file:') ? base || location.pathname + location.search : '';
     if (!base.includes('#'))
-        base += '#';
+      base += '#';
     if (!base.endsWith('#/') && !base.endsWith('#')) {
-        console.warn(`A hash base must end with a "#":\n"${base}" should be "${base.replace(/#.*$/, '#')}".`);
+      console.warn(`A hash base must end with a "#":\n"${base}" should be "${base.replace(/#.*$/, '#')}".`);
     }
 
     this.baseURL = window.location.origin + base;
 
     const history = createMemoryHistory(base)
     const initHash = this.#getInitHash();
-    if(initHash) {
+    if (initHash) {
       // 已设置hash，替换到hash页面
       const replaceTo = {
         path: initHash.substring(1), // 去除#
@@ -70,9 +67,9 @@ class JsvHashHistory {
       }
 
       const queryIdx = initHash.indexOf('?');
-      if(queryIdx >= 0) {
+      if (queryIdx >= 0) {
         replaceTo.path = replaceTo.path.substring(0, queryIdx - 1),
-        replaceTo.query = this.#convertUrlParams(initHash.substring(queryIdx));
+          replaceTo.query = this.#convertUrlParams(initHash.substring(queryIdx));
       }
       history.replace(replaceTo);
     } else {
@@ -87,35 +84,35 @@ class JsvHashHistory {
     let initHash;
 
     // 抓取history hash在启动过程中的变更, 用于warmUp/warmLoad不一致的情况。
-    if (window.JsView.takeNativeHashChange) {
-      initHash = window.JsView.takeNativeHashChange({
-        //this.push(new_hash.substring(1)); // 去除#
-      });
-      if (initHash != null) {
-        // 将新hash融入window.location中
-        console.log("History: found init hash change to:" + initHash);
-      } else {
-        initHash = window.location.hash;
-      }
+    initHash = window.JsvCoreApi.takeNativeHashChange((new_hash) => {
+      // TODO:暂不实现
+      //this.push(new_hash.substring(1)); // 去除#
+    });
+    if (initHash != null) {
+      // 将新hash融入window.location中
+      console.log("History: found init hash change to:" + initHash);
+    } else {
+      initHash = window.location.hash;
     }
 
     return initHash;
   }
 
   #updateLocation(location) {
-    if(!window.jsvIsBrowserDebug) {
-      const url = new window.JsView.Dom.UrlRef(
-        location ? this.baseURL + location : this.baseURL,
-        true
-      )
+    const url = new URL(location ? this.baseURL + location : this.baseURL);
+    if (window.location.applyUrlInfo) {
+      // 对于window.location为独立定义的场景
       window.location.applyUrlInfo(url);
+    } else {
+      // 更新系统的location显示和history状态
+      window.history.pushState(null, '', url.href);
     }
   }
 
   #convertUrlParams(value) {
     // 去除问号
     const questionMarkIdx = value.indexOf('?');
-    if(questionMarkIdx >= 0) {
+    if (questionMarkIdx >= 0) {
       value = value.substr(questionMarkIdx + 1);
     }
 
@@ -124,7 +121,7 @@ class JsvHashHistory {
     var result = {};
 
     // 遍历参数并解析键值对
-    for(const param of paramArray) {
+    for (const param of paramArray) {
       const [key, value] = param.split('=');
 
       // 如果键已存在，则将值转换为数组

package/utils/JsViewVueTools/JsvRuntimeBridge.js

@@ -14,14 +14,14 @@ function direct_call(name, ...args) {
     } else {
         let func = null;
         if (window.jJsvRuntimeBridge && typeof window.jJsvRuntimeBridge[name] === "function") {
-            func = window.jJsvRuntimeBridge[name];
+            func = window.jJsvRuntimeBridge[name].bind(window.jJsvRuntimeBridge);
         } else if (window.jContentShellJBridge && typeof window.jContentShellJBridge[name] === "function") {
-            func = window.jContentShellJBridge[name];
+            func = window.jContentShellJBridge[name].bind(window.jContentShellJBridge);
         }
         direct_call_map[name] = func;
         if (func) {
             return func(...args);
-        }        
+        }
     }
 
     return null;
@@ -47,7 +47,7 @@ function getExtFeatureSupports() {
  * @returns {string} mac address
  *
  */
-function getMac(){
+function getMac() {
     return direct_call("getMac");
 }
 
@@ -56,7 +56,7 @@ function getMac(){
  * @returns {string} mac address
  *
  */
-function getWireMac(){
+function getWireMac() {
     return direct_call("getWireMac");
 }
 
@@ -65,7 +65,7 @@ function getWireMac(){
  * @returns {string} mac address
  *
  */
-function getWifiMac(){
+function getWifiMac() {
     return direct_call("getWifiMac");
 }
 
@@ -74,7 +74,7 @@ function getWifiMac(){
  * @returns {string} UUID
  *
  */
-function getDeviceUUID(){
+function getDeviceUUID() {
     return direct_call("getDeviceUUID");
 }
 
@@ -83,7 +83,7 @@ function getDeviceUUID(){
  * @returns {string} Android ID
  *
  */
-function getAndroidId(){
+function getAndroidId() {
     return direct_call("getAndroidId");
 }
 
@@ -96,12 +96,12 @@ function getAndroidId(){
  * @param {int} add_history 是否添加历史，0不添加，1添加
  * @returns {Promise} 可用于监听新的小程序返回的结果
  */
-function openWindow(url, startup_image, startup_video, startup_duration, add_history){
+function openWindow(url, startup_image, startup_video, startup_duration, add_history) {
     let setting = {};
-    if(startup_image !== null && startup_image !== "")
+    if (startup_image !== null && startup_image !== "")
         setting.startupImage = startup_image;
 
-    if(startup_video !== null && startup_video !== ""){
+    if (startup_video !== null && startup_video !== "") {
         setting.startupVideo = startup_video;
     }
 
@@ -121,12 +121,12 @@ function openWindow(url, startup_image, startup_video, startup_duration, add_his
  * @param {int} add_history 是否添加历史，0不添加，1添加
  * @returns {Promise} 可用于监听新的小程序返回的结果
  */
-function startUrlInNewTab(url, startup_image, startup_video, startup_duration, add_history){
+function startUrlInNewTab(url, startup_image, startup_video, startup_duration, add_history) {
     let setting = {};
-    if(startup_image !== null && startup_image !== "")
+    if (startup_image !== null && startup_image !== "")
         setting.startupImage = startup_image;
 
-    if(startup_video !== null && startup_video !== ""){
+    if (startup_video !== null && startup_video !== "") {
         setting.startupVideo = startup_video;
     }
 
@@ -140,8 +140,8 @@ function startUrlInNewTab(url, startup_image, startup_video, startup_duration, a
  * 用于给上一个小程序返回结果，通常与startUrlInNewTab和openWindow配合使用
  * @param {string} data 返回给上一个小程序的结果
  */
-function onWindowResult(data){
-    direct_call("onWindowResult",data)
+function onWindowResult(data) {
+    direct_call("onWindowResult", data)
 }
 
 /**
@@ -152,12 +152,12 @@ function onWindowResult(data){
  * @param {int} startup_duration 启动图时长，默认0
  * @param {int} add_history 是否添加历史，0不添加，1添加
  */
-function reloadWindow(url, startup_image, startup_video, startup_duration, add_history){
+function reloadWindow(url, startup_image, startup_video, startup_duration, add_history) {
     let setting = {};
-    if(startup_image !== null && startup_image !== "")
+    if (startup_image !== null && startup_image !== "")
         setting.startupImage = startup_image;
 
-    if(startup_video !== null && startup_video !== ""){
+    if (startup_video !== null && startup_video !== "") {
         setting.startupVideo = startup_video;
     }
 
@@ -171,7 +171,7 @@ function reloadWindow(url, startup_image, startup_video, startup_duration, add_h
  * 关闭当前小程序
  *
  */
-function closePage(){
+function closePage() {
     direct_call("closePage");
 }
 
@@ -181,7 +181,7 @@ function closePage(){
  * @returns {string} 属性值
  *
  */
-function getSystemProperty(key){
+function getSystemProperty(key) {
     return direct_call("getSystemProperty", key);
 }
 
@@ -190,7 +190,7 @@ function getSystemProperty(key){
  * @returns {string} 应用列表，JSON结构的数组
  *
  */
-function getInstalledApps(){
+function getInstalledApps() {
     return direct_call("getInstalledApps");
 }
 
@@ -204,24 +204,24 @@ function getInstalledApps(){
  * @param {Array} param JSON格式数组，数组元素是 object ，object中的内容用于intent.putExtra
  *
  */
-function startNativeApp(package_name, activity, action, uri, flags, param){
+function startNativeApp(package_name, activity, action, uri, flags, param) {
     var obj = {};
-    if(package_name !== null && package_name !== "")
+    if (package_name !== null && package_name !== "")
         obj.packageName = package_name;
 
-    if(activity !== null && activity !== "")
+    if (activity !== null && activity !== "")
         obj.activity = activity;
 
-    if(action !== null && action !== "")
+    if (action !== null && action !== "")
         obj.action = action;
 
-    if(uri !== null && uri !== "")
+    if (uri !== null && uri !== "")
         obj.uri = uri;
 
-    if(flags !== null && flags.length > 0)
+    if (flags !== null && flags.length > 0)
         obj.flags = flags;
 
-    if(param !== null && param.length > 0)
+    if (param !== null && param.length > 0)
         obj.param = param;
 
     direct_call("startNativeApp", JSON.stringify(obj));
@@ -237,25 +237,25 @@ function startNativeApp(package_name, activity, action, uri, flags, param){
  * @param {Array} param JSON格式数组，数组元素是 object ，object中的内容用于intent.putExtra
  *
  */
-function sendNativeBroadcast(package_name, broadcast, action, uri, flags, param){
+function sendNativeBroadcast(package_name, broadcast, action, uri, flags, param) {
 
     var obj = {};
-    if(typeof package_name != undefined && package_name !== null && package_name !== "")
+    if (typeof package_name != undefined && package_name !== null && package_name !== "")
         obj.packageName = package_name;
 
-    if(typeof broadcast != undefined && broadcast !== null && broadcast !== "")
+    if (typeof broadcast != undefined && broadcast !== null && broadcast !== "")
         obj.broadcast = broadcast;
 
-    if(typeof action != undefined && action !== null && action !== "")
+    if (typeof action != undefined && action !== null && action !== "")
         obj.action = action;
 
-    if(typeof uri != undefined && uri !== null && uri !== "")
+    if (typeof uri != undefined && uri !== null && uri !== "")
         obj.uri = uri;
 
-    if(typeof flags != undefined && flags !== null && flags.length > 0)
+    if (typeof flags != undefined && flags !== null && flags.length > 0)
         obj.flags = flags;
 
-    if(typeof param != undefined && param !== null && param.length > 0)
+    if (typeof param != undefined && param !== null && param.length > 0)
         obj.param = param;
     direct_call("sendNativeBroadcast", JSON.stringify(obj));
 }
@@ -271,27 +271,27 @@ function sendNativeBroadcast(package_name, broadcast, action, uri, flags, param)
  * @param {boolean} is_foreground 是否使用startForegroundService
  *
  */
-function startService(package_name, services, action, uri, flags, param,is_foreground){
+function startService(package_name, services, action, uri, flags, param, is_foreground) {
 
     var obj = {};
-    if(typeof package_name != undefined && package_name !== null && package_name !== "")
+    if (typeof package_name != undefined && package_name !== null && package_name !== "")
         obj.packageName = package_name;
 
-    if(typeof services != undefined && services !== null && services !== "")
+    if (typeof services != undefined && services !== null && services !== "")
         obj.services = services;
 
-    if(typeof action != undefined && action !== null && action !== "")
+    if (typeof action != undefined && action !== null && action !== "")
         obj.action = action;
 
-    if(typeof uri != undefined && uri !== null && uri !== "")
+    if (typeof uri != undefined && uri !== null && uri !== "")
         obj.uri = uri;
 
-    if(typeof flags != undefined && flags !== null && flags.length > 0)
+    if (typeof flags != undefined && flags !== null && flags.length > 0)
         obj.flags = flags;
 
-    if(typeof param != undefined && param !== null && param.length > 0)
+    if (typeof param != undefined && param !== null && param.length > 0)
         obj.param = param;
-    direct_call("startServices", JSON.stringify(obj),is_foreground);
+    direct_call("startServices", JSON.stringify(obj), is_foreground);
 }
 
 /**
@@ -307,7 +307,7 @@ function getDeviceInfo() {
  * 获取自己的app信息
  * @returns 
  */
-function getAppInfo(){
+function getAppInfo() {
     return direct_call("getAppInfo");
 }
 
@@ -321,7 +321,7 @@ function notifyPageLoadDone() {
 
 function notifyPageLoaded() {
     // 激活JsView的按键优化处理逻辑
-    window.JsView?.enableReceivingUserInput?.();
+    window.JsvCoreApi.enableReceivingUserInput?.();
 
     direct_call("notifyPageLoaded");
 }
@@ -331,7 +331,7 @@ function notifyPageLoaded() {
  * @returns {boolean} true支持，false不支持
  *
  */
-function hasFavouriteFunction(){
+function hasFavouriteFunction() {
     let features = getExtFeatureSupports();
     if (features && features.indexOf("favourite") >= 0) {
         return true;
@@ -363,11 +363,11 @@ function getStartParams() {
 function addFavourite(url, callback) {
     if (window.jJsvRuntimeBridge && typeof window.jJsvRuntimeBridge.addFavourite === "function") {
         let async_message = window.jJsvRuntimeBridge.addFavourite(url);
-        async_message.then((result)=>{
+        async_message.then((result) => {
             if (callback) {
                 callback(result);
             }
-        }).catch((result)=>{
+        }).catch((result) => {
             if (callback) {
                 callback(result);
             }
@@ -384,11 +384,11 @@ function addFavourite(url, callback) {
 function updateFavourite(url, callback) {
     if (window.jJsvRuntimeBridge && typeof window.jJsvRuntimeBridge.updateFavourite === "function") {
         let async_message = window.jJsvRuntimeBridge.updateFavourite(url);
-        async_message.then((result)=>{
+        async_message.then((result) => {
             if (callback) {
                 callback(result)
             }
-        }).catch((result)=>{
+        }).catch((result) => {
             if (callback) {
                 callback(result);
             }
@@ -405,11 +405,11 @@ function updateFavourite(url, callback) {
 function removeFavourite(app_name, callback) {
     if (window.jJsvRuntimeBridge && typeof window.jJsvRuntimeBridge.removeFavourite === "function") {
         let async_message = window.jJsvRuntimeBridge.removeFavourite(app_name);
-        async_message.then((result)=>{
+        async_message.then((result) => {
             if (callback) {
                 callback(result)
             }
-        }).catch((result)=>{
+        }).catch((result) => {
             if (callback) {
                 callback(result);
             }
@@ -468,7 +468,7 @@ function popupGainFocus() {
     direct_call("popupGainFocus");
 }
 
-function popupDiscardFocus(){
+function popupDiscardFocus() {
     direct_call("popupGainFocus");
 }
 
@@ -488,12 +488,12 @@ function popupDiscardFocus(){
  *      int: 为view_refer_id值，预热后的View的ID，用于后续的warmLoadView和closeWarmView使用
  */
 function warmUpView(mode, app_url) {
-    if(mode !== 1 && mode !== 2) {
+    if (mode !== 1 && mode !== 2) {
         console.error(`not support mode(${mode})`);
         return -1;
     }
 
-    if(mode === 1 && (app_url === null || app_url.length === 0)) {
+    if (mode === 1 && (app_url === null || app_url.length === 0)) {
         console.error(`not support params(${mode} ${app_url})`);
         return -1;
     }
@@ -528,27 +528,27 @@ function closeWarmedView(view_refer_id) {
  *                              例如: 1021265_release_build_xxx
  * @returns promise 对象，用于监听下载完成与下载失败
  */
-function preDownloadSdk(core_version){
+function preDownloadSdk(core_version) {
     return direct_call("preDownloadSdk", core_version);
 }
 
-function getNetworkTypeStatusImmediate(){
+function getNetworkTypeStatusImmediate() {
     return direct_call("getNetworkTypeStatusImmediate");
 }
 
-function registerNetStateListener(callback){
+function registerNetStateListener(callback) {
     return direct_call("registerNetStateListener", callback);
 }
 
-function unRegisterNetStateListener(callback){
+function unRegisterNetStateListener(callback) {
     return direct_call("unRegisterNetStateListener", callback);
 }
 
-function getSnId(){
+function getSnId() {
     return direct_call("getSnId");
 }
 
-function getEmmcCid(){
+function getEmmcCid() {
     return direct_call("getEmmcCid");
 }
 
@@ -561,10 +561,10 @@ function getEmmcCid(){
  * @param {string} sortOrder 
  * @returns 
  */
-function providerQuery(uri,projection,selection,selectionArgs,sortOrder){
-    let jsonProjection = projection?JSON.stringify(projection):null
-    let jsonSelectionArgs = selectionArgs?JSON.stringify(selectionArgs):null
-    return direct_call("providerQuery",uri,jsonProjection,selection,jsonSelectionArgs,sortOrder);
+function providerQuery(uri, projection, selection, selectionArgs, sortOrder) {
+    let jsonProjection = projection ? JSON.stringify(projection) : null
+    let jsonSelectionArgs = selectionArgs ? JSON.stringify(selectionArgs) : null
+    return direct_call("providerQuery", uri, jsonProjection, selection, jsonSelectionArgs, sortOrder);
 }
 
 /**
@@ -573,8 +573,8 @@ function providerQuery(uri,projection,selection,selectionArgs,sortOrder){
  * @param {object} contentValue 
  * @returns 
  */
-function providerInsert(uri,contentValue){
-    return direct_call("providerInsert",uri,contentValue?JSON.stringify(contentValue):null)
+function providerInsert(uri, contentValue) {
+    return direct_call("providerInsert", uri, contentValue ? JSON.stringify(contentValue) : null)
 }
 
 /**
@@ -584,8 +584,8 @@ function providerInsert(uri,contentValue){
  * @param {string[]} selectionArgs 
  * @returns 
  */
-function providerDelete(uri,selection,selectionArgs){
-    return direct_call("providerDelete",uri,selection,selectionArgs?JSON.stringify(selectionArgs):null)
+function providerDelete(uri, selection, selectionArgs) {
+    return direct_call("providerDelete", uri, selection, selectionArgs ? JSON.stringify(selectionArgs) : null)
 }
 
 /**
@@ -596,8 +596,16 @@ function providerDelete(uri,selection,selectionArgs){
  * @param {string[]} selectionArgs 
  * @returns 
  */
-function providerUpdate(uri,contentValue,selection,selectionArgs){
-    return direct_call("providerUpdate",uri,contentValue?JSON.stringify(contentValue):null,selection,selectionArgs?JSON.stringify(selectionArgs):null)
+function providerUpdate(uri, contentValue, selection, selectionArgs) {
+    return direct_call("providerUpdate", uri, contentValue ? JSON.stringify(contentValue) : null, selection, selectionArgs ? JSON.stringify(selectionArgs) : null)
+}
+
+/**
+ * 
+ * @returns 设备开机时长
+ */
+function getBootTime(){
+    return direct_call("getBootTime")
 }
 
 
@@ -645,7 +653,8 @@ const bridge = {
     providerQuery,
     providerInsert,
     providerDelete,
-    providerUpdate
+    providerUpdate,
+    getBootTime
 };
 
 export {