Merge branch '1.5.1'

wjc

2025-01-07 90d5f028ccdaaaf64286f9d632cb335a4d0544b9

 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,14 +67,41 @@
    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);
        }
    }

    /**
     * 图片四个角统一指定
     *
     * @param context   上下文
     * @param url       图片地址
     * @param imageview 显示图片组件
     * @param db        设置图片角度值
     */
    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(roundedCorners)
                .placeholder(R.drawable.plant_default_picture)
                .error(R.drawable.plant_default_picture)
//                .fallback(R.drawable.plant_default_picture)
                //Glide加载图片圆角效果与ImageView的ScaleType冲突问题
                .into(imageview);
//        } else {
//            setDefaultImage(context, imageview, userImage);
//        }
    }

    /**
@@ -94,10 +118,7 @@
            return;
        }
//        if (url.startsWith("http://") || url.startsWith("https://")) {
        Glide.with(context)
                .load(url)
                .apply(getRequestOptions(userImage))
                .transform(new CenterCrop(), roundedCorners)//Glide加载图片圆角效果与ImageView的ScaleType冲突问题
        Glide.with(context).load(url).apply(getRequestOptions(userImage)).transform(new CenterCrop(), roundedCorners)//Glide加载图片圆角效果与ImageView的ScaleType冲突问题
//                .transform(roundedCorners)
                .into(imageview);
//        } else {
@@ -115,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);
        }
@@ -128,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);
        }

@@ -179,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();
@@ -214,11 +224,8 @@
        if (imageview == null) {
            return;
        }
        Glide.with(context)
                .asGif()
                .load(R.drawable.null_data_icon)//(res或者gif的url链接)
                .diskCacheStrategy(DiskCacheStrategy.ALL)
                .listener(new RequestListener<GifDrawable>() {
        Glide.with(context).asGif().load(R.drawable.null_data_icon)//(res或者gif的url链接)
                .diskCacheStrategy(DiskCacheStrategy.ALL).listener(new RequestListener<GifDrawable>() {
                    @Override
                    public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<GifDrawable> target, boolean isFirstResource) {
                        return false;
@@ -229,8 +236,7 @@
//                            resource.setLoopCount(1);控制播放次数
                        return false;
                    }
                })
                .into(imageview);
                }).into(imageview);
    }

    private static void setDefaultImage(Context context, ImageView imageview, boolean userImage) {