@shijiu/jsview-vue 0.9.684 → 0.9.766

package/utils/JsViewPlugin/JsvAudio/JsvAudioBrowser.vue

@@ -0,0 +1,46 @@
+<script>
+// import playerExMethods from "./JsvMediaBrowserInterface.js"
+
+export default {
+  props: {
+    onRef: { type: Function, default: () => {} },
+  },
+  setup() {
+    return {
+      audioRef: null,
+    };
+  },
+  methods: {
+    onRefProxy(video_ref) {
+      this.audioRef = video_ref;
+
+      // 不在此直接回调 onRef，因为onRefProxy可能会因为 .src的设置导致重新触发一次调用(vue本身问题)
+      // 参照vue-core处理的 componentUpdateFn处理, onMounted 一次, src设置后会再次 onPatch 一次
+    },
+  },
+  mounted() {
+    if (this.audioRef && this.onRef) {
+      let video_ref = this.audioRef;
+      this.audioRef = null;
+
+      // 补充插件扩展出来的接口
+      // for (let method_name in playerExMethods) {
+      //     video_ref[method_name] = playerExMethods[method_name].bind(video_ref);
+      // }
+
+      // 将修改好的video回调返回给使用者
+      this.onRef(video_ref);
+    }
+  },
+  beforeUnmount() {
+    if (this.onRef) {
+      // video_ref为null，代表video标签卸载处理
+      this.onRef(null);
+    }
+  },
+};
+</script>
+
+<template>
+  <audio :ref="onRefProxy" v-bind="$attrs" />
+</template>

package/utils/JsViewPlugin/JsvAudio/PluginLoader.js

@@ -0,0 +1,140 @@
+/*
+ * @Author: ChenChanghua
+ * @Date: 2023-02-27 20:04:28
+ * @Description: file content
+ */
+import PluginInfo from './version';
+
+class PluginLoader {
+  constructor() {
+    this.onDoneListener = [];
+    this.pluginLoadListener = [];
+    this.pluginInfo = this.getPluginInfo();
+    /** 
+     * 0：未加载；
+     * 1：开始加载；
+     * 2：加载旧插件；
+     * 3：加载新插件；
+     * 4：加载成功；
+     * 5：加载失败。
+     */
+    this.status = 0;
+  }
+
+  getPluginInfo() {
+    let info = PluginInfo;
+    /** 获取下载链接 */
+    if (typeof window.jJsvRuntimeBridge !== 'undefined' && window.jJsvRuntimeBridge && typeof window.jJsvRuntimeBridge.getPluginBaseUrl !== "undefined") {
+      let plugin_base_url = window.jJsvRuntimeBridge.getPluginBaseUrl();
+      if (plugin_base_url) {
+        info.downloadUrl = (plugin_base_url[plugin_base_url.length - 1] === "/" ? plugin_base_url : (plugin_base_url + "/")) + info.packageName + "/JsvAudio-" + info.versionCodeMax + ".dat?md5=" + info.md5;
+      }
+    }
+    return info;
+  }
+
+  registerOnDoneListener(listener) {
+    if (listener) {
+      this.onDoneListener.push(listener);
+    }
+  }
+
+  /**
+   * listener回调处理中参数信息的说明:
+   * 插件加载状态回调。
+   * 回调函数的参数定义如下：
+   * 1:无法正常加载插件。
+   * 2:正在加载旧插件，此时插件加载过程很短，可以不用出现用户提示界面。
+   * 3:正在加载新插件，此时插件需要经历下载、解压等过程，用时较长，可以考虑给用户相关提示。
+   * 4:插件加载完成。
+   * 5:已加载不同版本的插件，此版本无法加载。
+   * 
+   * 备注：不管插件加载处于什么状态，都可以正常使用播放器组件，播放器对象在插件未加载完成的情况下，会把相关状态保存，等完成加载后再自动下发。
+   */
+  loadPlugin(listener) {
+    console.log("globalLoadJsvAudioPlugin");
+    let plugin_status = 0;
+    if (typeof window.jPluginManagerBridge === 'undefined' || !window.jPluginManagerBridge) {
+      plugin_status = 1;
+    } else if (this.status === 2) {
+      plugin_status = 2;
+    } else if (this.status === 3) {
+      plugin_status = 3;
+    } else if (this.status === 4) {
+      plugin_status = 4;
+    } else if (this.status === 5) {
+      plugin_status = 1;
+    }
+
+    if (plugin_status !== 0) {
+      if (typeof listener !== "undefined" && listener) {
+        setTimeout(() => { listener(plugin_status) }, 0);
+      }
+      return;
+    }
+
+    if (typeof listener !== "undefined" && listener) {
+      this.pluginLoadListener.push(listener);
+    }
+
+    if (this.status > 0) {
+      return;
+    }
+    this.status = 1;
+
+    window.jPluginManagerBridge.LoadPlugin(JSON.stringify(this.pluginInfo));
+  }
+
+  onStatusChange(status) {
+    console.log("JsvAudioPluginStatus: " + status);
+    let ret = JSON.parse(status);
+
+    let plugin_status = 2;
+    if (ret && ret.first_load) {
+      this.status = 3;
+      plugin_status = 3;
+    } else {
+      this.status = 2;
+    }
+
+    for (let i = 0; i < this.pluginLoadListener.length; i++) {
+      this.pluginLoadListener[i](plugin_status);
+    }
+  }
+
+  onLoadDone(result) {
+    console.log("JsvAudioPluginLoadResult: " + result);
+    let ret_obj = JSON.parse(result)
+    let plugin_status = 1;
+    if (ret_obj && (ret_obj.status === 4 || ret_obj.status === 1)) {
+      this.status = 4;
+      plugin_status = 4;
+    } else if (ret_obj && ret_obj.status === -12) {
+      this.status = 5;
+      plugin_status = 5;
+    } else {
+      this.status = 5;
+    }
+
+    if (this.status === 5) {
+      console.log("*************************JsvAudio plugin load failed, error code is " + ret_obj.status + "*************************");
+    }
+
+    for (let i = 0; i < this.pluginLoadListener.length; i++) {
+      this.pluginLoadListener[i](plugin_status);
+    }
+
+    for (let listener of this.onDoneListener) {
+      listener(plugin_status);
+    }
+  }
+
+  registerGlobalListener() {
+    window.top.JsvAudioPluginStatus = this.onStatusChange.bind(this);
+    window.top.JsvAudioPluginLoadResult = this.onLoadDone.bind(this);
+  }
+}
+
+const sPluginLoader = new PluginLoader();
+sPluginLoader.registerGlobalListener();
+export default sPluginLoader;

