From 72326851ca306f1e7eebe8898ef53f7e26d102b6 Mon Sep 17 00:00:00 2001 From: liyi Date: Thu, 3 Apr 2025 15:39:27 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=E5=8E=BB=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=BC=95=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/udp_ble_passthrough_handler.dart | 24 +++---------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/lib/talk/starChart/handle/impl/udp_ble_passthrough_handler.dart b/lib/talk/starChart/handle/impl/udp_ble_passthrough_handler.dart index ba052eb9..5d140492 100644 --- a/lib/talk/starChart/handle/impl/udp_ble_passthrough_handler.dart +++ b/lib/talk/starChart/handle/impl/udp_ble_passthrough_handler.dart @@ -1,33 +1,15 @@ -import 'dart:async'; -import 'dart:convert'; -import 'dart:typed_data'; -import 'package:flutter_easyloading/flutter_easyloading.dart'; -import 'package:get/get.dart'; -import 'package:star_lock/appRouters.dart'; +import 'dart:convert'; + import 'package:star_lock/app_settings/app_settings.dart'; -import 'package:star_lock/blue/blue_manage.dart'; -import 'package:star_lock/blue/io_protocol/io_openLock.dart'; -import 'package:star_lock/blue/io_reply.dart'; -import 'package:star_lock/blue/io_tool/io_tool.dart'; -import 'package:star_lock/blue/io_tool/manager_event_bus.dart'; + import 'package:star_lock/blue/reciver_data.dart'; -import 'package:star_lock/main/lockDetail/lockDetail/lockDetail_logic.dart'; -import 'package:star_lock/main/lockDetail/lockDetail/lockDetail_state.dart'; import 'package:star_lock/talk/starChart/constant/message_type_constant.dart'; import 'package:star_lock/talk/starChart/entity/scp_message.dart'; import 'package:star_lock/talk/starChart/handle/scp_message_base_handle.dart'; import 'package:star_lock/talk/starChart/handle/scp_message_handle.dart'; import 'package:star_lock/talk/starChart/proto/ble_message.pbserver.dart'; -import 'package:star_lock/talk/starChart/proto/gateway_reset.pb.dart'; -import 'package:star_lock/talk/starChart/proto/generic.pb.dart'; -import 'package:star_lock/tools/bugly/bugly_tool.dart'; -import 'package:star_lock/tools/dateTool.dart'; -import 'package:star_lock/tools/eventBusEventManage.dart'; -import 'package:star_lock/tools/storage.dart'; -import 'package:umeng_common_sdk/umeng_common_sdk.dart'; -import '../../star_chart_manage.dart'; class UdpBlePassThroughHandler extends ScpMessageBaseHandle implements ScpMessageHandler { From 7f29cfcbf03ed1462b303dab5111b2e61f22edd9 Mon Sep 17 00:00:00 2001 From: Liuyf Date: Mon, 7 Apr 2025 09:35:44 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E3=80=90[=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4]=E6=88=91=E7=9A=84=E9=A1=B5-=E5=A2=9E?= =?UTF-8?q?=E5=80=BC=E6=9C=8D=E5=8A=A1-=E9=AB=98=E7=BA=A7=E5=8A=9F?= =?UTF-8?q?=E8=83=BD-=E7=BA=BF=E4=B8=8A=E7=8E=AF=E5=A2=83=E7=82=B9?= =?UTF-8?q?=E9=83=BD=E6=8F=90=E7=A4=BA=E8=AF=B7=E5=85=88=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=94=81=EF=BC=8C=E4=B8=8D=E8=83=BD=E8=B4=AD=E4=B9=B0=EF=BC=88?= =?UTF-8?q?=E5=B7=B2=E6=B7=BB=E5=8A=A0=E6=9C=89=E9=94=81=EF=BC=89=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../valueAddedServicesList_page.dart | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_page.dart b/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_page.dart index 760a0993..52a21ea9 100755 --- a/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_page.dart +++ b/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_page.dart @@ -68,15 +68,16 @@ class _ValueAddedServicesPageListState '高级功能'.tr, () async { final bool? isVip = await Storage.getBool(saveIsVip); if (isVip == null || !isVip) { - if (CommonDataManage().currentKeyInfo.isLockOwner != 1) { - logic.showToast('请先添加锁'.tr); - } else { - //刷新购买状态 - Get.toNamed(Routers.advancedFeaturesWebPage, - arguments: { - 'webBuyType': XSConstantMacro.webBuyTypeVip, - })?.then((value) => logic.getUserInfoRequest()); - } + // vip状态是和账号绑定，这里判断用户打开的某个锁是不是LockOwner没意义 + // if (CommonDataManage().currentKeyInfo.isLockOwner != 1) { + // logic.showToast('请先添加锁'.tr); + // } else { + //刷新购买状态 + Get.toNamed(Routers.advancedFeaturesWebPage, + arguments: { + 'webBuyType': XSConstantMacro.webBuyTypeVip, + })?.then((value) => logic.getUserInfoRequest()); + // } } else { Get.toNamed(Routers.valueAddedServicesHighFunctionPage); } From 903cacab3785b30ac90764a6a824f6c53fd480b5 Mon Sep 17 00:00:00 2001 From: liyi Date: Mon, 7 Apr 2025 09:50:46 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4=E5=AD=97=E8=8A=82?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io_changeAdministratorPassword.dart | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/lib/blue/io_protocol/io_changeAdministratorPassword.dart b/lib/blue/io_protocol/io_changeAdministratorPassword.dart index 17862cfe..12172139 100755 --- a/lib/blue/io_protocol/io_changeAdministratorPassword.dart +++ b/lib/blue/io_protocol/io_changeAdministratorPassword.dart @@ -1,6 +1,6 @@ - import 'dart:convert'; +import 'package:star_lock/flavors.dart'; import 'package:star_lock/tools/dateTool.dart'; import '../../app_settings/app_settings.dart'; @@ -13,7 +13,6 @@ import 'package:crypto/crypto.dart' as crypto; // 修改管理员密码 class ChangeAdministratorPasswordCommand extends SenderProtocol { - ChangeAdministratorPasswordCommand({ this.keyID, this.userID, @@ -40,7 +39,6 @@ class ChangeAdministratorPasswordCommand extends SenderProtocol { List? signKey; List? privateKey; - @override String toString() { return 'ChangeAdministratorPasswordCommand{keyID: $keyID, userID: $userID,' @@ -80,7 +78,12 @@ class ChangeAdministratorPasswordCommand extends SenderProtocol { subData = getFixedLengthList(subData, 20 - userIDLength); // PwdNo - subData.addAll(intChangList(pwdNo!)); + if (F.isSKY) { + subData.add(pwdNo! & 0xFF); // 低字节 + subData.add((pwdNo! >> 8) & 0xFF); // 高字节 + } else { + subData.addAll(intChangList(pwdNo!)); + } // pwd 20 final int pwdLength = utf8.encode(pwd!).length; @@ -105,7 +108,7 @@ class ChangeAdministratorPasswordCommand extends SenderProtocol { subData.add((endTime! & 0xff00) >> 8); subData.add(endTime! & 0xff); - if(needAuthor == 0){ + if (needAuthor == 0) { //AuthCodeLen 1 subData.add(0); } else { @@ -147,10 +150,11 @@ class ChangeAdministratorPasswordCommand extends SenderProtocol { } class ChangeAdministratorPasswordReply extends Reply { - ChangeAdministratorPasswordReply.parseData(CommandType commandType, List dataDetail) + ChangeAdministratorPasswordReply.parseData( + CommandType commandType, List dataDetail) : super.parseData(commandType, dataDetail) { data = dataDetail; final int status = data[2]; errorWithStstus(status); } -} \ No newline at end of file +} From 68a13c4b6c4b3a12f5128b838de83bab866f3436 Mon Sep 17 00:00:00 2001 From: liyi Date: Mon, 7 Apr 2025 14:31:26 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4=E5=90=8C=E6=84=8F?= =?UTF-8?q?=E9=9A=90=E7=A7=81=E5=8D=8F=E8=AE=AE=E5=90=8E=E6=89=8D=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E4=B8=80=E9=94=AE=E7=99=BB=E5=BD=95=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/login/login/starLock_login_logic.dart | 5 +---- lib/main.dart | 9 +++++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/login/login/starLock_login_logic.dart b/lib/login/login/starLock_login_logic.dart index 4dfa2b5d..d7244068 100755 --- a/lib/login/login/starLock_login_logic.dart +++ b/lib/login/login/starLock_login_logic.dart @@ -179,10 +179,7 @@ class StarLockLoginLogic extends BaseGetXController { Future onInit() async { super.onInit(); - JverifyOneClickLoginManage(); - oneClickLoginAction(); - state.isCheckVerifyEnable.value = - await JverifyOneClickLoginManage().checkVerifyEnable(); + } @override diff --git a/lib/main.dart b/lib/main.dart index 872b7a26..9e20bdd8 100755 --- a/lib/main.dart +++ b/lib/main.dart @@ -9,6 +9,7 @@ import 'package:get/get.dart'; import 'package:path/path.dart' as path; import 'package:provider/provider.dart'; import 'package:star_lock/flavors.dart'; +import 'package:star_lock/login/login/starLock_login_logic.dart'; import 'package:star_lock/mine/about/debug/debug_tool.dart'; import 'package:star_lock/network/api_provider.dart'; import 'package:star_lock/network/api_repository.dart'; @@ -17,6 +18,7 @@ import 'package:star_lock/talk/starChart/handle/impl/debug_Info_model.dart'; import 'package:star_lock/talk/starChart/status/appLifecycle_observer.dart'; import 'package:star_lock/tools/bugly/bugly_tool.dart'; import 'package:star_lock/tools/device_info_service.dart'; +import 'package:star_lock/tools/jverify_one_click_login.dart'; import 'package:star_lock/tools/platform_info_services.dart'; import 'package:star_lock/tools/push/notification_service.dart'; import 'package:star_lock/tools/push/xs_jPhush.dart'; @@ -99,4 +101,11 @@ Future privacySDKInitialization() async { final XSJPushProvider jpushProvider = XSJPushProvider(); await jpushProvider.initJPushService(); NotificationService().init(); // 初始化通知服务 + + // 初始化一键登录服务 + final StarLockLoginLogic loginLogic = Get.put(StarLockLoginLogic()); + JverifyOneClickLoginManage(); + loginLogic.oneClickLoginAction(); + loginLogic.state.isCheckVerifyEnable.value = + await JverifyOneClickLoginManage().checkVerifyEnable(); }