|
|
@@ -103,7 +103,7 @@ Page({
|
|
|
// let my2Md5 = _this.getImg2Md5(binData)
|
|
|
// let my3Md5 = _this.getImg3Md5(binData)
|
|
|
wx.setClipboardData({
|
|
|
- data: myMd5,
|
|
|
+ data: res.digest,
|
|
|
fail: (err) => {
|
|
|
console.error('setClipboardData失败：', err);
|
|
|
},
|
|
|
@@ -163,22 +163,22 @@ Page({
|
|
|
|
|
|
// 读取裁剪的jpg图片
|
|
|
const fs = wx.getFileSystemManager();
|
|
|
- this.cropper.getImg((obj) => {
|
|
|
+ this.cropper.getImg((res) => {
|
|
|
wx.showLoading({
|
|
|
title: '壁纸裁剪中',
|
|
|
})
|
|
|
// app.globalData.imgSrc = obj.url;
|
|
|
- console.log("裁剪壁纸:", obj);
|
|
|
- _this.data._imgUrl = obj.url
|
|
|
+ console.log("裁剪壁纸:", res);
|
|
|
+ _this.data._imgUrl = res.url
|
|
|
fs.readFile({
|
|
|
- filePath: obj.url,
|
|
|
+ filePath: res.url,
|
|
|
encoding: '', // 不指定编码以获取原始二进制数据
|
|
|
success: (obj) => {
|
|
|
console.log("加载文件成功:", obj.data.byteLength, obj.data.length)
|
|
|
|
|
|
fs.getFileInfo({
|
|
|
- "filePath": _this.data._imgUrl, "digestAlgorithm": "md5", success: (res) => {
|
|
|
- console.log("md5:", res)
|
|
|
+ "filePath": _this.data._imgUrl, "digestAlgorithm": "md5", success: (res2) => {
|
|
|
+ console.log("md5:", res2)
|
|
|
console.log("加载文件成功:", obj.data.byteLength, obj.data.length, obj.getFileInfo)
|
|
|
|
|
|
let binData = obj.data;
|
|
|
@@ -186,7 +186,7 @@ Page({
|
|
|
// let my2Md5 = _this.getImg2Md5(binData)
|
|
|
// let my3Md5 = _this.getImg3Md5(binData)
|
|
|
wx.setClipboardData({
|
|
|
- data: myMd5,
|
|
|
+ data: res2.digest,
|
|
|
})
|
|
|
_this.sliceDataIntoChunks(binData, 64);
|
|
|
|
|
|
@@ -196,7 +196,7 @@ Page({
|
|
|
wx.showLoading({
|
|
|
title: '开始传输壁纸',
|
|
|
})
|
|
|
- _this.data._imgMD5 = myMd5
|
|
|
+ _this.data._imgMD5 = res2.digest
|
|
|
_this.data._imgIndex = 0
|
|
|
console.log("md5 2:", res.digest)
|
|
|
_this.startImage()
|
