From 8b9ba1c7b2a4d8769d54d7d7c965c3ae993f1832 Mon Sep 17 00:00:00 2001
From: fl_shy <fl1587853658@outllok.com>
Date: Thu, 13 Jun 2024 22:19:46 +0800
Subject: [PATCH] =?UTF-8?q?minefragment=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle.kts                              |   6 +
 src/main/AndroidManifest.xml                  |  27 +++++
 .../java/com/hnucm/weather/GlideEngine.java   | 114 ++++++++++++++++++
 .../java/com/hnucm/weather/MineFragment.java  |  35 ++++++
 src/main/res/drawable/circle_shape.xml        |   5 +
 src/main/res/drawable/img_31.png              | Bin 0 -> 216 bytes
 src/main/res/drawable/img_32.png              | Bin 0 -> 6441 bytes
 src/main/res/layout/fragment_life.xml         |   5 +-
 src/main/res/layout/fragment_mine.xml         |  24 +++-
 9 files changed, 212 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/com/hnucm/weather/GlideEngine.java
 create mode 100644 src/main/res/drawable/circle_shape.xml
 create mode 100644 src/main/res/drawable/img_31.png
 create mode 100644 src/main/res/drawable/img_32.png

diff --git a/build.gradle.kts b/build.gradle.kts
index edf612b..03a34c3 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -38,4 +38,10 @@ dependencies {
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
     implementation ("com.geyifeng.immersionbar:immersionbar:3.2.2")
     implementation ("com.geyifeng.immersionbar:immersionbar-components:3.2.2")
+
+    implementation ("io.github.lucksiege:pictureselector:v3.11.2")
+    implementation ("io.github.lucksiege:compress:v3.11.2")
+    implementation ("io.github.lucksiege:ucrop:v3.11.2")
+    implementation ("io.github.lucksiege:camerax:v3.11.2")
+    implementation ("com.github.bumptech.glide:glide:4.15.1")
 }
