From 87cd5df70918e6ba1af849c5f026d3719bfdb1ac Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 09 四月 2025 09:06:29 +0800
Subject: [PATCH] Merge branch '1.5.2' into dev
---
app/src/main/java/com/hdl/photovoltaic/utils/GlideUtils.java | 68 +++++++++++----------------------
1 files changed, 23 insertions(+), 45 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/utils/GlideUtils.java b/app/src/main/java/com/hdl/photovoltaic/utils/GlideUtils.java
index 887b410..a0e81c4 100644
--- a/app/src/main/java/com/hdl/photovoltaic/utils/GlideUtils.java
+++ b/app/src/main/java/com/hdl/photovoltaic/utils/GlideUtils.java
@@ -50,10 +50,7 @@
*/
public static void getGeneralImage(Context context, String url, ImageView imageview) {
if (url.startsWith("http://") || url.startsWith("https://")) {
- Glide.with(context)
- .load(url)
- .apply(getRequestOptions(false))
- .into(imageview);
+ Glide.with(context).load(url).apply(getRequestOptions(false)).into(imageview);
} else {
setDefaultImage(context, imageview, true);
}
@@ -70,10 +67,7 @@
public static void getGranularRoundedCornersImage(Context context, String url, ImageView imageview, GranularRoundedCorners granularRoundedCorners) {
if (url.startsWith("http://") || url.startsWith("https://")) {
- Glide.with(context)
- .load(url)
- .apply(getRequestOptions(false))
- .transform(granularRoundedCorners)//new GranularRoundedCorners(30f,80f,80f,30f)
+ Glide.with(context).load(url).apply(getRequestOptions(false)).transform(granularRoundedCorners)//new GranularRoundedCorners(30f,80f,80f,30f)
.into(imageview);
} else {
setDefaultImage(context, imageview, true);
@@ -83,25 +77,27 @@
/**
* 鍥剧墖鍥涗釜瑙掔粺涓�鎸囧畾
*
- * @param context 涓婁笅鏂�
- * @param url 鍥剧墖鍦板潃
- * @param imageview 鏄剧ず鍥剧墖缁勪欢
- * @param roundedCorners 璁剧疆鍥剧墖瑙掑害鍊�
+ * @param context 涓婁笅鏂�
+ * @param url 鍥剧墖鍦板潃
+ * @param imageview 鏄剧ず鍥剧墖缁勪欢
+ * @param db 璁剧疆鍥剧墖瑙掑害鍊�
*/
- public static void getRoundedCornersImage(Context context, String url, ImageView imageview, RoundedCorners roundedCorners) {
+ public static void getRoundedCornersImage(Context context, String url, ImageView imageview, int db) {
if (!(url.startsWith("http://") || url.startsWith("https://"))) {
imageview.setImageDrawable(AppCompatResources.getDrawable(context, R.drawable.plant_default_picture));
return;
}
// if (url.startsWith("http://") || url.startsWith("https://")) {
+
+ RequestOptions roundedCorners = new RequestOptions()
+ .transform(new CenterCrop(), new RoundedCorners((int) UnitConversionUtils.dpToPx(context, db)));
Glide.with(context)
.load(url)
- .apply(new RequestOptions()
- .placeholder(R.drawable.plant_default_picture)
- .error(R.drawable.plant_default_picture)
- .fallback(R.drawable.plant_default_picture))
- .transform(new CenterCrop(), roundedCorners)//Glide鍔犺浇鍥剧墖鍦嗚鏁堟灉涓嶪mageView鐨凷caleType鍐茬獊闂
-// .transform(roundedCorners)
+ .apply(roundedCorners)
+ .placeholder(R.drawable.plant_default_picture)
+ .error(R.drawable.plant_default_picture)
+// .fallback(R.drawable.plant_default_picture)
+ //Glide鍔犺浇鍥剧墖鍦嗚鏁堟灉涓嶪mageView鐨凷caleType鍐茬獊闂
.into(imageview);
// } else {
// setDefaultImage(context, imageview, userImage);
@@ -122,10 +118,7 @@
return;
}
// if (url.startsWith("http://") || url.startsWith("https://")) {
- Glide.with(context)
- .load(url)
- .apply(getRequestOptions(userImage))
- .transform(new CenterCrop(), roundedCorners)//Glide鍔犺浇鍥剧墖鍦嗚鏁堟灉涓嶪mageView鐨凷caleType鍐茬獊闂
+ Glide.with(context).load(url).apply(getRequestOptions(userImage)).transform(new CenterCrop(), roundedCorners)//Glide鍔犺浇鍥剧墖鍦嗚鏁堟灉涓嶪mageView鐨凷caleType鍐茬獊闂
// .transform(roundedCorners)
.into(imageview);
// } else {
@@ -143,11 +136,7 @@
public static void getCircleCropImage(Context context, String url, ImageView imageview, boolean userImage) {
if (url.startsWith("http://") || url.startsWith("https://")) {
- Glide.with(context)
- .load(url)
- .apply(getRequestOptions(userImage))
- .transform(new CircleCrop())
- .into(imageview);
+ Glide.with(context).load(url).apply(getRequestOptions(userImage)).transform(new CircleCrop()).into(imageview);
} else {
setDefaultImage(context, imageview, userImage);
}
@@ -156,15 +145,9 @@
private static RequestOptions getRequestOptions(boolean userImage) {
if (userImage) {
- return new RequestOptions()
- .placeholder(R.drawable.default_image)
- .error(R.drawable.default_image)
- .fallback(R.drawable.default_image);
+ return new RequestOptions().placeholder(R.drawable.default_image).error(R.drawable.default_image).fallback(R.drawable.default_image);
} else {
- return new RequestOptions()
- .placeholder(R.drawable.default_user)
- .error(R.drawable.default_user)
- .fallback(R.drawable.default_user);
+ return new RequestOptions().placeholder(R.drawable.default_user).error(R.drawable.default_user).fallback(R.drawable.default_user);
// .override(113, 130);
}
@@ -207,8 +190,7 @@
public static Bitmap getRoundedCornerBitmap(Bitmap bitmap, int pixels) {
- Bitmap output = Bitmap.createBitmap(bitmap.getWidth(),
- bitmap.getHeight(), Bitmap.Config.ARGB_8888);
+ Bitmap output = Bitmap.createBitmap(bitmap.getWidth(), bitmap.getHeight(), Bitmap.Config.ARGB_8888);
Canvas canvas = new Canvas(output);
final int color = 0xff424242;
final Paint paint = new Paint();
@@ -242,11 +224,8 @@
if (imageview == null) {
return;
}
- Glide.with(context)
- .asGif()
- .load(R.drawable.null_data_icon)//(res鎴栬�単if鐨剈rl閾炬帴)
- .diskCacheStrategy(DiskCacheStrategy.ALL)
- .listener(new RequestListener<GifDrawable>() {
+ Glide.with(context).asGif().load(R.drawable.null_data_icon)//(res鎴栬�単if鐨剈rl閾炬帴)
+ .diskCacheStrategy(DiskCacheStrategy.ALL).listener(new RequestListener<GifDrawable>() {
@Override
public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<GifDrawable> target, boolean isFirstResource) {
return false;
@@ -257,8 +236,7 @@
// resource.setLoopCount(1);鎺у埗鎾斁娆℃暟
return false;
}
- })
- .into(imageview);
+ }).into(imageview);
}
private static void setDefaultImage(Context context, ImageView imageview, boolean userImage) {
--
Gitblit v1.8.0