From 0957d6155b2948f3b4796ee82fd07fa4cddfbdf4 Mon Sep 17 00:00:00 2001
From: v7lin <v7lin@qq.com>
Date: Tue, 26 Jul 2022 12:30:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AA=81=E7=A0=B4=E5=88=86=E4=BA=AB=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |  5 +++
 android/build.gradle                          |  2 +
 android/src/vendor/AndroidManifest.xml        | 15 ++++++++
 .../vendor/res/xml/weibo_kit_filepaths.xml    | 26 +++++++++++++
 example/lib/main.dart                         | 38 +++++++++----------
 ios/Classes/WeiboKitPlugin.m                  |  2 +-
 pubspec.yaml                                  |  2 +-
 7 files changed, 69 insertions(+), 21 deletions(-)
 create mode 100644 android/src/vendor/res/xml/weibo_kit_filepaths.xml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c5ed36b..ed1e08a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 4.0.1
+
+* fix
+* shareMultiImage/shareVideo
+
 ## 4.0.0
 
 * 升级 Flutter 3.0
diff --git a/android/build.gradle b/android/build.gradle
index 182fcb9..acbbfb9 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -36,6 +36,8 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
+    resourcePrefix 'weibo_kit'
+
     defaultConfig {
         minSdkVersion 16
 
diff --git a/android/src/vendor/AndroidManifest.xml b/android/src/vendor/AndroidManifest.xml
index c04f26a..55d8652 100644
--- a/android/src/vendor/AndroidManifest.xml
+++ b/android/src/vendor/AndroidManifest.xml
@@ -1,4 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="io.github.v7lin.weibo_kit">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -8,4 +9,18 @@
         <!-- targetSdkVersion>=30 -> Android 11 软件包可见性 -->
         <package android:name="com.sina.weibo" />
     </queries>
+
+    <application>
+        <!--覆盖 aar -->
+        <provider
+            android:name="com.sina.weibo.sdk.content.FileProvider"
+            android:authorities="${applicationId}.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true" >
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/weibo_kit_filepaths"
+                tools:replace="android:resource"/>
+        </provider>
+    </application>
 </manifest>
diff --git a/android/src/vendor/res/xml/weibo_kit_filepaths.xml b/android/src/vendor/res/xml/weibo_kit_filepaths.xml
new file mode 100644
index 0000000..c6ab2e1
--- /dev/null
+++ b/android/src/vendor/res/xml/weibo_kit_filepaths.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths>
+    <!-- 指定共享文件的目录路径-->
+
+    <!-- 等同于 Context.getExternalFilesDir(null)-->
+    <!--
+    <external-files-path
+        name="share_files"
+        path="." />
+        -->
+
+    <!-- 等同于 Context.getExternalCacheDirs(null)-->
+    <!--
+    <external-cache-path
+        name="share_cache_files"
+        path="." />
+        -->
+
+    <root-path name="root" path="" />
+    <files-path name="files" path="" />
+    <cache-path name="cache" path="" />
+    <external-path name="external" path="" />
+    <external-files-path name="external_files" path="" />
+    <external-cache-path name="external_cache" path="" />
+    <external-media-path name="external_media" path="" />
+</paths>
\ No newline at end of file
diff --git a/example/lib/main.dart b/example/lib/main.dart
index ad1c230..6776409 100644
--- a/example/lib/main.dart
+++ b/example/lib/main.dart
@@ -140,26 +140,26 @@ class _HomeState extends State<Home> {
           ListTile(
             title: Text('图片分享'),
             onTap: () async {
-              File file = await DefaultCacheManager().getSingleFile(
+              final File file = await DefaultCacheManager().getSingleFile(
                   'https://www.baidu.com/img/bd_logo1.png?where=super');
-              if (Platform.isAndroid) {
-                // 仅支持 Context.getExternalFilesDir(null)/Context.getExternalCacheDirs(null) 路径分享
-                // path_provider.getExternalCacheDirectories();
-                // path_provider.getExternalStorageDirectory();
-                final Directory temporaryDir =
-                    await path_provider.getTemporaryDirectory();
-                if (path.isWithin(temporaryDir.parent.path, file.path)) {
-                  // 复制
-                  final File copyFile = File(path.join(
-                      (await path_provider.getExternalStorageDirectory())!.path,
-                      path.basename(file.path)));
-                  if (copyFile.existsSync()) {
-                    await copyFile.delete();
-                  }
-                  await copyFile.writeAsBytes(await file.readAsBytes());
-                  file = copyFile;
-                }
-              }
+              // if (Platform.isAndroid) {
+              //   // 仅支持 Context.getExternalFilesDir(null)/Context.getExternalCacheDirs(null) 路径分享
+              //   // path_provider.getExternalCacheDirectories();
+              //   // path_provider.getExternalStorageDirectory();
+              //   final Directory temporaryDir =
+              //       await path_provider.getTemporaryDirectory();
+              //   if (path.isWithin(temporaryDir.parent.path, file.path)) {
+              //     // 复制
+              //     final File copyFile = File(path.join(
+              //         (await path_provider.getExternalStorageDirectory())!.path,
+              //         path.basename(file.path)));
+              //     if (copyFile.existsSync()) {
+              //       await copyFile.delete();
+              //     }
+              //     await copyFile.writeAsBytes(await file.readAsBytes());
+              //     file = copyFile;
+              //   }
+              // }
               await Weibo.instance.shareMultiImage(
                 text: 'Share Text',
                 imageUris: <Uri>[Uri.file(file.path)],
diff --git a/ios/Classes/WeiboKitPlugin.m b/ios/Classes/WeiboKitPlugin.m
index 707108a..25310a2 100644
--- a/ios/Classes/WeiboKitPlugin.m
+++ b/ios/Classes/WeiboKitPlugin.m
@@ -83,7 +83,7 @@
         message.text = call.arguments[@"text"];
         WBImageObject *object = [WBImageObject object];
         NSArray *imageUris = call.arguments[@"imageUris"];
-        NSMutableArray<UIImage *>* images = [[NSMutableArray alloc] init];
+        NSMutableArray<UIImage *> *images = [[NSMutableArray alloc] init];
         for (NSString *imageUri in imageUris) {
             NSURL *imageUrl = [NSURL URLWithString:imageUri];
             [images addObject:[UIImage imageWithContentsOfFile:imageUrl.path]];
diff --git a/pubspec.yaml b/pubspec.yaml
index db14fc0..e39fa86 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: weibo_kit
 description: A powerful Flutter plugin allowing developers to auth/share with natvie Android & iOS Weibo SDKs.
-version: 4.0.0
+version: 4.0.1
 # author: v7lin <v7lin@qq.com>
 homepage: https://github.com/RxReader/weibo_kit.git