diff --git a/README.md b/README.md index ac67224271cb2eb0ce0ff443a724cd85728ba9a5..b27d0c8bb9d00a51f4f7a6eb8a94ae860dfeac1b 100644 --- a/README.md +++ b/README.md @@ -11,8 +11,6 @@ - 项目移植状态：主功能完成 - 调用差异：无 - 开发版本：sdk5，DevEco Studio2.1 beta3 -- 项目作者和维护人：陈建朋 -- 联系方式：chenjianpeng050@chinasoftinc.com - 原项目Doc地址：https://github.com/donkingliang/ImageSelector #### 效果演示 @@ -117,8 +115,6 @@ CloudTest代码测试无异常 当前版本demo功能与原组件基本无差异 -测试员：杨辉 - #### 版本迭代 - 0.0.1-SNAPSHOT diff --git a/changelog.md b/changelog.md index ad7015b3b8fd94f98b5e1f97b2817fac9780b1c1..32ff53bdbb0e5cf1d6327f941a1907fa970afa78 100644 --- a/changelog.md +++ b/changelog.md @@ -12,4 +12,7 @@ 1、目前使用三方库，图片加载缓慢，内存占用高。 +2、目前模拟器无法拍照 + + diff --git a/entry/src/main/java/com/donkingliang/imageselector/util/HeLog.java b/entry/src/main/java/com/donkingliang/imageselector/util/HeLog.java index e19147d82d6760cfd2ae8b5d1a21edf5bcb28316..584cfd0a9ae85c96f626fc722aa073601ec00965 100644 --- a/entry/src/main/java/com/donkingliang/imageselector/util/HeLog.java +++ b/entry/src/main/java/com/donkingliang/imageselector/util/HeLog.java @@ -40,5 +40,4 @@ public final class HeLog { public static void d(String tag, String info) { HiLog.debug(LABEL_LOG, LOG_FORMAT, tag, info); } - } diff --git a/ucrop/src/main/java/com/yalantis/ucrop/model/ImageState.java b/ucrop/src/main/java/com/yalantis/ucrop/model/ImageState.java index 7aadbf906f43230db25aa3ea3b7bfba26374b144..4e22b9fca58493e3d2cf0388c1116ef5ac725af8 100644 --- a/ucrop/src/main/java/com/yalantis/ucrop/model/ImageState.java +++ b/ucrop/src/main/java/com/yalantis/ucrop/model/ImageState.java @@ -1,6 +1,5 @@ package com.yalantis.ucrop.model; -//import android.graphics.RectF; import ohos.agp.utils.RectFloat; /** diff --git a/ucrop/src/main/java/com/yalantis/ucrop/task/BitmapCropTask.java b/ucrop/src/main/java/com/yalantis/ucrop/task/BitmapCropTask.java index 372314f36ef5637bc919ce184cd2efec35ccf174..8ea3ceed91554dc0abc6da0d6e1c5535872696ff 100644 --- a/ucrop/src/main/java/com/yalantis/ucrop/task/BitmapCropTask.java +++ b/ucrop/src/main/java/com/yalantis/ucrop/task/BitmapCropTask.java @@ -1,10 +1,8 @@ package com.yalantis.ucrop.task; -//import android.content.Context; import com.yalantis.ucrop.view.CropResult; import ohos.aafwk.ability.DataAbilityHelper; import ohos.app.Context; -//import android.graphics.Bitmap; import ohos.app.Environment; import ohos.data.rdb.ValuesBucket; import ohos.eventhandler.EventHandler; @@ -12,24 +10,12 @@ import ohos.eventhandler.EventRunner; import ohos.media.image.ImagePacker; import ohos.media.image.ImageSource; import ohos.media.image.PixelMap; -//import android.graphics.Matrix; import ohos.agp.utils.Matrix; -//import android.graphics.RectF; import ohos.agp.utils.RectFloat; -//import android.net.Uri; import ohos.media.image.common.Rect; import ohos.media.image.common.Size; import ohos.media.photokit.metadata.AVStorage; import ohos.utils.net.Uri; - -//import android.os.AsyncTask; - -//import android.util.Log; - -//import androidx.annotation.NonNull; -//import androidx.annotation.Nullable; -//import androidx.exifinterface.media.ExifInterface; - import com.yalantis.ucrop.callback.BitmapCropCallback; import com.yalantis.ucrop.model.CropParameters; import com.yalantis.ucrop.model.ImageState; diff --git a/ucrop/src/main/java/com/yalantis/ucrop/task/BitmapLoadTask.java b/ucrop/src/main/java/com/yalantis/ucrop/task/BitmapLoadTask.java index 1107c65b8ec6a42bf59f94393d6d6e06f7c92ed1..ccfcf4f5c56b91236c0b5de0182f94285200feff 100644 --- a/ucrop/src/main/java/com/yalantis/ucrop/task/BitmapLoadTask.java +++ b/ucrop/src/main/java/com/yalantis/ucrop/task/BitmapLoadTask.java @@ -1,27 +1,17 @@ package com.yalantis.ucrop.task; -//import android.content.Context; import ohos.aafwk.ability.DataAbilityHelper; import ohos.aafwk.ability.DataAbilityRemoteException; import ohos.app.Context; -//import android.graphics.Bitmap; import ohos.eventhandler.EventHandler; import ohos.eventhandler.EventRunner; import ohos.media.image.PixelMap; -//import android.graphics.BitmapFactory; import ohos.media.image.ImageSource; -//import android.graphics.Matrix; import ohos.agp.utils.Matrix; -//import android.net.Uri; import ohos.media.image.common.Size; import ohos.utils.net.Uri; -//import android.os.AsyncTask; -//import android.util.Log; import com.yalantis.ucrop.util.LogUtils; -//import androidx.annotation.NonNull; -//import androidx.annotation.Nullable; - import com.yalantis.ucrop.callback.BitmapLoadCallback; import com.yalantis.ucrop.model.ExifInfo; import com.yalantis.ucrop.util.BitmapLoadUtils; diff --git a/ucrop/src/main/java/com/yalantis/ucrop/util/BitmapLoadUtils.java b/ucrop/src/main/java/com/yalantis/ucrop/util/BitmapLoadUtils.java index 9c6dbb0096f631feba238313da80fc07d6bf63dc..a58109b6322e272a0ecc0dcab3b50f9520837881 100644 --- a/ucrop/src/main/java/com/yalantis/ucrop/util/BitmapLoadUtils.java +++ b/ucrop/src/main/java/com/yalantis/ucrop/util/BitmapLoadUtils.java @@ -1,9 +1,7 @@ package com.yalantis.ucrop.util; -//import android.content.Context; import ohos.agp.window.service.DisplayManager; import ohos.app.Context; -//import android.graphics.PixelMap; import ohos.app.Environment; import ohos.media.image.ImagePacker; import ohos.media.image.PixelMap; @@ -11,22 +9,13 @@ import ohos.media.image.PixelMap; import ohos.hiviewdfx.HiLog; import ohos.hiviewdfx.HiLogLabel; -//import android.graphics.BitmapFactory; import ohos.media.image.ImageSource; -//import android.graphics.Canvas; -//import android.graphics.Matrix; -//import android.graphics.Point; import ohos.agp.utils.Point; -//import android.net.Uri; import ohos.media.image.common.Size; import ohos.utils.net.Uri; -//import android.os.AsyncTask; 暂不提供AsyncTask - -//import android.view.Display; import ohos.agp.window.service.Display; -//import android.view.WindowManager; import com.yalantis.ucrop.callback.BitmapLoadCallback; import com.yalantis.ucrop.task.BitmapLoadTask; @@ -36,9 +25,6 @@ import java.net.HttpURLConnection; import java.net.URL; import java.net.URLConnection; -//import androidx.annotation.NonNull; -//import androidx.annotation.Nullable; -//import androidx.exifinterface.media.ExifInterface; /** * Created by Oleksii Shliama (https://github.com/shliama). diff --git a/ucrop/src/main/java/com/yalantis/ucrop/util/EglUtils.java b/ucrop/src/main/java/com/yalantis/ucrop/util/EglUtils.java index 7b70803c3ab5b286a64943b61a002d775ec4c030..f7978599157c777560d23bff1a5ba4141f30f399 100644 --- a/ucrop/src/main/java/com/yalantis/ucrop/util/EglUtils.java +++ b/ucrop/src/main/java/com/yalantis/ucrop/util/EglUtils.java @@ -1,19 +1,7 @@ package com.yalantis.ucrop.util; //不 会 改 -//import android.annotation.TargetApi; import ohos.agp.render.opengl.*; -//import android.opengl.EGL14; -//import android.opengl.EGLConfig; -//import android.opengl.EGLContext; -//import android.opengl.EGLDisplay; -//import android.opengl.EGLSurface; -//import android.opengl.GLES10; -//import android.opengl.GLES20; -//import android.os.Build; -//import android.util.Log; - -//import javax.microedition.khronos.egl.EGL10; /** * Created by Oleksii Shliama [https://github.com/shliama] on 9/8/16. diff --git a/ucrop/src/main/java/com/yalantis/ucrop/util/FastBitmapDrawable.java b/ucrop/src/main/java/com/yalantis/ucrop/util/FastBitmapDrawable.java index 57449bb136b2f24ec31b342a785d33b6fe646ac4..cc60654725cd18c65608ac73b72dce50a14f6083 100644 --- a/ucrop/src/main/java/com/yalantis/ucrop/util/FastBitmapDrawable.java +++ b/ucrop/src/main/java/com/yalantis/ucrop/util/FastBitmapDrawable.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008 The Android Open Source Project + * Copyright (C) 2008 The Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,6 @@ */ package com.yalantis.ucrop.util; -//import android.graphics.PixelMap;android import ohos.agp.components.Component; import ohos.agp.components.ComponentContainer; @@ -25,8 +24,6 @@ import ohos.media.image.PixelMap; import ohos.agp.render.Canvas; import ohos.agp.render.Paint; -//import android.graphics.PixelFormat; -//import android.graphics.drawable.Drawable; //尝试使用Image替代功能 public class FastBitmapDrawable extends Component implements Component.DrawTask { diff --git a/ucrop/src/main/java/com/yalantis/ucrop/util/ImageHeaderParser.java b/ucrop/src/main/java/com/yalantis/ucrop/util/ImageHeaderParser.java index e40f2d718243fc0f3554ec03e74221773b15871e..514d1b8ecf4a1c65756ef967f48c16594287b61f 100644 --- a/ucrop/src/main/java/com/yalantis/ucrop/util/ImageHeaderParser.java +++ b/ucrop/src/main/java/com/yalantis/ucrop/util/ImageHeaderParser.java @@ -30,8 +30,6 @@ package com.yalantis.ucrop.util; -//import android.text.TextUtils; -//import android.util.Log; import java.io.IOException; import java.io.InputStream; diff --git a/ucrop/src/main/java/com/yalantis/ucrop/util/RectUtils.java b/ucrop/src/main/java/com/yalantis/ucrop/util/RectUtils.java index 435bafa1a8124d2b3d17305d0c9c1cdf22bce9a3..edc9ca43e050427c94937da0d1a96dc703b16b5e 100644 --- a/ucrop/src/main/java/com/yalantis/ucrop/util/RectUtils.java +++ b/ucrop/src/main/java/com/yalantis/ucrop/util/RectUtils.java @@ -1,6 +1,5 @@ package com.yalantis.ucrop.util; -//import android.graphics.RectFloat; import ohos.agp.utils.RectFloat; public class RectUtils { diff --git a/ucrop/src/main/java/com/yalantis/ucrop/util/RotationGestureDetector.java b/ucrop/src/main/java/com/yalantis/ucrop/util/RotationGestureDetector.java index 149b2e9a9d05b5f9fbcc8b9dad855ad8f90f1821..8638096fcf9fa9b694ea13e9defc634ff16a78e6 100644 --- a/ucrop/src/main/java/com/yalantis/ucrop/util/RotationGestureDetector.java +++ b/ucrop/src/main/java/com/yalantis/ucrop/util/RotationGestureDetector.java @@ -1,8 +1,6 @@ package com.yalantis.ucrop.util; -//import android.view.TouchEvent; import ohos.multimodalinput.event.TouchEvent; -//import androidx.annotation.NonNull; public class RotationGestureDetector { diff --git a/ucrop/src/main/java/com/yalantis/ucrop/view/TransformImageView.java b/ucrop/src/main/java/com/yalantis/ucrop/view/TransformImageView.java index 8601b6d7c31759fad5eaa771a0507ff3dfe7599c..dd1b1d88c1cbeee7b49e8edcc4323d022bdbd5f1 100644 --- a/ucrop/src/main/java/com/yalantis/ucrop/view/TransformImageView.java +++ b/ucrop/src/main/java/com/yalantis/ucrop/view/TransformImageView.java @@ -311,7 +311,7 @@ public class TransformImageView extends PositionLayout implements Component.Layo this.setLayoutConfig(layoutConfig); this.setLayoutRefreshedListener(this); } -//android代码，没有ScaleType.MATRIX，风险等级2 +// 代码，没有ScaleType.MATRIX，风险等级2 /**