From 9ec5407bef2f8afe1650caf1ed075e8ce0257d26 Mon Sep 17 00:00:00 2001
From: shixianjie <shixianjie@hjx.com>
Date: Fri, 11 Oct 2024 13:56:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=8E=9F=E5=9B=BE=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/deploymentTargetDropDown.xml                        | 15 ++++++++++++++-
 app/src/main/java/com/hjx/parent/ImageActivity.java       | 10 ++++++++++
 app/src/main/res/layout/activity_image.xml                |  4 ++--
 .../src/main/java/com/prws/common/bean/ImageBean.java     |  2 ++
 4 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 0c0c338..cc18811 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -3,7 +3,20 @@
   <component name="deploymentTargetDropDown">
     <value>
       <entry key="app">
-        <State />
+        <State>
+          <runningDeviceTargetSelectedWithDropDown>
+            <Target>
+              <type value="RUNNING_DEVICE_TARGET" />
+              <deviceKey>
+                <Key>
+                  <type value="SERIAL_NUMBER" />
+                  <value value="951f9ace" />
+                </Key>
+              </deviceKey>
+            </Target>
+          </runningDeviceTargetSelectedWithDropDown>
+          <timeTargetWasSelectedWithDropDown value="2024-10-11T05:46:18.103982900Z" />
+        </State>
       </entry>
     </value>
   </component>
diff --git a/app/src/main/java/com/hjx/parent/ImageActivity.java b/app/src/main/java/com/hjx/parent/ImageActivity.java
index 6852946..cad7498 100644
--- a/app/src/main/java/com/hjx/parent/ImageActivity.java
+++ b/app/src/main/java/com/hjx/parent/ImageActivity.java
@@ -26,6 +26,7 @@ import com.hjx.parent.adapter.ImageAdapter;
 import com.hjx.parent.databinding.ActivityImageBinding;
 import com.hjx.parent.dialog.AddHomeworkDialog;
 import com.hjx.parent.dialog.ErrorInputDialog;
+import com.hjx.parent.dialog.PhotoViewDialog;
 import com.hjx.parent.dialog.TipDialog;
 import com.hjx.parent.rx.BaseRxActivity;
 import com.prws.common.bean.CutPicBean;
@@ -68,6 +69,7 @@ public class ImageActivity extends BaseRxActivity<ActivityImageBinding> implemen
             Bitmap bitmap = BitmapUtils.getimage(s);
             CommonUtil.saveBitmapToUri(bitmap, filepath);
             imageBean.setPath(filepath);
+            imageBean.source = filepath;
             list.add(imageBean);
         }
         imageAdapter = new ImageAdapter(this, list);
@@ -105,6 +107,11 @@ public class ImageActivity extends BaseRxActivity<ActivityImageBinding> implemen
         binding.tvAdd.setOnClickListener(this);
         binding.llEdit.setOnClickListener(this);
         binding.tvSave.setOnClickListener(this);
+        binding.btnShowSource.setOnClickListener(v -> {
+            if (list.isEmpty()) return;
+            ImageBean data = list.get(binding.viewPager.getCurrentItem());
+            new PhotoViewDialog(this).show(data.source);
+        });
     }
 
     public void clearText() {
@@ -382,10 +389,12 @@ public class ImageActivity extends BaseRxActivity<ActivityImageBinding> implemen
                 }
             } else if (resultCode == 1003) {
                 int position = binding.viewPager.getCurrentItem();
+                String src = list.get(position).source;
                 list.remove(position);
                 String path = data.getStringExtra("path");
                 ImageBean imageBean = new ImageBean();
                 imageBean.setPath(path);
+                imageBean.source = src;
                 list.add(position, imageBean);
                 imageAdapter.notifyItemChanged(position);
                 clearText();
@@ -433,6 +442,7 @@ public class ImageActivity extends BaseRxActivity<ActivityImageBinding> implemen
             list.remove(position);
             ImageBean imageBean = new ImageBean();
             imageBean.setPath(path);
+            imageBean.source = path;
             list.add(position, imageBean);
             imageAdapter.notifyItemChanged(position);
             clearText();
diff --git a/app/src/main/res/layout/activity_image.xml b/app/src/main/res/layout/activity_image.xml
index aba3f54..9c75ac8 100644
--- a/app/src/main/res/layout/activity_image.xml
+++ b/app/src/main/res/layout/activity_image.xml
@@ -36,6 +36,7 @@
             android:textSize="14sp" />
 
         <TextView
+            android:id="@+id/btnShowSource"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
@@ -43,8 +44,7 @@
             android:layout_marginRight="15dp"
             android:text="查看原图"
             android:textColor="#333333"
-            android:textSize="14sp"
-            android:visibility="gone" />
+            android:textSize="14sp" />
     </RelativeLayout>
 
     <TextView
diff --git a/libs/common/src/main/java/com/prws/common/bean/ImageBean.java b/libs/common/src/main/java/com/prws/common/bean/ImageBean.java
index 066da23..7fa8ebd 100644
--- a/libs/common/src/main/java/com/prws/common/bean/ImageBean.java
+++ b/libs/common/src/main/java/com/prws/common/bean/ImageBean.java
@@ -7,6 +7,8 @@ import java.io.Serializable;
 import java.util.List;
 
 public class ImageBean implements Serializable {
+    public transient String source;
+
     private String path;
     private List<Cut> cuts;
 
-- 
1.9.0