From bdfaa21eb51f6d82d7b556a10f4d1c9145ed42cf Mon Sep 17 00:00:00 2001
From: little-snow-fox <fox@sfxh.cc>
Date: Sat, 7 Dec 2019 19:17:14 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E6=B7=BB=E5=8A=A0=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E5=8E=8B=E7=BC=A9=E5=8F=82=E6=95=B0=EF=BC=8C=E6=8C=89=E5=AE=BD?=
 =?UTF-8?q?=E5=BA=A6=E5=8E=8B=E7=BC=A9=EF=BC=8C=E4=BC=98=E5=8C=96=E5=B7=B2?=
 =?UTF-8?q?=E6=9C=89=E7=9A=84=E5=9B=BE=E7=89=87=E5=8E=8B=E7=BC=A9=E7=AE=97?=
 =?UTF-8?q?=E6=B3=95=E6=8A=9B=E5=BC=83=E5=A4=9A=E4=BD=99=E5=8E=8B=E7=BC=A9?=
 =?UTF-8?q?=E6=AC=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/theweflex/react/WeChatModule.java     | 22 +++++++++++++------
 index.d.ts                                    |  3 ++-
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/android/src/main/java/com/theweflex/react/WeChatModule.java b/android/src/main/java/com/theweflex/react/WeChatModule.java
index aee5a34..ffc39be 100644
--- a/android/src/main/java/com/theweflex/react/WeChatModule.java
+++ b/android/src/main/java/com/theweflex/react/WeChatModule.java
@@ -83,12 +83,10 @@ public class WeChatModule extends ReactContextBaseJavaModule implements IWXAPIEv
         while (baos.toByteArray().length / 1024 > size) {
             // 重置baos即清空baos
             baos.reset();
-            if (options <= 1) {
-                break;
-            } else if (options > 5) {
-                options -= 5;
+            if (options > 10) {
+                options -= 8;
             } else {
-                options -= 1;
+                return bitmapResizeGetBytes(Bitmap.createScaledBitmap(image, 280, image.getHeight() / image.getWidth() * 280, true), size);
             }
             // 这里压缩options%，把压缩后的数据存放到baos中
             image.compress(Bitmap.CompressFormat.JPEG, options, baos);
@@ -225,7 +223,13 @@ public class WeChatModule extends ReactContextBaseJavaModule implements IWXAPIEv
     public void shareImage(final ReadableMap data, final Callback callback) {
         this._getImage(Uri.parse(data.getString("imageUrl")), null, new ImageCallback() {
             @Override
-            public void invoke(@Nullable Bitmap bmp) {
+            public void invoke(@Nullable Bitmap bitmap) {
+                Bitmap bmp = bitmap;
+                int maxWidth = data.hasKey("maxWidth") ? data.getInt("maxWidth") : -1;
+                // 如果图片大于10MB而且没设置压缩，自动开启压缩
+                if (maxWidth > 0) {
+                    bmp = Bitmap.createScaledBitmap(bmp, maxWidth, bmp.getHeight() / bmp.getWidth() * maxWidth, true);
+                }
                 // 初始化 WXImageObject 和 WXMediaMessage 对象
                 WXImageObject imgObj = new WXImageObject(bmp);
                 WXMediaMessage msg = new WXMediaMessage();
@@ -259,13 +263,17 @@ public class WeChatModule extends ReactContextBaseJavaModule implements IWXAPIEv
             if (path.indexOf("file://") > -1) {
                 path = path.substring(7);
             }
+            int maxWidth = data.hasKey("maxWidth") ? data.getInt("maxWidth") : -1;
             fs = new FileInputStream(path);
             Bitmap bmp  = BitmapFactory.decodeStream(fs);
+            // 如果图片大于10MB而且没设置压缩，自动开启压缩
+            if (maxWidth > 0) {
+                bmp = Bitmap.createScaledBitmap(bmp, maxWidth, bmp.getHeight() / bmp.getWidth() * maxWidth, true);
+            }
             // 初始化 WXImageObject 和 WXMediaMessage 对象
             WXImageObject imgObj = new WXImageObject(bmp);
             WXMediaMessage msg = new WXMediaMessage();
             msg.mediaObject = imgObj;
-
             // 设置缩略图
             msg.thumbData = bitmapResizeGetBytes(bmp, THUMB_SIZE);
 
diff --git a/index.d.ts b/index.d.ts
index d85c8ac..4c7e679 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -68,7 +68,8 @@ declare module "react-native-wechat-lib" {
   }
   export interface ShareImageMetadata {
     imageUrl: string,
-    scene?: WXScene
+    scene?: WXScene,
+    maxWidth?: number
   }
   export interface ShareMusicMetadata {
     musicUrl: string,