uni-canvas-image 1.1.3 → 1.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uni-canvas-image",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "description": "租房项目使用uniapp canvas合并图片",
   "main": "src/index.js",
   "type": "module",

package/src/common/index.js

@@ -2,7 +2,6 @@ export const directionEnum = { NORTH: '北', EAST: '东', SOUTH: '南', WEST: '
 
 export async function getImageInfo(src, targetRatio) {
   return new Promise(async (resolve, reject) => {
-    if (src && src.endsWith('.mp4')) src = src.replace('.mp4', '.png')
     if (src) {
       const imageInfo = await uni.getImageInfo({ src })
       const newImageInfo = {
@@ -49,7 +48,7 @@ export async function base64ToBlob(base64Data) {
 
 export async function drawImageToCanvas(arr, canvasId = 'canvas-1', api, config) {
   return new Promise((resolve, reject) => {
-    const { bgc = '#fff' } = config || {}
+    const { bgc = '#fff', className = '' } = config || {}
     const ctx = uni.createCanvasContext(canvasId)
     ctx.setFillStyle(bgc)
     ctx.fillRect(0, 0, 375, 300)
@@ -91,15 +90,15 @@ export async function drawImageToCanvas(arr, canvasId = 'canvas-1', api, config)
           ctx.clearRect(0, 0, 375, 300)
           let filePath
           // #ifdef MP-WEIXIN
-          filePath = tempRes.tempFilePath
+          filePath = tempRes
           // #endif
           // #ifdef H5
           const blob = await base64ToBlob(tempRes.tempFilePath)
-          filePath = URL.createObjectURL(blob)
+          filePath.tempFilePath = URL.createObjectURL(blob)
           // #endif
           if (!api) return resolve(filePath)
           else {
-            const { result } = await api('/third-party/open/upload/uploadFile', filePath, {}, 'file')
+            const { result } = await api({ filePath, className })
             resolve(result)
             // #ifdef MP-WEIXIN
             uni.getFileSystemManager().unlink({ filePath })

package/src/util/attractImage.js

@@ -10,15 +10,15 @@ async function attractImage(params) {
     const { data, canvasId, api } = params
     const staticInfo = [
       { type: 'rect', x: 16, y: 34, width: 320, height: 16, color: '#00ffb7' },
-      { type: 'text', text: '主要区域：', x: 16, y: 29, color: '#000', fontSize: 16 },
-      { type: 'text', text: data.buildingCount, x: 340 - String(data.buildingCount).length * 24, y: 80, color: '#FF703B', fontSize: 40, fontWeight: 700 },
-      { type: 'text', text: '楼盘数量', x: 280, y: 130, color: '#000', fontSize: 16 },
-      { type: 'text', text: data.houseCount, x: 340 - String(data.houseCount).length * 24, y: 196, color: '#FF703B', fontSize: 40, fontWeight: 700 },
-      { type: 'text', text: '房源数量', x: 280, y: 246, color: '#000', fontSize: 16 },
+      { type: 'text', text: '主要区域：', x: 16, y: 29, color: '#000', fontSize: 18 },
+      { type: 'text', text: data.buildingCount, x: 346 - String(data.buildingCount).length * 24, y: 80, color: '#FF703B', fontSize: 46, fontWeight: 700 },
+      { type: 'text', text: '楼盘数量', x: 280, y: 132, color: '#000', fontSize: 20 },
+      { type: 'text', text: data.houseCount, x: 346 - String(data.houseCount).length * 24, y: 196, color: '#FF703B', fontSize: 46, fontWeight: 700 },
+      { type: 'text', text: '房源数量', x: 280, y: 248, color: '#000', fontSize: 20 },
     ]
     // 区域信息
     const areaInfo = data.mainArea.length > 3 ? data.mainArea.slice(0, 3).join('、') + '...' : data.mainArea.join('、')
-    const newAreaInfo = { type: 'text', text: areaInfo, x: 92, y: 24, color: '#000', fontSize: 22, fontWeight: 600 }
+    const newAreaInfo = { type: 'text', text: areaInfo, x: 100, y: 24, color: '#000', fontSize: 24, fontWeight: 600 }
     // 图片信息
     const imgInfo = await getImageInfo(data.buildingUrl, 230 / 210)
     const newImgInfo = {
@@ -29,11 +29,11 @@ async function attractImage(params) {
       dHeight: 210,
     }
     const maskInfo = { type: 'rect3' }
-    const buildingLabel = { type: 'text', text: '主营楼盘：', x: 22, y: 260, color: '#fff', fontSize: 12 }
-    data.mainBuilding = data.mainBuilding.join('、').length > 11 ? data.mainBuilding.join('、').slice(0, 11) + '...' : data.mainBuilding.join('、')
-    const newBuildingInfo = { type: 'text', text: data.mainBuilding, x: 80, y: 258, color: '#fff', fontSize: 14 }
+    const buildingLabel = { type: 'text', text: '主营楼盘：', x: 22, y: 260, color: '#fff', fontSize: 14 }
+    data.mainBuilding = data.mainBuilding.join('、').length > 8 ? data.mainBuilding.join('、').slice(0, 8) + '...' : data.mainBuilding.join('、')
+    const newBuildingInfo = { type: 'text', text: data.mainBuilding, x: 86, y: 258, color: '#fff', fontSize: 16 }
     const newObj = [...staticInfo, newAreaInfo, newImgInfo, maskInfo, buildingLabel, newBuildingInfo]
-    const url = await drawImageToCanvas(newObj, canvasId, api, { bgc: '#f2f2f2' })
+    const url = await drawImageToCanvas(newObj, canvasId, api, { bgc: '#f2f2f2', className: 'share-attract-card' })
     resolve(url)
   })
 }

package/src/util/coverImage.js

@@ -27,7 +27,7 @@ const coverImage = (params = {}) => {
         type: 'image',
       }
     })
-    const url = await drawImageToCanvas(newDrawImgs, canvasId, api)
+    const url = await drawImageToCanvas(newDrawImgs, canvasId, api, { className: 'share-cover-card' })
     resolve(url)
   })
 }

package/src/util/houseImage.js

@@ -46,7 +46,7 @@ async function handleItem(obj, canvasId, api) {
     const tagsInfos = hanleTagsInfo(obj.tags.slice(0, 3), 14, 212)
     const categoryInfos = handleCategoryInfo(obj, categoryEnum)
     const newObj = [newImgInfo, ...titleInfos, ...tagsInfos, ...categoryInfos]
-    const url = await drawImageToCanvas(newObj, canvasId, api)
+    const url = await drawImageToCanvas(newObj, canvasId, api, { className: 'share-house-card' })
     resolve(url)
   })
 }
@@ -90,7 +90,7 @@ function handleItems(arr, canvasId, api) {
       const categoryInfos = handleCategoryInfo(obj, category)
       newObj.push(newImgInfo, ...titleInfos, ...tagsInfos, ...categoryInfos)
     }
-    const url = await drawImageToCanvas(newObj, canvasId, api)
+    const url = await drawImageToCanvas(newObj, canvasId, api, { className: 'share-multi-house-card' })
     resolve(url)
   })
 }

package/src/util/noteImage.js

@@ -46,7 +46,7 @@ function handleItem(obj, canvasId, api) {
       }
     })
     const newObj = [newImgInfo, ...titleInfos, ...newContentInfos]
-    const url = await drawImageToCanvas(newObj, canvasId, api)
+    const url = await drawImageToCanvas(newObj, canvasId, api, { className: 'share-note-card' })
     resolve(url)
   })
 }
@@ -90,7 +90,7 @@ function handleItems(arr, canvasId, api) {
       newObj.push(newImgInfo, ...titleInfos, ...newContentInfos)
     }
 
-    const url = await drawImageToCanvas(newObj, canvasId, api)
+    const url = await drawImageToCanvas(newObj, canvasId, api, { className: 'share-multi-note-card' })
     resolve(url)
   })
 }