Skip to content

image-resizer文件夹处理优化及比例计算问题修复 #5

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 3 commits into from
Dec 2, 2024
Merged

image-resizer文件夹处理优化及比例计算问题修复 #5

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
476b410
fix:createResizedImage方法支持在应用沙盒目录cache文件夹下的子文件夹的处理
ding-chengjie Dec 2, 2024
2d28396
fix:处理压缩图片的宽和高将vp更改为px
ding-chengjie Dec 2, 2024
8d7e46a
fix:修复计算缩放比例 widthRatio的问题
ding-chengjie Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 26 additions & 12 deletions harmony/image_resizer/src/main/ets/ImageResizerModule.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,14 @@ export class ImageResizerModule extends TurboModule implements TM.ImageResizer.S
let i = uri.lastIndexOf('/')
let dir = uri.substring(0, i);
let file;
if (dir == this.ctx.uiAbilityContext.cacheDir || dir == 'file://' + this.ctx.uiAbilityContext.cacheDir) {
if (dir == this.ctx.uiAbilityContext.cacheDir + this.getDir(uri) || dir == 'file://' + this.ctx.uiAbilityContext.cacheDir + this.getDir(uri)) {
file = fs.openSync(uri, fs.OpenMode.CREATE);
} else {
await fs.copy(uri, this.getCacheFilePath(format));
file = fs.openSync(this.getCacheFilePath(format), fs.OpenMode.CREATE);
await fs.copy(uri, this.getCacheFilePath(format, uri));
file = fs.openSync(this.getCacheFilePath(format, uri), fs.OpenMode.CREATE);
}

await this.getImageSize(file.fd, rotation, mode, width, height, onlyScaleDown, format, quality, keepMeta);
await this.getImageSize(uri, file.fd, rotation, mode, width, height, onlyScaleDown, format, quality, keepMeta);
this.fileUri = 'file://' + this.filePath;
let newFile = fs.openSync(this.fileUri, fs.OpenMode.CREATE);
this.size = this.getFileSize(newFile.fd);
Expand Down Expand Up @@ -100,13 +100,13 @@ export class ImageResizerModule extends TurboModule implements TM.ImageResizer.S
});
}

private async getImageSize(fd: number, rotation: number, mode: string, width: number, height: number,
private async getImageSize(uri: string, fd: number, rotation: number, mode: string, width: number, height: number,
onlyScaleDown: boolean, format: string, quality: number, keepMeta: boolean) {
let imageIS = image.createImageSource(fd)
let imagePM = await imageIS.createPixelMap({ editable: true });
let imgInfo = await imagePM.getImageInfo();
let oldWidth = Math.round(px2vp(imgInfo.size.width));
let oldHeight = Math.round(px2vp(imgInfo.size.height));
let oldWidth = imgInfo.size.width;
let oldHeight = imgInfo.size.height;

if (height > 0 && width > 0) {
if (mode == "stretch") {
Expand All @@ -120,7 +120,7 @@ export class ImageResizerModule extends TurboModule implements TM.ImageResizer.S
}
} else {
// "contain" (default) or "cover": keep its aspect ratio
let widthRatio = width / oldHeight;
let widthRatio = width / oldWidth;
let heightRatio = height / oldHeight;
let ratio;
if (mode == "cover") {
Expand All @@ -140,14 +140,14 @@ export class ImageResizerModule extends TurboModule implements TM.ImageResizer.S
let xScale = Math.round(this.finalWidth / oldWidth);
let yScale = Math.round(this.finalHeight / oldHeight);

this.filePath = this.getCacheFilePath(format);
this.filePath = this.getCacheFilePath(format, uri);
try {
await imagePM.rotate(rotation);
await imagePM.scale(xScale, yScale);
const imagePackerApi: image.ImagePacker = image.createImagePacker();
const file = fs.openSync(this.filePath, fs.OpenMode.CREATE | fs.OpenMode.READ_WRITE);
let newFormat = "image/" + format;
const buf = await imagePackerApi.packing(imagePM, { format: newFormat, quality: quality });
let buf = await imagePackerApi.packing(imagePM, { format: newFormat, quality: quality });
this.base64 = buffer.from(buf).toString('base64');
await fs.write(file.fd, buf);
fs.closeSync(file.fd);
Expand Down Expand Up @@ -182,8 +182,22 @@ export class ImageResizerModule extends TurboModule implements TM.ImageResizer.S

}

private getCacheFilePath(format: string) {
return this.ctx.uiAbilityContext.cacheDir + '/rn_image_resizer_lib_temp_' + util.generateRandomUUID(true) + '.' +
private getDir(uri: string) {
let i = uri.lastIndexOf('/');
let cacheDirLength = this.ctx.uiAbilityContext.cacheDir.length;
let fileDir = uri.substring(0, i);
let mimeUri = uri.substring(0, 4)
let dir;
if (mimeUri === 'file') {
dir = fileDir.substring('file://'.length + cacheDirLength);
} else {
dir = fileDir.substring(cacheDirLength);
}
return dir;
}

private getCacheFilePath(format: string, uri: string) {
return this.ctx.uiAbilityContext.cacheDir + this.getDir(uri) +'/rn_image_resizer_lib_temp_' + util.generateRandomUUID(true) + '.' +
format;
}

Expand Down