\ No newline at end of file
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 03494e0..1d3fc76 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -1,6 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_MEDIA_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
+    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.VIBRATE" />
 
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+    <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
+    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
+
+
+    <queries package="${applicationId}">
+        <intent>
+            <action android:name="android.media.action.IMAGE_CAPTURE">
+
+            </action>
+        </intent>
+        <intent>
+            <action android:name="android.media.action.ACTION_VIDEO_CAPTURE">
+
+            </action>
+        </intent>
+    </queries>
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
diff --git a/src/main/java/com/hnucm/weather/GlideEngine.java b/src/main/java/com/hnucm/weather/GlideEngine.java
new file mode 100644
index 0000000..702dc63
--- /dev/null
+++ b/src/main/java/com/hnucm/weather/GlideEngine.java
@@ -0,0 +1,114 @@
+package com.hnucm.weather;
+
+
+
+import android.content.Context;
+import android.widget.ImageView;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.resource.bitmap.CenterCrop;
+import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
+import com.luck.picture.lib.engine.ImageEngine;
+import com.luck.picture.lib.utils.ActivityCompatHelper;
+
+
+public class GlideEngine implements ImageEngine {
+
+    /**
+     * 加载图片
+     *
+     * @param context   上下文
+     * @param url       资源url
+     * @param imageView 图片承载控件
+     */
+    @Override
+    public void loadImage(Context context, String url, ImageView imageView) {
+        if (!ActivityCompatHelper.assertValidRequest(context)) {
+            return;
+        }
+        Glide.with(context)
+                .load(url)
+                .into(imageView);
+    }
+
+    @Override
+    public void loadImage(Context context, ImageView imageView, String url, int maxWidth, int maxHeight) {
+        if (!ActivityCompatHelper.assertValidRequest(context)) {
+            return;
+        }
+        Glide.with(context)
+                .load(url)
+                .override(maxWidth, maxHeight)
+                .into(imageView);
+    }
+
+    /**
+     * 加载相册目录封面
+     *
+     * @param context   上下文
+     * @param url       图片路径
+     * @param imageView 承载图片ImageView
+     */
+    @Override
+    public void loadAlbumCover(Context context, String url, ImageView imageView) {
+        if (!ActivityCompatHelper.assertValidRequest(context)) {
+            return;
+        }
+        Glide.with(context)
+                .asBitmap()
+                .load(url)
+                .override(180, 180)
+                .sizeMultiplier(0.5f)
+                .transform(new CenterCrop(), new RoundedCorners(8))
+                .placeholder(R.drawable.ic_launcher_background)
+                .into(imageView);
+    }
+
+
+    /**
+     * 加载图片列表图片
+     *
+     * @param context   上下文
+     * @param url       图片路径
+     * @param imageView 承载图片ImageView
+     */
+    @Override
+    public void loadGridImage(Context context, String url, ImageView imageView) {
+        if (!ActivityCompatHelper.assertValidRequest(context)) {
+            return;
+        }
+        Glide.with(context)
+                .load(url)
+                .override(200, 200)
+                .centerCrop()
+                .placeholder(R.drawable.ic_launcher_background)
+                .into(imageView);
+    }
+
+    @Override
+    public void pauseRequests(Context context) {
+        if (!ActivityCompatHelper.assertValidRequest(context)) {
+            return;
+        }
+        Glide.with(context).pauseRequests();
+    }
+
+    @Override
+    public void resumeRequests(Context context) {
+        if (!ActivityCompatHelper.assertValidRequest(context)) {
+            return;
+        }
+        Glide.with(context).resumeRequests();
+    }
+
+    private GlideEngine() {
+    }
+
+    private static final class InstanceHolder {
+        static final GlideEngine instance = new GlideEngine();
+    }
+
+    public static GlideEngine createGlideEngine() {
+        return InstanceHolder.instance;
+    }
+}
diff --git a/src/main/java/com/hnucm/weather/MineFragment.java b/src/main/java/com/hnucm/weather/MineFragment.java
index 116572c..b94fcd5 100644
--- a/src/main/java/com/hnucm/weather/MineFragment.java
+++ b/src/main/java/com/hnucm/weather/MineFragment.java
@@ -1,6 +1,7 @@
 package com.hnucm.weather;
 
 import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
 
 import androidx.fragment.app.Fragment;
@@ -8,6 +9,16 @@ import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;
+
+import com.bumptech.glide.Glide;
+import com.luck.picture.lib.basic.PictureSelector;
+import com.luck.picture.lib.config.SelectMimeType;
+import com.luck.picture.lib.entity.LocalMedia;
+import com.luck.picture.lib.interfaces.OnResultCallbackListener;
+
+import java.io.File;
+import java.util.ArrayList;
 
 public class MineFragment extends Fragment {
     @Override
@@ -28,6 +39,30 @@ public class MineFragment extends Fragment {
                 startActivity(intent);
             }
         });
+        ImageView imageView = view.findViewById(R.id.imageView47);
+        imageView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                PictureSelector.create(MineFragment.this)
+                        .openGallery(SelectMimeType.ofImage())
+                        .setImageEngine(GlideEngine.createGlideEngine())
+                        .forResult(new OnResultCallbackListener<LocalMedia>() {
+                            @Override
+                            public void onResult(ArrayList<LocalMedia> result) {
+                                //result.get(0).getRealPath();
+                                Glide.with(MineFragment.this)
+                                        .load(Uri.fromFile(new File(result.get(0).getRealPath())))
+                                        .into(imageView);
+                            }
+
+                            @Override
+                            public void onCancel() {
+
+                            }
+                        });
+                imageView.setImageResource(R.drawable.circle_shape);
+            }
+        });
         return view;
     }
 }
