From ebde193883a7f58957484ad6c7e22e0a97200990 Mon Sep 17 00:00:00 2001
From: orz12 <ms_lyq@hotmail.com>
Date: Mon, 22 Apr 2024 20:10:25 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=86=99=E8=AF=84=E8=AE=BA=E6=97=B6?=
 =?UTF-8?q?=E9=81=BF=E5=85=8D=E8=AF=AF=E8=A7=A6=E7=95=8C=E9=9D=A2=E6=94=B6?=
 =?UTF-8?q?=E8=B5=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 android/app/src/main/AndroidManifest.xml   | 5 +++--
 lib/pages/dynamics/detail/view.dart        | 1 +
 lib/pages/html/view.dart                   | 1 +
 lib/pages/video/detail/reply/view.dart     | 1 +
 lib/pages/video/detail/reply_new/view.dart | 5 +++++
 5 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index da90fff7b..5c175a5a7 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -187,10 +187,11 @@
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="28"/>
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
     <!--
       Media access permissions.
       Android 13 or higher.
diff --git a/lib/pages/dynamics/detail/view.dart b/lib/pages/dynamics/detail/view.dart
index 1e10c4902..c66082ace 100644
--- a/lib/pages/dynamics/detail/view.dart
+++ b/lib/pages/dynamics/detail/view.dart
@@ -383,6 +383,7 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
                     showModalBottomSheet(
                       context: context,
                       isScrollControlled: true,
+                      isDismissible: false,
                       builder: (BuildContext context) {
                         return VideoReplyNewDialog(
                           oid: _dynamicDetailController.oid ??
diff --git a/lib/pages/html/view.dart b/lib/pages/html/view.dart
index 5ab5a723e..d9b8fe203 100644
--- a/lib/pages/html/view.dart
+++ b/lib/pages/html/view.dart
@@ -403,6 +403,7 @@ class _HtmlRenderPageState extends State<HtmlRenderPage>
                   showModalBottomSheet(
                     context: context,
                     isScrollControlled: true,
+                    isDismissible: false,
                     builder: (BuildContext context) {
                       return VideoReplyNewDialog(
                         oid: _htmlRenderCtr.oid.value,
diff --git a/lib/pages/video/detail/reply/view.dart b/lib/pages/video/detail/reply/view.dart
index 74d0d263c..948aa28a5 100644
--- a/lib/pages/video/detail/reply/view.dart
+++ b/lib/pages/video/detail/reply/view.dart
@@ -252,6 +252,7 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
                   feedBack();
                   showModalBottomSheet(
                     context: context,
+                    isDismissible: false,
                     isScrollControlled: true,
                     builder: (BuildContext context) {
                       return VideoReplyNewDialog(
diff --git a/lib/pages/video/detail/reply_new/view.dart b/lib/pages/video/detail/reply_new/view.dart
index de25e3c9c..f7066f382 100644
--- a/lib/pages/video/detail/reply_new/view.dart
+++ b/lib/pages/video/detail/reply_new/view.dart
@@ -224,6 +224,11 @@ class _VideoReplyNewDialogState extends State<VideoReplyNewDialog>
                   selected: toolbarType == 'emote',
                 ),
                 const Spacer(),
+                TextButton(
+                    onPressed: () => Get.back(), child: Text('取消',
+                        style: TextStyle(
+                            color: Theme.of(context).colorScheme.secondary))),
+                const SizedBox(width: 10),
                 TextButton(
                     onPressed: () => submitReplyAdd(), child: const Text('发送'))
               ],