From d5d541f6bc23fd70875bbc706639b7e48d50468a Mon Sep 17 00:00:00 2001
From: Guo_shaoshan <2055829622@qq.com>
Date: 星期二, 04 四月 2023 20:36:41 +0800
Subject: [PATCH] 更改解决冲突
---
app_base/src/main/java/com/android/app_base/base/adapter/ImageViewAdapter.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/app_base/src/main/java/com/android/app_base/base/adapter/ImageViewAdapter.java b/app_base/src/main/java/com/android/app_base/base/adapter/ImageViewAdapter.java
index 433c3ff..a7a1671 100644
--- a/app_base/src/main/java/com/android/app_base/base/adapter/ImageViewAdapter.java
+++ b/app_base/src/main/java/com/android/app_base/base/adapter/ImageViewAdapter.java
@@ -2,10 +2,13 @@
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
+import android.net.Uri;
import android.util.Base64;
import android.widget.ImageView;
import androidx.databinding.BindingAdapter;
+
+import com.android.app_base.utils.GlideUtil;
/**
* @author Ljj
@@ -14,7 +17,12 @@
*/
public class ImageViewAdapter {
@BindingAdapter({"imageUrl"})
- public static void loadImage(ImageView imageView, String url) {
+ public static void loadUrlImage(ImageView imageView, String url) {
+ GlideUtil.loadImage(url, imageView);
+ }
+ @BindingAdapter({"imageUri"})
+ public static void loadUriImage(ImageView imageView, String uri) {
+ imageView.setImageURI(Uri.parse(uri));
}
@BindingAdapter({"imageBase64"})
--
Gitblit v1.9.1