@dolphinweex/weex-harmony 0.1.107 → 0.1.109

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dolphinweex/weex-harmony",
-  "version": "0.1.107",
+  "version": "0.1.109",
   "description": "weex harmony adapter",
   "main": "index.js",
   "files": [

package/src/components/midea-apng-view-base.vue

@@ -57,6 +57,7 @@ export default {
         loop: this.loop,
         auto: this.auto,
         onPlayComplete: this.onPlayComplete,
+        preloadImage: this.preloadImage
       };
     },
   },
@@ -69,6 +70,16 @@ export default {
     onPlayComplete(res) {
       this.$emit('onPlayComplete', res);
     },
+    preloadImage(res) {
+      if (res === 'success') {
+      this.$emit('onLoadSuccess', res);
+    } else if (res === 'fail') {
+      this.$emit('onLoadFail', res);
+    } else {
+      // 兜底
+      this.$emit('preloadImage', res);
+    }
+    },
     // 自定义拓展其它逻辑
     play(params, callback, callbackFail) {
       weexModule.callNative('apngHandle', {

package/src/components/midea-ipc-ijkplayer-view.vue

@@ -36,6 +36,7 @@ export default {
       embedPosition: 'static',
       defaultWidth: '100%',
       defaultHeight: '100%',
+      embedId: '',
     };
   },
   name: 'MideaIpcIjkplayerView',
@@ -77,6 +78,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    isPipMode: {
+      type: Boolean,
+      default: false,
+    },
     videoResize: {
       type: Number,
       default: 0,
@@ -135,21 +140,37 @@ export default {
       type: Boolean,
       default: false,
     },
+    monitorFullScreenBtn: {
+      type: Boolean,
+      default: false,
+    },
+    monitorBackBtn: {
+      type: Boolean,
+      default: false,
+    },
+    // 回放大窗才需要拉取 P2P 信令进度；小窗关闭可减少无效轮询。
+    isNeedRequestProgress: {
+      type: Boolean,
+      default: true,
+    },
   },
   computed: {
+    ref() {
+      return this.embedId;
+    },
     hosSameLayerArgs() {
       return {
-        ...this.hosUniqueProps, // 鸿蒙原生组件独有属性
+        ...this.hosUniqueProps,
         width: this.width,
         height: this.height,
         controls: this.controls,
         onFullscreenChange: this.onFullscreenChange,
-        // 视频播放器相关属性
         config: this.config,
         muted: this.muted,
         playStatus: this.playStatus,
         needDownload: this.needDownload,
         isSupportScale: this.isSupportScale,
+        isPipMode: this.isPipMode,
         videoResize: this.videoResize,
         autoplay: this.autoplay,
         videoCover: this.videoCover,
@@ -162,8 +183,10 @@ export default {
         data: this.data,
         src: this.src,
         isShowTopRightViewOnPortrait: this.isShowTopRightViewOnPortrait,
-
-        // 事件回调
+        monitorFullScreenBtn: this.monitorFullScreenBtn,
+        monitorBackBtn: this.monitorBackBtn,
+        // SameLayer 参数更新会直接触发 native updaeteFn，用于大小窗切换后恢复/停止进度轮询。
+        isNeedRequestProgress: this.isNeedRequestProgress,
         onProgress: this.onProgress,
         onStart: this.onStart,
         onPause: this.onPause,
@@ -175,7 +198,10 @@ export default {
         onStartDownload: this.onStartDownload,
         onPreviewImageClick: this.onPreviewImageClick,
         onCaptureCompletion: this.onCaptureCompletion,
-        onPlayerClick: this.onPlayerClick
+        onPlayerClick: this.onPlayerClick,
+        onSwitchFullScreen: this.onSwitchFullScreen,
+        onClickBack: this.onClickBack,
+        onScaleChanged: this.onScaleChanged,
       };
     },
   },
@@ -189,66 +215,63 @@ export default {
       this.defaultHeight = this.$refs.sameLayer.$el.clientHeight;
       this.defaultPosition =
         this.$refs.sameLayer.$el.style.position || 'static';
+      this.embedId = this.$refs.sameLayer.embedId;
     });
   },
   methods: {
-    setSpeed(params){
-      // {"speed": 1}
-      console.log('cdj---setSpeed',JSON.stringify(params))
-      delete params.refId
+    setSpeed(params) {
+      delete params.refId;
       weexModule.callNative(
         'ijkLinkApi',
         {
           method: 'setSpeed',
           name: this.embedId,
-          params
+          params,
         },
         callback
       );
     },
-    //{"progress": 221}
-    seek(params){
-      console.log('cdj---setSpseekeed',JSON.stringify(params))
-      delete params.refId
+    seek(params) {
+      delete params.refId;
       weexModule.callNative(
         'ijkLinkApi',
         {
           method: 'seek',
           name: this.embedId,
-          params
+          params,
         },
         callback
       );
     },
-    captureImage(params,callback) {
-      delete params.refId
+    captureImage(params, callback) {
+      delete params.refId;
       weexModule.callNative(
         'ijkLinkApi',
         {
           method: 'captureImage',
           name: this.embedId,
-          params
+          params,
         },
         callback
       );
     },
-    finishFullScreen(){
-      try{
-        this.$bridge.setPageOrientation({ orientation: 0 })
-      }catch(e){
+    finishFullScreen() {
+      try {
+        this.$bridge.setPageOrientation({ orientation: 0 });
+      } catch (e) {
       }
       this.embedPosition = this.defaultPosition;
       this.embedHeight = this.windowHeight;
       this.embedWidth = this.windowWidth;
     },
-    disabledEvent(){
-      document.body.style.pointerEvents = 'none'
-      setTimeout(()=>{
-        document.body.style.pointerEvents = 'auto'
-      },1000)
+    disabledEvent() {
+      document.body.style.pointerEvents = 'none';
+      setTimeout(() => {
+        document.body.style.pointerEvents = 'auto';
+      }, 1000);
     },
     onFullscreenChange(isFullScreeen) {
-      this.disabledEvent()
+      this.disabledEvent();
       if (isFullScreeen.flag) {
         this.embedPosition = 'fixed';
         this.embedHeight = this.windowWidth;
@@ -259,58 +282,57 @@ export default {
         this.embedWidth = this.defaultWidth;
       }
     },
-    // 自定义拓展其它逻辑
     onProgress(res) {
       this.$emit('onProgress', res);
     },
-
     onStart(res) {
       this.$emit('start', res);
     },
-
     onPause(res) {
       this.$emit('Pause', res);
     },
-
     finish(res) {
       this.$emit('finish', res);
     },
-
     onFail(res) {
       this.$emit('fail', res);
     },
-
     onReadyToPlay(res) {
       this.$emit('readyToPlay', res);
     },
-
     deleteVideo(res) {
       this.$emit('deleteVideo', res);
     },
-
     onDownloadSuccess(res) {
       this.$emit('onDownloadSuccess', res);
     },
-
-   onStartDownload(res) {
+    onStartDownload(res) {
       this.$emit('onStartDownload', res);
     },
-
     onPreviewImageClick(res) {
       this.$emit('onPreviewImageClick', res);
     },
-    onCaptureCompletion(res){
+    onCaptureCompletion(res) {
       this.$emit('onCaptureCompletion', res);
     },
-    onPlayerClick(res){
+    onPlayerClick(res) {
       this.$emit('onPlayerClick', res);
-    }
+    },
+    onSwitchFullScreen(res) {
+      this.$emit('onSwitchFullScreen', res);
+    },
+    onClickBack(res) {
+      this.$emit('onClickBack', res);
+    },
+    onScaleChanged(res) {
+      this.$emit('onScaleChanged', res);
+    },
+  },
+  destroy() {
+    this.embedPosition = this.defaultPosition;
+    this.embedHeight = this.defaultHeight;
+    this.embedWidth = this.defaultWidth;
+    document.body.style.pointerEvents = 'auto';
   },
-  destroy(){
-      this.embedPosition = this.defaultPosition;
-      this.embedHeight = this.defaultHeight;
-      this.embedWidth = this.defaultWidth;
-      document.body.style.pointerEvents = 'auto'
-  }
 };
 </script>

package/src/components/midea-ipc-live-view.vue

@@ -1,5 +1,6 @@
 <template>
   <BaseSameLayer
+    ref="baseSameLayer"
     :hosSameLayerArgs="hosSameLayerArgs"
     embedType="native/midea-ipc-live-view"
     :defaultWidth="300"
@@ -16,6 +17,7 @@ export default {
     return {
       width: 0,
       height: 0,
+      embedId: '',
     };
   },
   name: 'MideaIpcLiveView',
@@ -32,7 +34,6 @@ export default {
       default: '',
     },
     videoResize: {
-      // videoResize?: 0 | 1 | 2; // 0=Aspect,1=AspectFill,2=Resize（容器表现）
       type: Number,
       default: '',
     },
@@ -52,6 +53,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    isPipMode: {
+      type: Boolean,
+      default: false,
+    },
     controls: {
       type: Boolean,
       default: false,
@@ -60,6 +65,34 @@ export default {
       type: Object,
       default: () => {},
     },
+    channel: {
+      type: [Number, String],
+      default: 0,
+    },
+    playStatus: {
+      type: String,
+      default: '',
+    },
+    mute: {
+      type: [Number, Boolean],
+      default: 1,
+    },
+    writeToFile: {
+      type: Number,
+      default: 1,
+    },
+    analyzeDuration: {
+      type: Number,
+      default: 100000,
+    },
+    isOnlyOnePlayer: {
+      type: Boolean,
+      default: true,
+    },
+    disallowInterceptTouchEvent: {
+      type: Boolean,
+      default: false,
+    },
     hosUniqueProps: {
       type: Object,
       default() {
@@ -74,25 +107,41 @@ export default {
     },
   },
   computed: {
+    ref() {
+      return this.embedId;
+    },
+    muted() {
+      return this.mute === 1 || this.mute === true;
+    },
     hosSameLayerArgs() {
       return {
-        ...this.hosUniqueProps, // 鸿蒙原生组件独有属性
+        ...this.hosUniqueProps,
         width: this.width,
         height: this.height,
         data: this.data,
         src: this.src,
         url: this.url,
+        channel: this.channel,
+        playStatus: this.playStatus,
+        muted: this.muted,
+        mute: this.mute,
+        writeToFile: this.writeToFile,
+        analyzeDuration: this.analyzeDuration,
+        isOnlyOnePlayer: this.isOnlyOnePlayer,
+        disallowInterceptTouchEvent: this.disallowInterceptTouchEvent,
         videoResize: this.videoResize,
         autoplay: this.autoplay,
         videoCover: this.videoCover,
         bottomShadow: this.bottomShadow,
         isSupportScale: this.isSupportScale,
+        isPipMode: this.isPipMode,
         controls: this.controls,
         topShadow: this.topShadow,
         hosUniqueProps: this.hosUniqueProps,
         onPlayerClick: this.onPlayerClick,
         onMoveControl: this.onMoveControl,
         onScaleControl: this.onScaleControl,
+        onScaleChanged: this.onScaleChanged,
         onMoveEnd: this.onMoveEnd,
         onStatePrepared: this.onStatePrepared,
         onAutoCompletion: this.onAutoCompletion,
@@ -103,93 +152,103 @@ export default {
   mounted() {
     this.width = this.$el.clientWidth;
     this.height = this.$el.clientHeight;
+    this.embedId = this.$refs.baseSameLayer && this.$refs.baseSameLayer.embedId;
+    this.syncEmbedSize();
+  },
+  updated() {
+    this.syncEmbedSize();
   },
-  watch:{
-    url(newV){
-      console.log('cdj-------------url',newV)
-    }
-  },  
   methods: {
-    captureImage(params,callback) {
-      delete params.refId
+    syncEmbedSize() {
+      if (!this.$el) {
+        return;
+      }
+      const w = this.$el.clientWidth;
+      const h = this.$el.clientHeight;
+      if (w > 0 && h > 0 && (w !== this.width || h !== this.height)) {
+        this.width = w;
+        this.height = h;
+      }
+    },
+    captureImage(params, callback) {
+      delete params.refId;
       weexModule.callNative(
         'ipcLinkApi',
         {
           method: 'captureImage',
           name: this.embedId,
-          params
+          params,
         },
         callback
       );
     },
-    switchVideoQuality(params,callback) {
+    switchVideoQuality(params, callback) {
       weexModule.callNative(
         'ipcLinkApi',
         {
           method: 'switchVideoQuality',
           name: this.embedId,
-          params
+          params,
         },
         callback
       );
     },
-    getVideoNetworkSpeed(params,callback) {
+    getVideoNetworkSpeed(params, callback) {
       weexModule.callNative(
         'ipcLinkApi',
         {
           method: 'getVideoNetworkSpeed',
           name: this.embedId,
-          params
+          params,
         },
         callback
       );
     },
-    startRecord(params,callback) {
+    startRecord(params, callback) {
       weexModule.callNative(
         'ipcLinkApi',
         {
           method: 'startRecord',
           name: this.embedId,
-          params
+          params,
         },
         callback
       );
     },
-    stopRecord(params,callback) {
+    stopRecord(params, callback) {
       weexModule.callNative(
         'ipcLinkApi',
         {
           method: 'stopRecord',
           name: this.embedId,
-          params
+          params,
         },
         callback
       );
     },
-    changeAudioStatus(params,callback){
+    changeAudioStatus(params, callback) {
       weexModule.callNative(
         'ipcLinkApi',
         {
           method: 'changeAudioStatus',
           name: this.embedId,
-          params
+          params,
         },
         callback
       );
     },
-    // 自定义拓展其它逻辑
     onPlayerClick(res) {
       this.$emit('onPlayerClick', res);
     },
-
     onMoveControl(res) {
       this.$emit('onMoveControl', res);
     },
-
     onScaleControl(res) {
       this.$emit('onScaleControl', res);
     },
-
+    onScaleChanged(res) {
+      this.$emit('onScaleChanged', res);
+    },
     onMoveEnd(res) {
       this.$emit('onMoveEnd', res);
     },

package/src/components/midea-progresscycle-view.vue

@@ -49,6 +49,7 @@ export default {
         height: this.height,
         data: this.data, 
         handleProgresscycleTap: this.handleProgresscycleTap,
+        isVisabled: true //新增参数避免影响到旧插件
       };
       return result;
     },