sky/starwork_flutter
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 暂缓，改为sdk接入开发

Browse Source
This commit is contained in:
liyi 2025-09-09 15:43:10 +08:00
parent b21fd12ca7
commit 59b972f864
2 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
lib/ble/ble_service.dart
View File

@ -650,38 +650,38 @@ class BleService {
// 9. 检查是否需要重发（通用重发机制） // 9. 检查是否需要重发（通用重发机制）
// 只对实现了RetryableBleCommand接口的命令进行重发检查 // 只对实现了RetryableBleCommand接口的命令进行重发检查
if (retryCount < maxRetries && command is RetryableBleCommand<T>) { // if (retryCount < maxRetries && command is RetryableBleCommand<T>) {
// 明确转换类型以避免静态分析错误 // // 明确转换类型以避免静态分析错误
final retryableCommand = command as RetryableBleCommand<T>; // final retryableCommand = command as RetryableBleCommand<T>;
if (retryableCommand.shouldRetry(response)) { // if (retryableCommand.shouldRetry(response)) {
AppLogger.info('🔄 命令${command.runtimeType}需要重发，准备创建重发命令 (重试次数: ${retryCount + 1}/${maxRetries})'); // AppLogger.info('🔄 命令${command.runtimeType}需要重发，准备创建重发命令 (重试次数: ${retryCount + 1}/${maxRetries})');
//
try { // try {
// 创建重发命令 // // 创建重发命令
BaseBleCommand<T> retryCommand = retryableCommand.createRetryCommand(response); // BaseBleCommand<T> retryCommand = retryableCommand.createRetryCommand(response);
//
// 重新发送命令，传递现有的命令键以确保响应正确处理 // // 重新发送命令，传递现有的命令键以确保响应正确处理
AppLogger.info('🔄 使用重发机制重新发送命令'); // AppLogger.info('🔄 使用重发机制重新发送命令');
return await sendCommand<T>( // return await sendCommand<T>(
command: retryCommand, // command: retryCommand,
targetDeviceId: targetDeviceId, // targetDeviceId: targetDeviceId,
targetDeviceName: targetDeviceName, // targetDeviceName: targetDeviceName,
timeout: timeout, // timeout: timeout,
autoConnectIfNeeded: true, // autoConnectIfNeeded: true,
// 重发时也需要自动连接 // // 重发时也需要自动连接
maxRetries: maxRetries, // maxRetries: maxRetries,
retryCount: retryCount + 1, // retryCount: retryCount + 1,
// 增加重试次数 // // 增加重试次数
existingCommandKey: commandKey, // 传递现有的命令键 // existingCommandKey: commandKey, // 传递现有的命令键
); // );
} catch (retryError, retryStackTrace) { // } catch (retryError, retryStackTrace) {
AppLogger.error('❌ 创建或发送重发命令失败', error: retryError, stackTrace: retryStackTrace); // AppLogger.error('❌ 创建或发送重发命令失败', error: retryError, stackTrace: retryStackTrace);
// 如果创建重发命令失败，返回原始响应 // // 如果创建重发命令失败，返回原始响应
AppLogger.highlight('✨✨✨ ✅ 命令发送完成，收到应答: $response ✨✨✨'); // AppLogger.highlight('✨✨✨ ✅ 命令发送完成，收到应答: $response ✨✨✨');
return response; // return response;
} // }
} // }
} // }
AppLogger.highlight('✨✨✨ ✅ 命令发送成功，收到应答: $response ✨✨✨'); AppLogger.highlight('✨✨✨ ✅ 命令发送成功，收到应答: $response ✨✨✨');
return response; return response;

6
lib/ble/command/request/ble_cmd_add_admin.dart
View File

@ -3,14 +3,13 @@ import 'dart:convert';
import 'package:crypto/crypto.dart'; import 'package:crypto/crypto.dart';
import 'package:starwork_flutter/base/app_logger.dart'; import 'package:starwork_flutter/base/app_logger.dart';
import 'package:starwork_flutter/ble/command/base/base_ble_command.dart'; import 'package:starwork_flutter/ble/command/base/base_ble_command.dart';
import 'package:starwork_flutter/ble/command/base/retryable_ble_command.dart';
import 'package:starwork_flutter/ble/command/response/ble_cmd_get_private_key_parser.dart'; import 'package:starwork_flutter/ble/command/response/ble_cmd_get_private_key_parser.dart';
import 'package:starwork_flutter/ble/command/response/model/ble_add_admin_response.dart'; import 'package:starwork_flutter/ble/command/response/model/ble_add_admin_response.dart';
import 'package:starwork_flutter/ble/constant/lock_ble_constant.dart'; import 'package:starwork_flutter/ble/constant/lock_ble_constant.dart';
import 'package:starwork_flutter/common/sm4_encipher/sm4.dart'; import 'package:starwork_flutter/common/sm4_encipher/sm4.dart';
/// ✨✨✨ 增加超级管理员命令类 - 继承BaseBleCommand ✨✨✨ /// ✨✨✨ 增加超级管理员命令类 - 继承BaseBleCommand ✨✨✨
class BleCmdAddAdmin extends BaseBleCommand<BleAddAdminResponse> implements RetryableBleCommand<BleAddAdminResponse> { class BleCmdAddAdmin extends BaseBleCommand<BleAddAdminResponse> {
final String lockId; final String lockId;
final String authUserId; final String authUserId;
final String keyId; final String keyId;
@ -218,7 +217,8 @@ class BleCmdAddAdmin extends BaseBleCommand<BleAddAdminResponse> implements Retr
endMin: this.endMin, endMin: this.endMin,
role: this.role, role: this.role,
password: this.password, password: this.password,
token: token, // 使用从响应中获取的有效token token: token,
// 使用从响应中获取的有效token
publicKey: this.publicKey, publicKey: this.publicKey,
privateKey: this.privateKey, privateKey: this.privateKey,
); );