@dolphinweex/weex-harmony 0.1.73 → 0.1.75

package/package.json

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

package/src/components/midea-common-weex-view.vue

@@ -38,6 +38,8 @@ export default {
         Date.now().toString(36) + Math.random().toString(36).substring(2)
       }`,
       height: '0px',
+      _resizeObserver: null,
+      _heightCheckTimer: null,
     };
   },
   components: {
@@ -126,20 +128,6 @@ export default {
     this._rafId = null;
     this._pendingGesture = null;
     this._onMessage = (event) => {
-      if(event.data.type==='IFRAME_CONTENT_HEIGHT'){
-        const h = Number(event.data.height) || 0;
-        if (!h) {
-          this.height = '100%'
-          return;
-        }
-        if (this._wrapperEl) {
-          this._wrapperEl.style.height = `${h}px`;
-        }
-        this.height = `${h / weex.config.env.scale}px`;
-        return
-      }else{
-        document.getElementsByTagName('iframe')[0].height = event.data.height
-      }
       // 处理iframe手势跨窗口传递冒泡
       if (event.data.type === 'IFRAME_GESTURE') {
         const gestureData = event.data;
@@ -173,6 +161,112 @@ export default {
           JSON.stringify(window.$midea_harmony_native),
           "*"
         );
+        
+        // 启动 weex-root 第一个子元素的高度监听
+        this.startWeexRootHeightMonitoring();
+      }
+    },
+    
+    // 监听 iframe 内 .weex-root 第一个子元素或 .weex-scroller-inner 的高度
+    startWeexRootHeightMonitoring() {
+      // 尝试多次查找元素（因为 iframe 内容可能还在加载）
+      let attempts = 0;
+      const maxAttempts = 20; // 最多尝试 20 次
+      
+      this._heightCheckTimer = setInterval(() => {
+        attempts++;
+        
+        const iframe = document.getElementById(this.embedId);
+        if (!iframe) {
+          if (attempts >= maxAttempts) {
+            clearInterval(this._heightCheckTimer);
+            console.warn(`未找到 iframe: ${this.embedId}`);
+          }
+          return;
+        }
+        
+        try {
+          const iframeDocument = iframe.contentDocument || iframe.contentWindow.document;
+          let targetElement = null;
+          let elementDesc = '';
+          
+          // 查找 .weex-root 的第一个子元素
+          const weexRoot = iframeDocument.querySelector('.weex-root');
+          const weexRootFirstChild = (weexRoot && weexRoot.children.length > 0) ? weexRoot.children[0] : null;
+          
+          // 查找 .weex-scroller-inner
+          const weexScrollerInner = iframeDocument.querySelector('.weex-scroller-inner');
+          
+          // 如果两个都找到了，比较高度，谁大用谁
+          if (weexRootFirstChild && weexScrollerInner) {
+            const rootHeight = weexRootFirstChild.offsetHeight || weexRootFirstChild.clientHeight || 0;
+            const scrollerHeight = weexScrollerInner.offsetHeight || weexScrollerInner.clientHeight || 0;
+            
+            if (rootHeight >= scrollerHeight) {
+              targetElement = weexRootFirstChild;
+              elementDesc = `.weex-root 的第一个子元素 (高度: ${rootHeight}px)`;
+            } else {
+              targetElement = weexScrollerInner;
+              elementDesc = `.weex-scroller-inner (高度: ${scrollerHeight}px)`;
+            }
+          } else if (weexRootFirstChild) {
+            // 只找到 .weex-root 的第一个子元素
+            targetElement = weexRootFirstChild;
+            elementDesc = '.weex-root 的第一个子元素';
+          } else if (weexScrollerInner) {
+            // 只找到 .weex-scroller-inner
+            targetElement = weexScrollerInner;
+            elementDesc = '.weex-scroller-inner';
+          }
+          
+          // 找到目标元素，开始监听
+          if (targetElement) {
+            console.log(`找到 ${elementDesc}，开始监听高度变化`, targetElement);
+            
+            // 清除定时器，找到了就不再尝试
+            clearInterval(this._heightCheckTimer);
+            
+            // 立即更新一次高度
+            this.updateIframeHeightFromElement(targetElement);
+            
+            // 使用 ResizeObserver 监听元素高度变化
+            this._resizeObserver = new ResizeObserver(() => {
+              this.updateIframeHeightFromElement(targetElement);
+            });
+            this._resizeObserver.observe(targetElement);
+            
+          } else if (attempts >= maxAttempts) {
+            clearInterval(this._heightCheckTimer);
+            console.warn('未找到 .weex-root 的第一个子元素 或 .weex-scroller-inner');
+          }
+        } catch (e) {
+          if (attempts >= maxAttempts) {
+            clearInterval(this._heightCheckTimer);
+            console.warn('无法访问 iframe 内容（可能跨域）:', e.message);
+          }
+        }
+      }, 200); // 每 200ms 尝试一次
+    },
+    
+    // 根据元素高度更新 iframe 高度
+    updateIframeHeightFromElement(element) {
+      if (!element) return;
+      
+      // 获取元素的实际高度
+      const elementHeight = element.offsetHeight || element.clientHeight || element.scrollHeight;
+      
+      if (elementHeight > 0) {
+        // 更新包装器高度
+        if (this._wrapperEl) {
+          this._wrapperEl.style.height = `${elementHeight}px`;
+        }
+        
+        // 更新 iframe 高度（考虑 weex scale）
+        const newHeight = `${elementHeight / weex.config.env.scale}px`;
+        if (this.height !== newHeight) {
+          this.height = newHeight;
+          console.log(`iframe 高度已更新: ${elementHeight}px -> ${newHeight} (embedId: ${this.embedId})`);
+        }
       }
     },
     handleGestureBubble(gestureData) {
@@ -220,11 +314,24 @@ export default {
     },
   },
   beforeDestroy() {
+    // 清理 ResizeObserver
+    if (this._resizeObserver) {
+      this._resizeObserver.disconnect();
+      this._resizeObserver = null;
+    }
+    
+    // 清理定时器
+    if (this._heightCheckTimer) {
+      clearInterval(this._heightCheckTimer);
+      this._heightCheckTimer = null;
+    }
+    
     // 清理RAF避免内存泄漏
     if (this._rafId) {
       cancelAnimationFrame(this._rafId);
       this._rafId = null;
     }
+    
     // 清理消息监听
     if (this._onMessage) {
       window.removeEventListener("message", this._onMessage, false);

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

@@ -16,6 +16,7 @@
             left: 0,
             bottom: 0,
             right: 0,
+            zIndex: 1
           }
     "
   ></BaseSameLayer>

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

@@ -0,0 +1,240 @@
+<template>
+  <BaseSameLayer
+    :hosSameLayerArgs="hosSameLayerArgs"
+    ref="sameLayer"
+    embedType="native/midea-ipc-ijkplayer-view"
+    :defaultWidth="'100%'"
+    :defaultHeight="'100%'"
+    :embedWidth="embedWidth"
+    :embedHeight="embedHeight"
+    :style="
+      embedPosition !== 'fixed'
+        ? { position: embedPosition }
+        : {
+            position: embedPosition,
+            top: 0,
+            left: 0,
+            bottom: 0,
+            right: 0,
+            zIndex: 1
+          }
+    "
+  ></BaseSameLayer>
+</template>
+
+<script>
+import BaseSameLayer from './baseSameLayer.vue';
+
+export default {
+  data() {
+    return {
+      width: 0,
+      height: 0,
+      embedWidth: '100%',
+      embedHeight: '100%',
+      embedPosition: 'static',
+      defaultWidth: '100%',
+      defaultHeight: '100%',
+    };
+  },
+  name: 'MideaIpcIjkplayerView',
+  components: {
+    BaseSameLayer,
+  },
+  props: {
+    hosUniqueProps: {
+      type: Object,
+      default() {
+        return {};
+      },
+    },
+    data: {
+      type: Object,
+      default() {
+        return {};
+      },
+    },
+    config: {
+      type: Object,
+      default() {
+        return {};
+      },
+    },
+    muted: {
+      type: Boolean,
+      default: false,
+    },
+    playStatus: {
+      type: String,
+      default: 'normal',
+    },
+    needDownload: {
+      type: Boolean,
+      default: false,
+    },
+    isSupportScale: {
+      type: Boolean,
+      default: false,
+    },
+    videoResize: {
+      type: Number,
+      default: 0,
+    },
+    autoplay: {
+      type: Boolean,
+      default: false,
+    },
+    videoCover: {
+      type: String,
+      default: '',
+    },
+    uiVisible: {
+      type: Object,
+      default() {
+        return {
+          voiceBtnVisible: true,
+          speedBtnVisible: true,
+          captureBtnVisible: true,
+          downloadBtnVisible: true,
+          batteryTimeLayoutVisible: false,
+        };
+      },
+    },
+    speedList: {
+      type: Array,
+      default() {
+        return ['0.5', '1', '1.5', '2'];
+      },
+    },
+    extraInfo: {
+      type: String,
+      default: '',
+    },
+    deleteBtnVisible: {
+      type: Number,
+      default: 0,
+    },
+    downloadDir: {
+      type: String,
+      default: '',
+    },
+    albumName: {
+      type: String,
+      default: '',
+    },
+    src: {
+      type: String,
+      default: '',
+    },
+    isShowTopRightViewOnPortrait: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  computed: {
+    hosSameLayerArgs() {
+      return {
+        ...this.hosUniqueProps, // 鸿蒙原生组件独有属性
+        width: this.width,
+        height: this.height,
+        onFullscreenChange: this.onFullscreenChange,
+        // 视频播放器相关属性
+        config: this.config,
+        muted: this.muted,
+        playStatus: this.playStatus,
+        needDownload: this.needDownload,
+        isSupportScale: this.isSupportScale,
+        videoResize: this.videoResize,
+        autoplay: this.autoplay,
+        videoCover: this.videoCover,
+        uiVisible: this.uiVisible,
+        speedList: this.speedList,
+        extraInfo: this.extraInfo,
+        deleteBtnVisible: this.deleteBtnVisible,
+        downloadDir: this.downloadDir,
+        albumName: this.albumName,
+        data: this.data,
+        src: this.src,
+        isShowTopRightViewOnPortrait: this.isShowTopRightViewOnPortrait,
+
+        // 事件回调
+        onProgress: this.onProgress,
+        onStart: this.onStart,
+        onPause: this.onPause,
+        finish: this.finish,
+        onFail: this.onFail,
+        onReadyToPlay: this.onReadyToPlay,
+        deleteVideo: this.deleteVideo,
+        onDownloadSuccess: this.onDownloadSuccess,
+        onStartDownload: this.onStartDownload,
+        onPreviewImageClick: this.onPreviewImageClick,
+      };
+    },
+  },
+  mounted() {
+    this.width = this.$el.clientWidth;
+    this.height = this.$el.clientHeight;
+    this.windowWidth = window.innerWidth;
+    this.windowHeight = window.innerHeight;
+    this.$nextTick(() => {
+      this.defaultWidth = this.$refs.sameLayer.$el.clientWidth;
+      this.defaultHeight = this.$refs.sameLayer.$el.clientHeight;
+      this.defaultPosition =
+        this.$refs.sameLayer.$el.style.position || 'static';
+    });
+  },
+  methods: {
+    onFullscreenChange(isFullScreeen) {
+      if (isFullScreeen.flag) {
+        this.embedPosition = 'fixed';
+        this.embedHeight = this.windowWidth;
+        this.embedWidth = this.windowHeight;
+      } else {
+        this.embedPosition = this.defaultPosition;
+        this.embedHeight = this.defaultHeight;
+        this.embedWidth = this.defaultWidth;
+      }
+    },
+    // 自定义拓展其它逻辑
+    onProgress(res) {
+      this.$emit('onProgress', res);
+    },
+
+    onStart(res) {
+      this.$emit('onStart', res);
+    },
+
+    onPause(res) {
+      this.$emit('onPause', res);
+    },
+
+    finish(res) {
+      this.$emit('finish', res);
+    },
+
+    onFail(res) {
+      this.$emit('onFail', res);
+    },
+
+    onReadyToPlay(res) {
+      this.$emit('onReadyToPlay', res);
+    },
+
+    deleteVideo(res) {
+      this.$emit('deleteVideo', res);
+    },
+
+    onDownloadSuccess(res) {
+      this.$emit('onDownloadSuccess', res);
+    },
+
+    onStartDownload(res) {
+      this.$emit('onStartDownload', res);
+    },
+
+    onPreviewImageClick(res) {
+      this.$emit('onPreviewImageClick', res);
+    },
+  },
+};
+</script>

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

@@ -0,0 +1,195 @@
+<template>
+  <BaseSameLayer
+    :hosSameLayerArgs="hosSameLayerArgs"
+    embedType="native/midea-ipc-live-view"
+    :defaultWidth="300"
+    :defaultHeight="300"
+  ></BaseSameLayer>
+</template>
+
+<script>
+import BaseSameLayer from './baseSameLayer.vue';
+const weexModule = weex.requireModule('weexModule');
+
+export default {
+  data() {
+    return {
+      width: 0,
+      height: 0,
+    };
+  },
+  name: 'MideaIpcLiveView',
+  components: {
+    BaseSameLayer,
+  },
+  props: {
+    src: {
+      type: String,
+      default: '',
+    },
+    url: {
+      type: String,
+      default: '',
+    },
+    videoResize: {
+      // videoResize?: 0 | 1 | 2; // 0=Aspect,1=AspectFill,2=Resize（容器表现）
+      type: Number,
+      default: '',
+    },
+    autoplay: {
+      type: Boolean,
+      default: false,
+    },
+    videoCover: {
+      type: String,
+      default: '',
+    },
+    bottomShadow: {
+      type: Object,
+      default: () => {},
+    },
+    isSupportScale: {
+      type: Boolean,
+      default: false,
+    },
+    controls: {
+      type: Boolean,
+      default: false,
+    },
+    topShadow: {
+      type: Object,
+      default: () => {},
+    },
+    hosUniqueProps: {
+      type: Object,
+      default() {
+        return {};
+      },
+    },
+    data: {
+      type: Object,
+      default() {
+        return {};
+      },
+    },
+  },
+  computed: {
+    hosSameLayerArgs() {
+      return {
+        ...this.hosUniqueProps, // 鸿蒙原生组件独有属性
+        width: this.width,
+        height: this.height,
+        data: this.data,
+        src: this.src,
+        url: this.url,
+        videoResize: this.videoResize,
+        autoplay: this.autoplay,
+        videoCover: this.videoCover,
+        bottomShadow: this.bottomShadow,
+        isSupportScale: this.isSupportScale,
+        controls: this.controls,
+        topShadow: this.topShadow,
+        hosUniqueProps: this.hosUniqueProps,
+        onPlayerClick: this.onPlayerClick,
+        onMoveControl: this.onMoveControl,
+        onScaleControl: this.onScaleControl,
+        onMoveEnd: this.onMoveEnd,
+        onStatePrepared: this.onStatePrepared,
+        onAutoCompletion: this.onAutoCompletion,
+        onStateAutoComplete: this.onStateAutoComplete,
+      };
+    },
+  },
+  mounted() {
+    this.width = this.$el.clientWidth;
+    this.height = this.$el.clientHeight;
+  },
+  watch:{
+    url(newV){
+      console.log('cdj-------------url',newV)
+    }
+  },  
+  methods: {
+    switchVideoQuality(params,callback) {
+      weexModule.callNative(
+        'ipcLinkApi',
+        {
+          method: 'switchVideoQuality',
+          name: this.embedId,
+          params
+        },
+        callback
+      );
+    },
+    getVideoNetworkSpeed(params,callback) {
+      weexModule.callNative(
+        'ipcLinkApi',
+        {
+          method: 'getVideoNetworkSpeed',
+          name: this.embedId,
+          params
+        },
+        callback
+      );
+    },
+    startRecord(params,callback) {
+      weexModule.callNative(
+        'ipcLinkApi',
+        {
+          method: 'startRecord',
+          name: this.embedId,
+          params
+        },
+        callback
+      );
+    },
+    stopRecord(params,callback) {
+      weexModule.callNative(
+        'ipcLinkApi',
+        {
+          method: 'stopRecord',
+          name: this.embedId,
+          params
+        },
+        callback
+      );
+    },
+    changeAudioStatus(params,callback){
+      weexModule.callNative(
+        'ipcLinkApi',
+        {
+          method: 'changeAudioStatus',
+          name: this.embedId,
+          params
+        },
+        callback
+      );
+    },
+    // 自定义拓展其它逻辑
+    onPlayerClick(res) {
+      this.$emit('onPlayerClick', res);
+    },
+
+    onMoveControl(res) {
+      this.$emit('onMoveControl', res);
+    },
+
+    onScaleControl(res) {
+      this.$emit('onScaleControl', res);
+    },
+
+    onMoveEnd(res) {
+      this.$emit('onMoveEnd', res);
+    },
+    onStatePrepared() {
+      this.$emit('onStatePrepared');
+    },
+    onAutoCompletion() {
+      this.$emit('onAutoCompletion');
+    },
+    onStateAutoComplete() {
+      this.$emit('onStateAutoComplete');
+    },
+  },
+};
+</script>

package/src/index.js

@@ -74,11 +74,21 @@ const componentMap = [
     componentAddress: 'midea-ijkplayer-view.vue',
     isInPlugin: false
   },
+  {
+    componentName: 'MideaIpcIjkplayerView',
+    componentAddress: 'midea-ipc-ijkplayer-view',
+    isInPlugin: false
+  },
   {
     componentName: 'MideaIotlinkvideoView',
     componentAddress: 'midea-iotlinkvideo-view.vue',
     isInPlugin: false
   },
+  {
+    componentName: 'MideaIpcLiveView',
+    componentAddress: 'midea-ipc-live-view.vue',
+    isInPlugin: false
+  },
   {
     componentName: 'MideaSeekBar',
     componentAddress: 'midea-seek-bar-base.vue',