From cd5856778c00dfd155c965aeb1b5acac3c2ed89e Mon Sep 17 00:00:00 2001
From: chenjuntao <chenjuntao@ghzhushou.com>
Date: Mon, 10 Jun 2019 16:28:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=BD=86=E6=98=AF=E7=B3=BB=E7=BB=9F=E5=9B=BE?=
 =?UTF-8?q?=E5=BA=93=E6=B2=A1=E6=9C=89=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/gh/common/util/MessageShareUtils.java    | 11 +++++++----
 .../java/com/gh/gamecenter/ViewImageActivity.java     |  4 ++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/gh/common/util/MessageShareUtils.java b/app/src/main/java/com/gh/common/util/MessageShareUtils.java
index 0966dca749..63f58dbcfa 100644
--- a/app/src/main/java/com/gh/common/util/MessageShareUtils.java
+++ b/app/src/main/java/com/gh/common/util/MessageShareUtils.java
@@ -370,7 +370,7 @@ public class MessageShareUtils {
                     if (isToast) {
                         Utils.toast(mContext, "图片已保存到/Pictures/ghzhushou/");
                         //刷新手机图片库
-                        refreshImage(_file, mContext);
+                        refreshImage(mContext, _file);
                     }
                 }
             }
@@ -388,12 +388,15 @@ public class MessageShareUtils {
         }
     }
 
-    public static void refreshImage(File _file, Context context) {
+    /**
+     * 注意，第二个入参需要是 file 本身而不是 folder
+     */
+    public static void refreshImage(Context context, File imageFile) {
         Intent intent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE);
-        Uri uri = Uri.fromFile(_file);
+        Uri uri = Uri.fromFile(imageFile);
         intent.setData(uri);
         context.sendBroadcast(intent);
-        Utils.log("保存分享图片路径：" + _file.getAbsolutePath());
+        Utils.log("保存分享图片路径：" + imageFile.getAbsolutePath());
     }
 
     class ShareRecyclerViewAdapter extends RecyclerView.Adapter<ShareRecyclerViewAdapter.ViewHolder> {
diff --git a/app/src/main/java/com/gh/gamecenter/ViewImageActivity.java b/app/src/main/java/com/gh/gamecenter/ViewImageActivity.java
index 2d4c2b79aa..4e47c1c20d 100644
--- a/app/src/main/java/com/gh/gamecenter/ViewImageActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/ViewImageActivity.java
@@ -393,7 +393,7 @@ public class ViewImageActivity extends BaseActivity implements OnPageChangeListe
                             OutputStream outStream = new FileOutputStream(targetFile);
                             outStream.write(resource.read());
                             Utils.toast(ViewImageActivity.this, "图片已保存到/Pictures/ghzhushou/");
-                            MessageShareUtils.refreshImage(new File(savePath), ViewImageActivity.this);
+                            MessageShareUtils.refreshImage(ViewImageActivity.this, targetFile);
                         } catch (Exception e) {
                             Utils.log("图片保存失败：" + e.toString());
                             e.printStackTrace();
@@ -430,7 +430,7 @@ public class ViewImageActivity extends BaseActivity implements OnPageChangeListe
                 out.close();
                 Utils.log("图片保存成功");
                 Utils.toast(ViewImageActivity.this, "图片已保存到/Pictures/ghzhushou/");
-                MessageShareUtils.refreshImage(new File(savePath), ViewImageActivity.this);
+                MessageShareUtils.refreshImage(ViewImageActivity.this, f);
             } catch (IOException e) {
                 Utils.log("图片保存失败：" + e.toString());
                 e.printStackTrace();