\ No newline at end of file
diff --git a/src/main/res/drawable/circle_shape.xml b/src/main/res/drawable/circle_shape.xml
new file mode 100644
index 0000000..df29d5f
--- /dev/null
+++ b/src/main/res/drawable/circle_shape.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="#FFFFFF"/> <!-- 背景颜色 -->
+</shape>
diff --git a/src/main/res/drawable/img_31.png b/src/main/res/drawable/img_31.png
new file mode 100644
index 0000000000000000000000000000000000000000..041e846f8c1d3ef70c94de109d958f4314ab55d5
GIT binary patch
literal 216
zcmV;}04M*6P)<h;3K|Lk000e1NJLTq000jF000jN1^@s6JJyv-0001=Nkl<ZcwViM
ziw(md5JNLcM(HSw!X}K;Q5eO|BbUY{A5^uLtmN>$1Hm-?TaspXpI<6~UR75^mLNp~
zMo*f})LV|T!-SY2Db{kBH3qb7aiO<|v(;6rXhhU=WDGoq1E`j<D|w0f7Osk;TMp0$
zj$r=VE|!-K7{N(#qgs#57o{O=4X!>rz(t>L`_TSO?o;?1?RTQ%^jp8dU-Sawt;&p-
Sn-8A=0000<MNUMnLSTYJcv*h{

literal 0
HcmV?d00001

diff --git a/src/main/res/drawable/img_32.png b/src/main/res/drawable/img_32.png
new file mode 100644
index 0000000000000000000000000000000000000000..f45c5a00b44682d27dcac40085c68b78e888081e
GIT binary patch
literal 6441
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
Dr;~qe

literal 0
HcmV?d00001

diff --git a/src/main/res/layout/fragment_life.xml b/src/main/res/layout/fragment_life.xml
index b75b76d..5256e88 100644
--- a/src/main/res/layout/fragment_life.xml
+++ b/src/main/res/layout/fragment_life.xml
@@ -155,12 +155,11 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/linearLayout5"
-        android:layout_width="380dp"
+        android:layout_width="370dp"
         android:layout_height="200dp"
         android:layout_centerHorizontal="true"
         android:layout_marginTop="8dp"
         android:background="@drawable/rounded_corners6"
-        app:layout_constraintEnd_toEndOf="@+id/linearLayout4"
         app:layout_constraintStart_toStartOf="@+id/linearLayout2"
         app:layout_constraintTop_toBottomOf="@+id/linearLayout2">
 
@@ -272,7 +271,7 @@
             android:layout_marginBottom="8dp"
             android:text="晾晒指数"
             android:textColor="@color/white"
-            android:textSize="15dp"
+            android:textSize="20dp"
             android:textStyle="bold"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/src/main/res/layout/fragment_mine.xml b/src/main/res/layout/fragment_mine.xml
index f6a995c..e799450 100644
--- a/src/main/res/layout/fragment_mine.xml
+++ b/src/main/res/layout/fragment_mine.xml
@@ -13,6 +13,7 @@
         android:layout_marginTop="-10dp"
         android:src="@drawable/test14"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -512,16 +513,37 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <ImageView
+        android:id="@+id/imageView45"
+        android:layout_width="44dp"
+        android:layout_height="30dp"
+        android:layout_marginEnd="-24dp"
+        android:src="@drawable/img_31"
+        app:layout_constraintBottom_toBottomOf="@+id/imageView47"
+        app:layout_constraintEnd_toStartOf="@+id/imageView47" />
+
     <Button
         android:id="@+id/rounded_button"
         android:layout_width="381dp"
         android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="20dp"
         android:backgroundTint="#E6EDFF"
         android:padding="10dp"
         android:text="退出登录"
         android:textColor="@android:color/black"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/linearLayout4" />
+
+    <ImageView
+        android:id="@+id/imageView47"
+        android:layout_width="82dp"
+        android:layout_height="86dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        android:background="@drawable/circle_shape"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@drawable/img_32" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file