@dolphinweex/weex-harmony 0.1.58 → 0.1.60

package/package.json

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

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

@@ -1,22 +1,49 @@
 <template>
   <div>
     <!-- <text v-if="progressText.length > 0">{{progressText}}</text> -->
-    <iframe class="common-view-iframe" v-if="url.length > 0" :src="url" :style="{backgroundColor: backgroundColor}" ref="iframe" @load="onPageFinish"></iframe>
+    <iframe
+      class="common-view-iframe"
+      :id="embedId"
+      v-if="url.length > 0 && pluginType != 'old-h5'"
+      :src="url"
+      :style="{ backgroundColor: backgroundColor, height: height }"
+      ref="iframe"
+      @load="onPageFinish"
+    ></iframe>
+
+    <BaseSameLayer
+      class="common-view-iframe"
+      v-if="pluginType == 'old-h5'"
+      :hosSameLayerArgs="hosSameLayerArgs"
+      embedType="native/midea-common-weex-view"
+      :defaultWidth="300"
+      :defaultHeight="300"
+    ></BaseSameLayer>
     <!-- <image v-if="progressText.length > 0" /> -->
   </div>
 </template>
 
 <script>
-const weexModule = weex.requireModule('weexModule') 
+import BaseSameLayer from "./baseSameLayer.vue";
+
+const weexModule = weex.requireModule("weexModule");
 
 export default {
   data() {
     return {
       url: "",
+      pluginType: "weex",
       backgroundColor: "transparent",
-      progressText: ""
+      progressText: "",
+      embedId: `embedId_iframe_${
+        Date.now().toString(36) + Math.random().toString(36).substring(2)
+      }`,
+      height: "100%",
     };
   },
+  components: {
+    BaseSameLayer,
+  },
   name: "MideaCommonWeexView",
   props: {
     hosUniqueProps: {
@@ -38,11 +65,6 @@ export default {
       type: Object,
     },
   },
-  // watch:{
-  //   backgroundColor(oldColor, newColor){
-  //     this.$refs["iframe"].contentWindow.document.style.backgroundColor = newColor
-  //   }
-  // },
   created() {
     weexModule.callNative(
       `webview.webHandle`,
@@ -54,35 +76,83 @@ export default {
         pluginData: this.pluginData,
       },
       (args) => {
-        if (args.progressText){
+        if (args.progressText) {
           this.progressText = args.progressText;
-        } else if (args.url) { 
-          this.url = args.url;
+        } else if (args.url) {
+          this.url =  args.url;
           this.backgroundColor = args.pageBackgroundColor;
+          this.pluginType = args.pluginType
         }
       }
     );
   },
+  computed: {
+    hosSameLayerArgs() {
+      return {
+        ...this.hosUniqueProps, // 鸿蒙原生组件独有属性
+        width: this.$el.clientWidth,
+        height: this.$el.clientHeight,
+        data: {
+          router: this.router,
+          src: this.url,
+          backgroundColor: this.backgroundColor,
+          pluginData: this.pluginData,
+        }
+      };
+    },
+  },
   mounted() {
-    this.$refs["iframe"].addEventListener('load', this.onPageFinish);
-    window.addEventListener('message', function (event) {
-      document.getElementsByTagName('iframe')[0].height = event.data.height
-    });
+    // this.$refs["iframe"].addEventListener('load', this.onPageFinish);
+    const iframeEl = this.$refs.iframe;
+    if (iframeEl) iframeEl.addEventListener("load", this.onPageFinish);
+    // 从父组件根节点内查找：既是 .midea-common-weex-view，又包含当前 iframe 的 embedId
+    const findWrapperFromParent = () => {
+      const parentEl = this.$parent && this.$parent.$el;
+      if (!parentEl) return null;
+
+      const candidates = parentEl.querySelectorAll(".midea-common-weex-view");
+      // 用 CSS.escape 规避特殊字符（低端内核可用兜底）
+      const idSelector =
+        window.CSS && CSS.escape
+          ? `#${CSS.escape(this.embedId)}`
+          : `[id="${this.embedId}"]`;
+
+      for (const el of candidates) {
+        if (el.querySelector(idSelector)) return el;
+      }
+      return null;
+    };
+    this._wrapperEl = findWrapperFromParent(); // 保存容器引用
+    this._onMessage = (event) => {
+      const h = Number(event.data.height) || 0;
+      if (!h) {
+        return;
+      }
+      if (this._wrapperEl) {
+        this._wrapperEl.style.height = `${h}px`;
+      }
+      this.height = `${h / weex.config.env.scale}px`;
+    };
+    window.addEventListener("message", this._onMessage, false);
   },
-  methods: {  
+  methods: {
     onPageFinish() {
       if (this.$refs["iframe"]) {
-        this.$refs["iframe"].contentWindow.$midea_harmony_native = window.$midea_harmony_native;
+        this.$refs["iframe"].contentWindow.$midea_harmony_native =
+          window.$midea_harmony_native;
         this.$refs["iframe"].contentWindow.isIframe = true;
-        this.$refs["iframe"].contentWindow.postMessage(JSON.stringify(window.$midea_harmony_native), '*');
+        this.$refs["iframe"].contentWindow.postMessage(
+          JSON.stringify(window.$midea_harmony_native),
+          "*"
+        );
       }
     },
-  }
+  },
 };
 </script>
 
 <style scoped>
-.common-view-iframe{
-  height: 100%
+.common-view-iframe {
+  height: 100%;
 }
-</style>
+</style>

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

@@ -0,0 +1,195 @@
+<template>
+  <BaseSameLayer
+    :hosSameLayerArgs="hosSameLayerArgs"
+    embedType="native/midea-iotlinkvideo-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: 'MideaIotlinkvideoView',
+  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(
+        'iotLinkApi',
+        {
+          method: 'switchVideoQuality',
+          name: this.embedId,
+          params
+        },
+        callback
+      );
+    },
+    getVideoNetworkSpeed(params,callback) {
+      weexModule.callNative(
+        'iotLinkApi',
+        {
+          method: 'getVideoNetworkSpeed',
+          name: this.embedId,
+          params
+        },
+        callback
+      );
+    },
+    startRecord(params,callback) {
+      weexModule.callNative(
+        'iotLinkApi',
+        {
+          method: 'startRecord',
+          name: this.embedId,
+          params
+        },
+        callback
+      );
+    },
+    stopRecord(params,callback) {
+      weexModule.callNative(
+        'iotLinkApi',
+        {
+          method: 'stopRecord',
+          name: this.embedId,
+          params
+        },
+        callback
+      );
+    },
+    changeAudioStatus(params,callback){
+      weexModule.callNative(
+        'iotLinkApi',
+        {
+          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,6 +74,11 @@ const componentMap = [
     componentAddress: 'midea-ijkplayer-view.vue',
     isInPlugin: false
   },
+  {
+    componentName: 'MideaIotlinkvideoView',
+    componentAddress: 'midea-iotlinkvideo-view.vue',
+    isInPlugin: false
+  },
   {
     componentName: 'MideaSeekBar',
     componentAddress: 'midea-seek-bar-base.vue',