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 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 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 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 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 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" />
+ android:textSize="14sp" />
cuts;