package/utils/JsViewPlugin/JsvAudio/index.js

@@ -0,0 +1,26 @@
+/*
+ * @Author: ChenChanghua
+ * @Date: 2023-02-28 10:18:42
+ * @Description: file content
+ */
+import sPluginLoader from "./PluginLoader.js";
+import JsvAudio from "./JsvAudio.vue"
+
+let globalLoadJsvAudioPlugin;
+let _JsvAudio;
+if (window.JsvWidgetWrapperGroup?.BrowserJsvAudio) {
+  //browser
+  globalLoadJsvAudioPlugin = (listener) => {
+    setTimeout(listener, 0);
+  };
+  _JsvAudio = window.JsvWidgetWrapperGroup.BrowserJsvAudio.default;
+} else {
+  //jsview
+  globalLoadJsvAudioPlugin = sPluginLoader.loadPlugin.bind(sPluginLoader);
+  _JsvAudio = JsvAudio;
+}
+
+export {
+  _JsvAudio as default,
+  globalLoadJsvAudioPlugin,
+}

package/utils/JsViewPlugin/JsvAudio/version.js

@@ -0,0 +1,24 @@
+/*
+ * @Author: ChenChanghua
+ * @Date: 2023-02-22 18:22:26
+ * @Description: file content
+ */
+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",  //插件加载结果回调
+    listener2: "top.JsvAudioPluginStatus",
+    // debug:true,
+    // md5:"baafc8ea737adcad5443f44cc0112498"
+};
+
+// 不要用export default，update-env脚本不能解析
+// 导出字段要含有 pluginVersionInfo 信息，作为npm时版本参考
+module.exports = PluginInfo;

package/utils/JsViewPlugin/JsvPlayer/index.js

@@ -36,7 +36,7 @@ if (window.JsvWidgetWrapperGroup?.BrowserJsvPlayer) {
     }
 
     globalLoadSetOperator = (operator)=>{
-
+        console.log("operator is "+operator);
     }
 }
 

package/utils/JsViewPlugin/JsvPlayer/version.js

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

package/utils/JsViewVueTools/JsvHashHistory.js

