From a3243aa08c9d7090a396f049925b8f1dcbd08ca3 Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Wed, 20 Nov 2019 20:47:23 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20v3-app=20cover-image=20=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E6=94=AF=E6=8C=81=E4=BA=8B=E4=BB=B6=EF=BC=9Aload?=
 =?UTF-8?q?=E3=80=81error?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/view/mixins/keyboard.js              | 17 ++--
 .../view/components/cover-image/index.vue     | 79 ++++++++++++++++++-
 .../app-plus/view/components/map/index.vue    |  1 +
 src/shared/index.js                           |  5 +-
 4 files changed, 85 insertions(+), 17 deletions(-)

diff --git a/src/core/view/mixins/keyboard.js b/src/core/view/mixins/keyboard.js
index aa8a35749..ce9e8f0f0 100644
--- a/src/core/view/mixins/keyboard.js
+++ b/src/core/view/mixins/keyboard.js
@@ -1,3 +1,7 @@
+import {
+  plusReady
+} from 'uni-shared'
+
 function hideKeyboard () {
   document.activeElement.blur()
 }
@@ -34,15 +38,6 @@ export default {
     this.onKeyboardHide()
   },
   methods: {
-    plusReady (callback) {
-      if (!callback) {
-        return
-      }
-      if (window.plus) {
-        return callback()
-      }
-      document.addEventListener('plusready', callback)
-    },
     initKeyboard (el) {
       el.addEventListener('focus', () => {
         UniViewJSBridge.subscribe('hideKeyboard', hideKeyboard)
@@ -52,12 +47,12 @@ export default {
       el.addEventListener('blur', this.onKeyboardHide)
     },
     showSoftKeybord () {
-      this.plusReady(() => {
+      plusReady(() => {
         plus.key.showSoftKeybord()
       })
     },
     setSoftinputTemporary () {
-      this.plusReady(() => {
+      plusReady(() => {
         var currentWebview = plus.webview.currentWebview()
         var style = currentWebview.getStyle() || {}
         if (style.softinputMode === 'adjustResize') {
diff --git a/src/platforms/app-plus/view/components/cover-image/index.vue b/src/platforms/app-plus/view/components/cover-image/index.vue
index 89af7ccca..5646e8916 100644
--- a/src/platforms/app-plus/view/components/cover-image/index.vue
+++ b/src/platforms/app-plus/view/components/cover-image/index.vue
@@ -1,6 +1,7 @@
 <template>
   <uni-cover-image
     :src="src"
+    :style="imageInfo"
     v-on="$listeners">
     <div
       ref="container"
@@ -10,6 +11,12 @@
 <script>
 import native from '../../mixins/native'
 import cover from '../../mixins/cover'
+import {
+  plusReady
+} from 'uni-shared'
+import {
+  TEMP_PATH
+} from '../../../service/api/constants'
 
 export default {
   name: 'CoverImage',
@@ -18,16 +25,80 @@ export default {
     src: {
       type: String,
       default: ''
+    },
+    autoSize: {
+      type: [Boolean, String],
+      default: false
     }
   },
   data () {
     return {
-      coverType: 'image'
+      coverType: 'image',
+      coverContent: '',
+      imageInfo: {}
     }
   },
-  computed: {
-    coverContent () {
-      return this.$getRealPath(this.src)
+  watch: {
+    src () {
+      this.loadImage()
+    }
+  },
+  created () {
+    this.loadImage()
+  },
+  beforeDestroy () {
+    const downloaTask = this.downloaTask
+    if (downloaTask && downloaTask.state < 4) {
+      downloaTask.abort()
+    }
+  },
+  methods: {
+    loadImage () {
+      this.coverContent = ''
+      this.imageInfo = this.autoSize ? { width: 0, height: 0 } : {}
+      const realPath = this.src ? this.$getRealPath(this.src) : ''
+      if (realPath.indexOf('http://') === 0 || realPath.indexOf('https://') === 0) {
+        plusReady(() => {
+          this.downloaTask = plus.downloader.createDownload(realPath, {
+            filename: TEMP_PATH + '/download/'
+          }, (task, status) => {
+            if (status === 200) {
+              this.getImageInfo(task.filename)
+            } else {
+              this.$trigger('error', {}, {
+                errMsg: 'error'
+              })
+            }
+          }).start()
+        })
+      } else if (realPath) {
+        this.getImageInfo(realPath)
+      }
+    },
+    getImageInfo (src) {
+      this.coverContent = src
+      plusReady(() => {
+        plus.io.getImageInfo({
+          src,
+          success: ({ width, height }) => {
+            if (this.autoSize) {
+              this.imageInfo = {
+                width: `${width}px`,
+                height: `${height}px`
+              }
+              if (this._isMounted) {
+                this._requestPositionUpdate()
+              }
+            }
+            this.$trigger('load', {}, { width, height })
+          },
+          fail: () => {
+            this.$trigger('error', {}, {
+              errMsg: 'error'
+            })
+          }
+        })
+      })
     }
   }
 }
diff --git a/src/platforms/app-plus/view/components/map/index.vue b/src/platforms/app-plus/view/components/map/index.vue
index 897352c9f..ce2468626 100644
--- a/src/platforms/app-plus/view/components/map/index.vue
+++ b/src/platforms/app-plus/view/components/map/index.vue
@@ -10,6 +10,7 @@
       :key="index"
       :src="control.iconPath"
       :style="control.position"
+      auto-size
       @click="controlclick(control)"/>
     <div class="uni-map-slot">
       <slot />
diff --git a/src/shared/index.js b/src/shared/index.js
index e53f2d3f8..46ca73209 100644
--- a/src/shared/index.js
+++ b/src/shared/index.js
@@ -1,5 +1,6 @@
-export * from './env'
-export * from './util'
+export * from './env'
+export * from './util'
 export * from './color'
 export * from './query'
 export * from './scroll'
+export * from './platform'
-- 
GitLab