fix: open dir path

lawnvi · Jul 8, 2024 · cac00dd · cac00dd
1 parent 8d9c745
commit cac00dd
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 15 deletions.
diff --git a/lib/helper/file.dart b/lib/helper/file.dart
@@ -7,16 +7,12 @@ import 'package:whisper/helper/local.dart';
 
 import 'helper.dart';
 
-void openDir({String name="", bool isMobile=true}) async {
-  var dir = await downloadDir();
-  var path = dir.path;
+void openDir(String path) async {
 
-  if (isMobile) {
-    path = "${dir.path}/$name";
-    var file = File(path);
-    if (!file.existsSync()) {
-      path = dir.path;
-    }
+  var file = File(path);
+  if (!file.existsSync()) {
+    var dir = await downloadDir();
+    path = dir.path;
   }
 
   logger.i("打开文件: $path");

diff --git a/lib/page/conversation.dart b/lib/page/conversation.dart
@@ -306,7 +306,7 @@ class _SendMessageScreen extends State<SendMessageScreen> implements ISocketEven
                           ),
                           onTap: (){
                             if (isOpponent && message.type == MessageEnum.File) {
-                              openDir(name: message.name, isMobile: isMobile());
+                              openDir(message.path);
                             }
                           },
                           onDoubleTap: () async {

diff --git a/lib/page/deviceList.dart b/lib/page/deviceList.dart
@@ -1296,8 +1296,8 @@ class _SettingsScreen extends State<SettingsScreen> {
                         _buildSettingItem(
                           _path,
                           const Icon(Icons.file_download_outlined, color: CupertinoColors.systemGrey),
-                          onTap: () {
-                            openDir();
+                          onTap: () async {
+                            openDir((await downloadDir()).path);
                           },
                           onLongPress: () {
                             _pickSaveDir();

diff --git a/lib/socket/svrmanager.dart b/lib/socket/svrmanager.dart
@@ -368,9 +368,10 @@ class WsSvrManager {
     var path = await _prepareIOSink(message);
     var msgTemp = message.toJson();
     msgTemp["path"] = path;
-    LocalDatabase().insertMessage(MessageData.fromJson(msgTemp));
-    logger.i("保存文件: $path");
-    _event?.onMessage(message);
+    var newMessage = MessageData.fromJson(msgTemp);
+    LocalDatabase().insertMessage(newMessage);
+    // logger.i("保存文件: $path");
+    _event?.onMessage(newMessage);
     _ackMessage(message);
   }