@@ -1,8 +1,8 @@
-import { createMemoryHistory, createWebHashHistory }  from "vue-router";
+import { createMemoryHistory, createWebHashHistory } from "vue-router";
 
 class JsvHashHistory {
   constructor(base) {
-    if(window.jsvIsBrowserDebug) {
+    if (window.jsvIsBrowserDebug) {
       this.#history = createWebHashHistory(base)
     } else {
       this.#history = this.#createMockHashHistory(base);
@@ -32,7 +32,7 @@ class JsvHashHistory {
   replace(to, data) {
     this.#history.replace(to, data);
     this.#updateLocation(this.#history.location);
-  } 
+  }
 
   push(to, data) {
     this.#history.push(to, data);
@@ -52,20 +52,23 @@ class JsvHashHistory {
     // 抄 createWebHashHistory 作业
     base = location.host ? 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页面
       history.replace({
         path: initHash.substring(1),// 去除#
-        query: window.location.search
+
+        // 测试链接: http://192.168.2.179:8082/js/main.jsv.js?bcd=333&xyz=456#/feature/Basic?aa=1&bb=2
+        // App 中获取的 router.currentRoute.query的内容为 {aa:1, bb:2}
+        query: this.#splitSearch(window.location.hash)
       });
     } else {
       // 未设置hash定位，追加hash根的显示
@@ -95,7 +98,7 @@ class JsvHashHistory {
   }
 
   #updateLocation(location) {
-    if(!window.jsvIsBrowserDebug) {
+    if (!window.jsvIsBrowserDebug) {
       const url = new window.JsView.Dom.UrlRef(
         location ? this.baseURL + location : this.baseURL,
         true
@@ -104,6 +107,29 @@ class JsvHashHistory {
     }
   }
 
+  #splitSearch(hash) {
+    if (!hash || hash.length == 0) {
+      return {};
+    } else {
+      let hashSearchIndex = hash.indexOf('?');
+      if (hashSearchIndex >= 0) {
+        let arr = hash.substr(hashSearchIndex + 1).split('&');
+        let target = {};
+        for (let i = 0; i < arr.length; i++) {
+          let num = arr[i].indexOf("=");
+          if (num > 0) {
+            let name = arr[i].substring(0, num);
+            let value = arr[i].substr(num + 1);
+            target[name] = value;
+          }
+        }
+        return target;
+      } else {
+        return {};
+      }
+    }
+  }
+
   #history;
 }
 

package/utils/JsViewVueTools/JsvImpactTracer.js

@@ -40,7 +40,7 @@ function createImpactCallback(on_contact, on_dis_contact) {
  *      Object  句柄，提供 Recycle() 函数用于停止碰撞检测，需要再componentWillUnmount进行调用(清理)
  */
 function createImpactTracer(ele1, ele2, callback, auto_froze) {
-  return Forge.sImpactSensorManager.StartTrace(ele1.jsvMainView, ele2.jsvMainView, callback, auto_froze);
+  return Forge.sImpactSensorManager.StartTrace(ele1.jsvGetProxyView(), ele2.jsvGetProxyView(), callback, auto_froze);
 }
 
 // 创建用于设置碰撞即停管理对象的参数
@@ -49,7 +49,7 @@ function _ConvertToViewsList(elements_array) {
   const views_array = [];
   if (elements_array) {
     for (const ele of elements_array) {
-      views_array.push(ele.jsvMainView);
+      views_array.push(ele.jsvGetProxyView());
     }
   }
   return views_array;

package/utils/JsViewVueTools/JsvRuntimeBridge.js

@@ -96,10 +96,10 @@ function getAndroidId(){
  */
 function openWindow(url, startup_image, startup_video, startup_duration, add_history){
     let setting = {};
-    if(startup_image !== null && startup_image !== "")
+    if(typeof startup_image !== undefined && startup_image !== null && startup_image !== "")
         setting.startupImage = startup_image;
 
-    if(startup_video !== null && startup_video !== ""){
+    if(typeof startup_video !== undefined && startup_video !== null && startup_video !== ""){
         setting.startupVideo = startup_video;
     }
 
@@ -148,27 +148,50 @@ function getInstalledApps(){
  */
 function startNativeApp(package_name, activity, action, uri, flags, param){
     var obj = {};
-    if(package_name !== null && package_name !== "")
+    if(typeof package_name != undefined && package_name !== null && package_name !== "")
         obj.packageName = package_name;
 
-    if(activity !== null && activity !== "")
+    if(typeof activity != undefined && activity !== null && activity !== "")
         obj.activity = activity;
 
-    if(action !== null && action !== "")
+    if(typeof action != undefined && action !== null && action !== "")
         obj.action = action;
 
-    if(uri !== null && uri !== "")
+    if(typeof uri != undefined && uri !== null && uri !== "")
         obj.uri = uri;
 
-    if(flags !== null && flags.length > 0)
+    if(typeof flags != undefined && flags !== null && flags.length > 0)
         obj.flags = flags;
 
-    if(param !== null && param.length > 0)
+    if(typeof param != undefined && param !== null && param.length > 0)
         obj.param = param;
 
     direct_call("startNativeApp", JSON.stringify(obj));
 }
 
+function sendNativeBroadcast(package_name, broadcast, action, uri, flags, param){
+
+    var obj = {};
+    if(typeof package_name != undefined && package_name !== null && package_name !== "")
+        obj.packageName = package_name;
+
+    if(typeof broadcast != undefined && broadcast !== null && broadcast !== "")
+        obj.broadcast = broadcast;
+
+    if(typeof action != undefined && action !== null && action !== "")
+        obj.action = action;
+
+    if(typeof uri != undefined && uri !== null && uri !== "")
+        obj.uri = uri;
+
+    if(typeof flags != undefined && flags !== null && flags.length > 0)
+        obj.flags = flags;
+
+    if(typeof param != undefined && param !== null && param.length > 0)
+        obj.param = param;
+    direct_call("sendNativeBroadcast", JSON.stringify(obj));
+}
+
 /**
  * 获取设备信息
  * @returns {string} 终端设备信息，JSON数据结构
@@ -178,6 +201,14 @@ function getDeviceInfo() {
     return direct_call("getDeviceInfo");
 }
 
+/**
+ * 获取自己的app信息
+ * @returns 
+ */
+function getAppInfo(){
+    return direct_call("getAppInfo");
+}
+
 /**
  * 页面加载成功后调用去除启动图
  *
@@ -335,6 +366,10 @@ function popupGainFocus() {
     direct_call("popupGainFocus");
 }
 
+function popupDiscardFocus(){
+    direct_call("popupGainFocus");
+}
+
 /**
  * 页面预热接口，预热页面将会将以一个新的FrameLayout(内含JsView)的方式加载一个新的应用
  * 但这个应用在warmLoadView之前，不会创建texture/surface的实际描画资源，也不会加载图片
@@ -398,7 +433,9 @@ const bridge = {
     getSystemProperty,
     getInstalledApps,
     startNativeApp,
+    sendNativeBroadcast,
     getDeviceInfo,
+    getAppInfo,
     notifyPageLoadDone,
     notifyPageLoaded,
     hasFavouriteFunction,
@@ -410,6 +447,7 @@ const bridge = {
     setPopupInitSize,
     popupResizePosition,
     popupGainFocus,
+    popupDiscardFocus,
     warmUpView,
     warmLoadView,
     closeWarmedView

package/utils/JsViewVueTools/JsvStyleClass.js

@@ -233,6 +233,7 @@ class JsvTextStyleClass extends JsvStyleClass {
     this.jsvTextAttributes = {
       jsv_text_line_align: "middle", // 文字行内垂直对齐方式
       jsv_text_vertical_align: "top", // 文字区域内垂直对齐方式
+      jsv_text_ellipsis: "end", //文字省略部分
     };
   }
 
@@ -244,6 +245,10 @@ class JsvTextStyleClass extends JsvStyleClass {
     this.jsvTextAttributes.jsv_text_line_align = new_align;
   }
 
+  setEllipsis(new_ellipsis) {
+    this.jsvTextAttributes.jsv_text_ellipsis = new_ellipsis;
+  }
+
   // 注意:此接口仅提供给JsViewReactWidget中的hoc调用，
   getVerticalAlign() {
     return this.jsvTextAttributes.jsv_text_vertical_align;
@@ -254,6 +259,10 @@ class JsvTextStyleClass extends JsvStyleClass {
     return this.jsvTextAttributes.jsv_text_line_align;
   }
 
+  getEllipsis() {
+    return this.jsvTextAttributes.jsv_text_ellipsis;
+  }
+
   // Override
   classType() {
     return CONST_TYPE_TEXT;

package/utils/{JsViewVueWidget/utils/text.js → JsViewVueTools/JsvTextTools.js}

@@ -1,8 +1,8 @@
 /*
  * @Author: ChenChanghua
- * @Date: 2022-11-09 15:18:43
+ * @Date: 2022-11-29 14:26:20
  * @LastEditors: ChenChanghua
- * @LastEditTime: 2022-11-10 15:02:54
+ * @LastEditTime: 2022-11-29 14:27:03
  * @Description: file content
  */
 const getTextWidth = (text, style) => {
@@ -15,5 +15,4 @@ const getTextWidth = (text, style) => {
   };
   return window.PlatformUtils.GetTextWidth(textParams);
 };
-
-export { getTextWidth };
+export { getTextWidth };

package/utils/JsViewVueTools/TypeCheckAndSet.js

@@ -1,9 +1,9 @@
 var number_convert_tmp = new Float32Array(1);
 
 function numberCheckSet(number) {
-    number_convert_tmp = number; // 强制类型转换, 避免JSON化时类型出错，因为 '123' 123 都能通过Nan检测
-    if (!isNaN(number_convert_tmp)) {
-        return number_convert_tmp;
+    number_convert_tmp[0] = number; // 强制类型转换, 避免JSON化时类型出错，因为 '123' 123 都能通过Nan检测
+    if (!isNaN(number_convert_tmp[0])) {
+        return number_convert_tmp[0];
     } else {
         console.warn(`${number} is not type of number, default as 0`);
         return 0;

package/utils/JsViewVueTools/index.js

@@ -2,7 +2,7 @@
  * @Author: ChenChanghua
  * @Date: 2022-07-05 14:09:55
  * @LastEditors: ChenChanghua
- * @LastEditTime: 2022-08-30 10:58:14
+ * @LastEditTime: 2022-11-29 14:34:45
  * @Description: file content
  */
 
@@ -17,4 +17,5 @@ export * from "./JsvStyleClass.js";
 export * from "./DebugContentShellJBridge.js";
 export * from "./DebugTool.js";
 export * from "./JsvImpactTracer.js";
+export * from "./JsvTextTools.js";
 export { default as DefaultKeyCodeMap } from "./DefaultKeyMap.js";

package/utils/JsViewVueWidget/BrowserDebugWidget/BrowserTextureAnim.vue

@@ -2,11 +2,10 @@
  * @Author: ChenChanghua
  * @Date: 2022-02-08 09:29:17
  * @LastEditors: ChenChanghua
- * @LastEditTime: 2022-08-22 16:00:50
+ * @LastEditTime: 2022-11-24 10:15:37
  * @Description: file content
 -->
 <script>
-import { ref } from "vue";
 import { getKeyFramesGroup } from "jsview/utils/JsViewVueTools/JsvDynamicKeyFrames";
 
 const DECORATE_BORDER_RADIUS = "BroderRaidus";
@@ -102,7 +101,7 @@ export default {
       type: Object,
     },
   },
-  setup(props) {
+  setup() {
     let styleShell = getKeyFramesGroup();
     return {
       styleShell,
@@ -205,15 +204,14 @@ export default {
             overflow: 'hidden',
           };
         }
-      } else {
-        return {
+      }
+      return {
           left: this.left + "px",
           top: this.top + "px",
           width: this.width + "px",
           height: this.height + "px",
           overflow: 'hidden',
         };
-      }
     },
   },
   methods: {
@@ -250,7 +248,7 @@ export default {
 
     this.animDiv.appendChild(imgDiv);
     clipDiv.appendChild(this.animDiv);
-    this.$refs.root.jsvMaskView.Element.appendChild(clipDiv);
+    this.$refs.root.jsvGetProxyView(true).Element.appendChild(clipDiv);
 
     this.watcherHandlerList.push(
       this.$watch("left", (newValue) => {

package/utils/JsViewVueWidget/JsvActorMove/JsvActorMove.vue

@@ -33,32 +33,30 @@
  *              功能：暂停动画，并将JsvActorMove保持在暂停的位置上
 
 -->
-<script>
+<script setup>
 import JsvActorMoveControl from "./JsvActorMoveControl";
-export default {
-  props: {
-    control: {
-      type: JsvActorMoveControl,
-      required: true,
-    },
-    refDefine: Object,
-  },
-  mounted() {
-    this.control._SetView(this.$refs.element.jsvMainView);
-    if (this.refDefine) {
-      const type = typeof this.refDefine;
-      if (type === "object") {
-        this.refDefine.current = this.$refs.element;
-      } else if (type === "function") {
-        this.refDefine(this.$refs.element);
-      }
-    }
+import { shallowRef, onMounted } from "vue";
+
+const props = defineProps({
+  control: {
+    type: JsvActorMoveControl,
+    required: true,
   },
-};
+});
+
+let mainDivRef = shallowRef(null);
+
+onMounted(() => {
+  props.control._SetView(mainDivRef.value.jsvGetProxyView());
+});
+
+defineExpose({
+  mainDiv: mainDivRef,
+});
 </script>
 
 <template>
-  <div ref="element">
+  <div ref="mainDivRef">
     <slot></slot>
   </div>
-</template>
+</template>