Merge branch 'feature-2604-cancel-upload' into feature-2604

lib/data/repositories/message/upload_start_handler.dart

@@ -105,16 +105,22 @@ class UploadStartHandler extends MessageHandler {
     } on ChunkSigException {
     } on ChunkSigException {
       debugPrint('====================>上传失败：签名错误');
       debugPrint('====================>上传失败：签名错误');
       // 确保发送了 uploadEnd 指令
       // 确保发送了 uploadEnd 指令
+      if(!_isCancelled) {
         _webCubit?.sendUploadEnd(_cmdUnique, _cmdUploadId, '', errMsg: '网络错误，签名失败');
         _webCubit?.sendUploadEnd(_cmdUnique, _cmdUploadId, '', errMsg: '网络错误，签名失败');
+      }
     } on ChunkUploadFailedException {
     } on ChunkUploadFailedException {
       debugPrint('====================>上传失败：网络错误');
       debugPrint('====================>上传失败：网络错误');
       // 确保发送了 uploadEnd 指令
       // 确保发送了 uploadEnd 指令
+      if(!_isCancelled) {
         _webCubit?.sendUploadEnd(_cmdUnique, _cmdUploadId, '', errMsg: '网络错误，上传失败');
         _webCubit?.sendUploadEnd(_cmdUnique, _cmdUploadId, '', errMsg: '网络错误，上传失败');
+      }
     } catch (e) {
     } catch (e) {
       // Dio close 产生的 DioException 也会走到这里
       // Dio close 产生的 DioException 也会走到这里
       final msg = (e is DioException && e.type == DioExceptionType.cancel) ? '上传已取消' : e.toString();
       final msg = (e is DioException && e.type == DioExceptionType.cancel) ? '上传已取消' : e.toString();
       debugPrint('====================>上传失败：$msg');
       debugPrint('====================>上传失败：$msg');
+      if(!_isCancelled) {
         _webCubit?.sendUploadEnd(_cmdUnique, _cmdUploadId, '', errMsg: msg);
         _webCubit?.sendUploadEnd(_cmdUnique, _cmdUploadId, '', errMsg: msg);
+      }
     } finally {
     } finally {
       _unfollowCubit();
       _unfollowCubit();
       _uploadDio?.close(force: true);
       _uploadDio?.close(force: true);
@@ -166,7 +172,9 @@ class UploadStartHandler extends MessageHandler {
             debugPrint('转码进度: $_cmdUnique $progress%');
             debugPrint('转码进度: $_cmdUnique $progress%');
 
 
             /// 发送转码进度
             /// 发送转码进度
+            if(!_isCancelled) {
               _webCubit?.sendUploadProgress(_cmdUnique, _cmdUploadId, 1, progress, 0, 0, 0, 0);
               _webCubit?.sendUploadProgress(_cmdUnique, _cmdUploadId, 1, progress, 0, 0, 0, 0);
+            }
           },
           },
         );
         );
       } else {
       } else {
@@ -179,7 +187,9 @@ class UploadStartHandler extends MessageHandler {
             debugPrint('压缩进度: $_cmdUnique $progress%');
             debugPrint('压缩进度: $_cmdUnique $progress%');
 
 
             /// 发送压缩进度
             /// 发送压缩进度
+            if(!_isCancelled) {
               _webCubit?.sendUploadProgress(_cmdUnique, _cmdUploadId, 1, progress, 0, 0, 0, 0);
               _webCubit?.sendUploadProgress(_cmdUnique, _cmdUploadId, 1, progress, 0, 0, 0, 0);
+            }
           },
           },
         );
         );
       }
       }