@shijiu/jsview-vue 0.9.631 → 0.9.684

package/utils/JsViewPlugin/JsvPlayer/JsvMedia.js

@@ -190,7 +190,7 @@ function findMediaObjectByKey(key){
 }
 
 class JsvBaseMedia {
-    constructor(type, hole_id, player_type, key, background, design_map_width, decode_type) {
+    constructor(type, window_mode, hole_id, player_type, key, background, design_map_width, decode_type) {
         logTrace("Create JsvBaseMedia, type="+type+", hole_id="+hole_id+", player_type="+player_type+", key="+key+", background="+background+", design_map_width="+design_map_width+", decode_type="+decode_type);
         
         this.state = {
@@ -220,6 +220,7 @@ class JsvBaseMedia {
         this.type = type;
         this.playerCreate = false;
         this.key = key;
+        this.windowMode = window_mode;
         this.background = background;
         this.holeId = hole_id;
         this.holeIdModify = hole_id;
@@ -266,7 +267,7 @@ class JsvBaseMedia {
 
         let share_view = true;
 
-        let result = window.jsvPlayerBridge.CreatePlayer(this.key, this.holeId, this.background, this.designMapWidth, share_view, this.playerType, this.decodeType, "top.CreatePlayerResult");
+        let result = window.jsvPlayerBridge.CreatePlayer(this.key, this.windowMode, this.holeId, this.background, this.designMapWidth, share_view, this.playerType, this.decodeType, "top.CreatePlayerResult");
         if(result > 0){
             this.initPlayer();
         }
@@ -846,7 +847,7 @@ class JsvBaseMedia {
      * 属性，string类型，播放地址，不支持读取。
      */
     set src(value) {
-        this.setSrc(value, null, 1)
+        this.setSrc(value, null, null, 1)
     }
 
     /**
@@ -895,17 +896,26 @@ class JsvBaseMedia {
     /**
      * 设置播放地址。
      * @param {string} url 播放地址。
+     * @param {String} windowMode 播放器窗口模式。
+     *                 null：使用this.windowMode作为窗口模式。
+     *                 full：观影模式，全屏方式，不建议修改w/h/l/t，视频清晰度/流畅度最佳；
+     *                 resizable：可变窗口模式，可以随意修改w/h/l/t，支持动画效果，视频清晰度/流畅度表现可能不如full模式；
+     *                 pip：画中画模式，只在支持多路硬解的情况下使用，用户画中画的小窗播放，对清晰度/流畅度要求较差，可能会有反交错问题。
      * @param {string} head 网络请求的head信息，可以为NULL。
-     * @param {int} type 类型，1表示点播，2表示直播，3表示时移，默认1。
+     * @param {int} type 类型，1表示点播，2表示直播，3表示时移，4表示回看，默认1。
      * @param {double} timeShift 时移时间，只有在type=3时才有效，表示从当前时间时移多长时间，单位秒。
      * @param {int} 分辨率类型 0:unknown或其它；1:标清；2:高清；3:超清（720P）；4:蓝光（1080P）；5:2K；6:4K；7:8K。
+     * @param {int} 用户频道号，只在直播回看状态下需要设置 
      */
-    setSrc(url, head, type, timeShift, resolution){
+    setSrc(url, windowMode, head, type, timeShift, resolution, mixNo){
         let src = {};
         src.url = url;
         if(head){
             src.head = head;
         }
+        if(windowMode){
+            src.windowMode = windowMode;
+        }
         if(type){
             src.type = type;
         }else{
@@ -919,6 +929,10 @@ class JsvBaseMedia {
             src.resolution = resolution;
         }
 
+        if(mixNo && typeof mixNo == "number"){
+            src.channelID = mixNo;
+        }
+
         this.currentEventStatus = EVENT_STATUS_NONE;
         this.setState("src", JSON.stringify(src), "string");
         this.eventReport = true;
@@ -1186,6 +1200,19 @@ class JsvBaseMedia {
         }
     }
 
+    /**
+     * 获取是否支持倍速设置，在onCanPlay事件发送以后，通过此接口查询。
+     * @returns {boolean} true:支持播放倍速设置；false：不支持播放倍速设置。
+     * */
+    supportPlaybackRateSet(){
+        logTrace("supportPlaybackRateSet, key="+this.key);
+        if(typeof window.jsvPlayerBridge !== "undefined"){
+            return window.jsvPlayerBridge.supportRateSet(this.key);
+        }
+
+        return false;
+    }
+
     /**
      * 私有接口，外部不需要调用此接口。
      */
@@ -1241,21 +1268,21 @@ class JsvBaseMedia {
 }
 
 class JsvMedia extends JsvBaseMedia {
-    constructor(type, hole_id, player_type, key, background, design_map_width, decode_type) {
-        super(type, hole_id, player_type, key, background, design_map_width, decode_type);
+    constructor(type, window_mode, hole_id, player_type, key, background, design_map_width, decode_type) {
+        super(type, window_mode, hole_id, player_type, key, background, design_map_width, decode_type);
         //super.buildPlatformInstance(type);
     }
 }
 
 class JsvMediaAudio extends JsvMedia {
     constructor() {
-        super("audio", null, null, null, null, null, 0);
+        super("audio", "resizable", null, null, null, null, null, 0);
     }
 }
 
 class JsvMediaVideo extends JsvMedia {
-    constructor(hole_id, player_type, key, background, design_map_width, decode_type) {
-        super("video", hole_id, player_type, key, background, design_map_width, decode_type);
+    constructor(hole_id, window_mode, player_type, key, background, design_map_width, decode_type) {
+        super("video", window_mode, hole_id, player_type, key, background, design_map_width, decode_type);
         
         this.state.aspectRatio = 'origin'; // 'origin', 'full', '16:9', '4:3',
     }
@@ -1321,16 +1348,36 @@ function setJsvPlayerNumber(videoType, num){
 }
 
 function setJsvPlayerDebugMode(mode){
-    logTrace("setDebugMode, mode="+mode);
+    logTrace("setJsvPlayerDebugMode, mode="+mode);
     if(typeof window.jsvPlayerBridge !== "undefined"){
-        return window.jsvPlayerBridge.setDebugMode(null, mode);
+        window.jsvPlayerBridge.setDebugMode(null, mode);
     }
 }
 
+function getJsvPlayerRunningNum(){
+    logTrace("getJsvPlayerRunningNum");
+    if(typeof window.jsvPlayerBridge !== "undefined"){
+        return window.jsvPlayerBridge.getRunningPlayerNum();
+    }
+    return -1;
+}
+
+function setOperator(operator){
+    logTrace("setOperator");
+    if(typeof window.jsvPlayerBridge !== "undefined"){
+        return window.jsvPlayerBridge.setOperator(operator);
+    }
+}
+
+function globalLoadSetOperator(operator){
+    setOperator(operator)
+}
+
 export {
     JsvMediaVideo,
     JsvMediaAudio,
     globalLoadJsvPlayerPlugin,
+    globalLoadSetOperator,
     findMediaObjectByKey,
     getJsvPlayerCapabilitySet,
     setJsvPlayerNumber,
@@ -1341,4 +1388,6 @@ export {
     logDebug,
     logTrace,
     setJsvPlayerDebugMode,
+    getJsvPlayerRunningNum,
+    setOperator,
 }

package/utils/JsViewPlugin/JsvPlayer/JsvPlayer.vue

@@ -18,6 +18,13 @@ export default {
 		 * 属性，String类型，播放器实例索引，同样的key使用同一个播放器实例。
 		 */
 		playerKey: { type: String, default: null},
+		/**
+		 *  属性，String类型，播放器窗口模式，默认resizable模式。
+		 *                  full：观影模式，全屏方式，不建议修改w/h/l/t，视频清晰度/流畅度最佳；
+		 *                  resizable：可变窗口模式，可以随意修改w/h/l/t，支持动画效果，视频清晰度/流畅度表现可能不如full模式；
+		 *                  pip：画中画模式，只在支持多路硬解的情况下使用，用户画中画的小窗播放，对清晰度/流畅度要求较差，可能会有反交错问题。
+		 */
+		windowMode: {type: String, default: "resizable"},
 		/**
 		 * 属性，int类型，底层使用的播放器类型。1：系统播放器；2:jsv播放器。默认2。
 		 */
@@ -236,7 +243,7 @@ export default {
 		let first_create = true;
 
 		if(!this.video){
-			this.video = new JsvMediaVideo(this.holeId, player_type, key, background, designMap.width, this.decodeType);
+			this.video = new JsvMediaVideo(this.holeId, this.windowMode, player_type, key, background, designMap.width, this.decodeType);
 		}else{
 			this.video.setRef();
 			first_create = false;

package/utils/JsViewPlugin/JsvPlayer/index.js

@@ -3,11 +3,15 @@ import * as JsvPlayer from "./JsvPlayer.vue";
 import { globalLoadJsvPlayerPlugin as initPlugin } 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;
 
 let globalLoadJsvPlayerPlugin = initPlugin;
 let getJsvPlayerCapabilitySet = getCapabilitySet;
 let setJsvPlayerDebugMode = setDebugMode;
+let getJsvPlayerRunningNum = getRunningPlayerNum;
+let globalLoadSetOperator = setOperator;
 
 if (window.JsvWidgetWrapperGroup?.BrowserJsvPlayer) {
     // 浏览器版本
@@ -26,6 +30,14 @@ if (window.JsvWidgetWrapperGroup?.BrowserJsvPlayer) {
     setJsvPlayerDebugMode = () => {
         console.log("Set debug mode");
     }
+
+    getJsvPlayerRunningNum = () => {
+        return -1;
+    }
+
+    globalLoadSetOperator = (operator)=>{
+
+    }
 }
 
 let component = _JsvPlayer.default;
@@ -35,4 +47,6 @@ export {
     globalLoadJsvPlayerPlugin, // 全局初始化播放器插件处理
     getJsvPlayerCapabilitySet, //获取设备能力集
     setJsvPlayerDebugMode, //设置调试模式，可以查看帧率等信息
+    getJsvPlayerRunningNum, //获取正在运行的播放器个数
+    globalLoadSetOperator,// 设置运营商
 }

package/utils/JsViewPlugin/JsvPlayer/version.js

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

package/utils/JsViewVueWidget/JsvMarquee.vue

@@ -3,236 +3,209 @@
  * JsvMarquee：Vue高阶组件，文字跑马灯
  *      props说明:
  *          text          {String}   文字内容
- *          layoutStyles  {Array|Object}   控件位置信息 [{top: 0, left: 0, width: 0, height: 0}]
- *          fontStyles    {Array|Object}   文字样式
+ *          style         {Object}   样式
  *          slideSpeed    {int}      滚动速度 px/s, 默认60
  *          forceSlide    {boolean}  短文字是否滚动，默认false
 -->
 
-<script>
+<script setup>
 import { Forge } from "../../dom/jsv-forge-define";
-import {
-  JsvStyleClass,
-  JsvTextStyleClass,
-  combinedStyles,
-} from "../JsViewVueTools/JsvStyleClass";
+import { getTextWidth } from "./utils";
+import { ref, computed, toRaw, onMounted, onBeforeUnmount } from "vue";
 
-const sDefaultLayoutStyle = new JsvStyleClass({
-  left: 0,
-  top: 0,
-  width: 0,
-  height: 20,
-});
-const sDefaultFontStyle = new JsvTextStyleClass({
-  color: "rgba(255,255,255,1.0)",
-  fontSize: 10,
-  textAlign: "center",
-  lineHeight: "20px",
-});
-const sCommonFontStyle = new JsvTextStyleClass({
-  whiteSpace: "nowrap",
-});
-export default {
-  props: {
-    text: {
-      type: String,
-      default: "",
-    },
-    layoutStyles: {
-      type: [Array, Object],
-      default: () => [sDefaultLayoutStyle],
-    },
-    fontStyles: {
-      type: [Array, Object],
-    },
-    styleToken: String,
-    slideSpeed: {
-      // 60px per second
-      type: Number,
-      default: 60,
-    },
-    forceSlide: {
-      type: Boolean,
-      default: false,
-    },
-    className: {
-      type: String,
+const defaultFontStyle = () => {
+  return {
+    color: "rgba(255,255,255,1.0)",
+    fontSize: 10,
+    textAlign: "start",
+    lineHeight: "20px",
+    whiteSpace: "nowrap",
+    direction: 'ltr'
+  };
+};
+const props = defineProps({
+  text: {
+    type: String,
+    default: "",
+  },
+  style: {
+    type: Object,
+    default() {
+      return {
+        left: 0,
+        top: 0,
+        width: 0,
+        height: 20,
+        color: "rgba(255,255,255,1.0)",
+        fontSize: 10,
+        textAlign: "start",
+        lineHeight: "20px",
+        whiteSpace: "nowrap",
+        direction: 'ltr,'
+      };
     },
   },
-  data() {
-    return {
-      asyncTextLenTimer: -1,
-      rollTimeId: -1,
-      animationCount: 0,
-      LayoutStyle: null,
-      FontStyle: null,
-      FontStyleClass: null,
-      TokenProcessed: null,
-    };
+  slideSpeed: {
+    type: Number,
+    default: 60,
   },
-  setup() {},
-  computed: {
-    _className() {
-      return this.FontStyleClass ? this.FontStyleClass : this.className;
-    },
+  forceSlide: {
+    type: Boolean,
+    default: false,
   },
-  methods: {
-    _asyncStartSlider() {
-      // 清理之前的Slider处理
-      this._resetSlider();
+});
+const slideDiv = ref(null);
+const textDiv = ref(null);
+let animState = 0;
+let animIdleHandler = -1;
+let asyncStartHandler = -1;
+const fontStyle = computed(() => {
+  let { left, top, width, height, ...rest } = props.style;
+  let r = defaultFontStyle();
+  Object.assign(r, rest);
+  if (props.forceSlide) {
+    //滚送时必需start对齐
+    r.textAlign = "start";
+  }
+  return r;
+});
+//rtl文字需要先获得文字宽度
+let textWidth =
+  fontStyle.value.direction == "rtl" ? getTextWidth(props.text, fontStyle.value) : 0;
+const slideDivLeft = computed(() =>
+  fontStyle.value.direction == "rtl" && props.style.width < textWidth
+    ? props.style.width - textWidth
+    : 0
+);
 
-      // 稍进行延迟，以等待JsView的native端描绘文字并回传文字宽度
-      if (this.asyncTextLenTimer < 0) {
-        this.asyncTextLenTimer = setTimeout(() => {
-          if (
-            this.forceSlide ||
-            this.$refs.textRef.clientWidth > this.LayoutStyle.width
-          ) {
-            this._slideNextStep();
-          }
-          this.asyncTextLenTimer = -1;
-        }, 500);
-      }
-    },
-    _resetSlider() {
-      if (this.rollTimeId >= 0) {
-        clearTimeout(this.rollTimeId);
-        this.rollTimeId = -1;
-      }
-      this.animationCount = 0;
-      this.$refs.sliderRef?.jsvMaskView?.StopAnimation();
-    },
-    _slideNextStep() {
-      const text_width = this.$refs.textRef.clientWidth;
-      if (this.animationCount % 2 === 0) {
-        // 文字从原始位置，向左移动出屏幕(每次完整移动，停顿1秒)
-        this.rollTimeId = setTimeout(() => {
-          this.rollTimeId = -1;
-          const anim = new Forge.TranslateFrameAnimation(
-            0,
-            -text_width,
-            this.$props.slideSpeed,
-            true,
-            0,
-            0
-          );
-          anim.SetAnimationListener(
-            new Forge.AnimationListener(
-              null,
-              (ended) => {
-                if (ended) {
-                  // 正常结束，非Cancel时，进行下一个动作
-                  this._slideNextStep();
-                }
-              },
-              null
-            )
-          );
-          anim.Enable(Forge.AnimationEnable.ReleaseAfterEndCallback);
-          this.$refs.sliderRef.jsvMaskView.StartAnimation(anim);
-          this.animationCount += 1;
-        }, 1000);
-      } else {
-        // 文字从右边屏幕外部，移动回屏幕中的文字原始位置
-        const anim = new Forge.TranslateFrameAnimation(
-          this.LayoutStyle.width,
-          0,
-          this.$props.slideSpeed,
-          true,
-          this.LayoutStyle.width,
-          0
-        );
-        anim.SetAnimationListener(
-          new Forge.AnimationListener(
-            null,
-            (ended) => {
-              if (ended) {
-                // 正常结束，非Cancel时，进行下一个动作
-                this._slideNextStep();
-              }
-            },
-            null
-          )
-        );
-        this.$refs.sliderRef.jsvMaskView.StartAnimation(anim);
-        this.animationCount += 1;
-      }
-    },
-    _AnalyzeStyleChange() {
-      if (this.$props.styleToken !== this.TokenProcessed) {
-        // Token变化时，重新解析style array
-        let style_list;
-        if (this.layoutStyles instanceof Array) {
-          style_list = this.layoutStyles;
-        } else {
-          style_list = [this.layoutStyles];
-        }
-        const layout_set = combinedStyles(style_list, true);
-        this.LayoutStyle = layout_set.combinedStyle;
-        if (this.fontStyles) {
-          if (this.fontStyles instanceof Array) {
-            if (this.fontStyles[0] instanceof JsvStyleClass) {
-              style_list = [...this.fontStyles, sCommonFontStyle];
-            } else {
-              style_list = this.fontStyles.map(
-                (item) => new JsvStyleClass(item)
-              );
-              style_list.push(sCommonFontStyle);
+const slideStep = () => {
+  if (animState == 0) {
+    // 文字从原始位置，移动出屏幕(每次完整移动，停顿1秒)
+    let start = 0,
+      end = fontStyle.value.direction == "rtl" ? textWidth : -textWidth;
+    animIdleHandler = setTimeout(() => {
+      animIdleHandler = -1;
+      const anim = new Forge.TranslateFrameAnimation(
+        start,
+        end,
+        props.slideSpeed,
+        true,
+        0,
+        0
+      );
+      anim.SetAnimationListener(
+        new Forge.AnimationListener(
+          null,
+          (ended) => {
+            if (ended) {
+              // 正常结束，非Cancel时，进行下一个动作
+              slideStep();
             }
-          } else {
-            style_list = [
-              this.fontStyles instanceof JsvStyleClass
-                ? this.fontStyles
-                : new JsvStyleClass(this.fontStyles),
-              sCommonFontStyle,
-            ];
+          },
+          null
+        )
+      );
+      anim.Enable(Forge.AnimationEnable.ReleaseAfterEndCallback);
+      toRaw(slideDiv.value.jsvMaskView).StartAnimation(anim);
+      animState = 1;
+    }, 1000);
+  } else {
+    // 文字从屏幕外部，移动回屏幕中的文字原始位置
+    let start =
+        fontStyle.value.direction == "rtl" ? -props.style.width : props.style.width,
+      end = 0;
+    const anim = new Forge.TranslateFrameAnimation(
+      start,
+      end,
+      props.slideSpeed,
+      true,
+      props.style.width,
+      0
+    );
+    anim.SetAnimationListener(
+      new Forge.AnimationListener(
+        null,
+        (ended) => {
+          if (ended) {
+            // 正常结束，非Cancel时，进行下一个动作
+            slideStep();
           }
-          const font_set = combinedStyles(style_list);
-          this.FontStyle = font_set.combinedStyle;
-          this.FontStyleClass = font_set.combinedClass;
-        }
+        },
+        null
+      )
+    );
+    toRaw(slideDiv.value.jsvMaskView).StartAnimation(anim);
+    animState = 0;
+  }
+};
 
-        if (this.FontStyleClass && this.FontStyleClass.length === 0) {
-          this.FontStyleClass = null;
-        }
-        this.TokenProcessed = this.styleToken;
-      }
-    },
-  },
-  created() {
-    this._AnalyzeStyleChange();
-  },
-  mounted() {
-    this._asyncStartSlider();
-  },
-  unmounted() {
-    // 清理所有异步处理，并停止Slider动作
-    if (this.asyncTextLenTimer >= 0) {
-      clearTimeout(this.asyncTextLenTimer);
-      this.asyncTextLenTimer = -1;
+const stopSlide = () => {
+  if (animIdleHandler > 0) {
+    clearTimeout(animIdleHandler);
+    animIdleHandler = -1;
+  }
+  animState = 0;
+  toRaw(slideDiv.value?.jsvMaskView)?.StopAnimation();
+};
+
+const asyncStartAnim = () => {
+  stopSlide();
+  // 稍进行延迟，以等待JsView的native端描绘文字并回传文字宽度
+  if (asyncStartHandler > 0) {
+    clearTimeout(asyncStartHandler);
+  }
+  asyncStartHandler = setTimeout(() => {
+    if (textWidth <= 0) {
+      textWidth = textDiv.value.clientWidth;
     }
-    this._resetSlider();
-  },
+    if (props.forceSlide || textWidth > props.style.width) {
+      slideStep();
+    }
+    asyncStartHandler = -1;
+  }, 500);
 };
+
+onMounted(() => {
+  if (fontStyle.value.direction == "ltr") {
+    //普通的ltr文字异步通过clientWidth获取文字宽度
+    asyncStartAnim();
+  } else {
+    if (props.forceSlide || textWidth > props.style.width) {
+      slideStep();
+    }
+  }
+});
+
+onBeforeUnmount(() => {
+  clearTimeout(asyncStartHandler);
+  asyncStartHandler = -1;
+  stopSlide();
+});
 </script>
 
 <template>
-  <div :style="{ ...LayoutStyle, overflow: 'hidden' }">
+  <div
+    :style="{
+      left: style.left,
+      top: style.top,
+      width: style.width,
+      height: style.height,
+      overflow: 'hidden',
+    }"
+  >
     <div
-      ref="sliderRef"
+      ref="slideDiv"
       :style="{
-        left: 0,
+        left: slideDivLeft,
         top: 0,
-        width: LayoutStyle.width,
-        height: LayoutStyle.height,
+        width: style.width,
+        height: style.height,
       }"
     >
       <div
-        ref="textRef"
-        :className="_className"
-        :style="{ ...FontStyle, height: LayoutStyle.height }"
-        :jsv_text_align_minwidth="LayoutStyle.width"
-        jsv-inherit-class="2"
+        ref="textDiv"
+        :style="{ ...fontStyle, height: style.height }"
+        :jsv_text_align_minwidth="style.width"
       >
         {{ text }}
       </div>