Merge branch 'develop_sky_liyi' into 'develop_sky'

Develop sky liyi

See merge request StarlockTeam/app-starlock!226
This commit is contained in:
李仪 2025-07-29 06:00:53 +00:00
commit 917dfbba91
2 changed files with 20 additions and 1 deletions

View File

@ -3,9 +3,11 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:flutter_easyloading/flutter_easyloading.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:fluwx/fluwx.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:star_lock/app_settings/app_colors.dart'; import 'package:star_lock/app_settings/app_colors.dart';
import 'package:star_lock/app_settings/app_settings.dart'; import 'package:star_lock/app_settings/app_settings.dart';
import 'package:star_lock/flavors.dart';
import 'package:star_lock/main/lockDetail/passwordKey/passwordKey_perpetual/passwordKey_perpetual_logic.dart'; import 'package:star_lock/main/lockDetail/passwordKey/passwordKey_perpetual/passwordKey_perpetual_logic.dart';
import 'package:star_lock/main/lockDetail/passwordKey/passwordKey_perpetual/passwordKey_perpetual_state.dart'; import 'package:star_lock/main/lockDetail/passwordKey/passwordKey_perpetual/passwordKey_perpetual_state.dart';
import 'package:star_lock/tools/commonDataManage.dart'; import 'package:star_lock/tools/commonDataManage.dart';
@ -859,7 +861,18 @@ class _PasswordKeyPerpetualPageState extends State<PasswordKeyPerpetualPage>
final String pwdShareStr = logic.getShareContentStr(); final String pwdShareStr = logic.getShareContentStr();
switch (itemIndex) { switch (itemIndex) {
case 0: // case 0: //
NativeInteractionTool().loadNativeShare(shareText: pwdShareStr); Fluwx fluwx = Fluwx();
fluwx.registerApi(
appId: F.wechatAppInfo.wechatAppId,
universalLink: F.wechatAppInfo.universalLink,
);
fluwx.share(
WeChatShareTextModel(
pwdShareStr,
scene: WeChatScene.session,
),
);
// NativeInteractionTool().loadNativeShare(shareText: pwdShareStr);
break; break;
case 1: // case 1: //
case 2: // case 2: //

View File

@ -166,6 +166,12 @@ class LockVoiceSettingLogic extends BaseGetXController {
BluetoothConnectionState.disconnected) { BluetoothConnectionState.disconnected) {
dismissEasyLoading(); dismissEasyLoading();
cancelBlueConnetctToastTimer(); cancelBlueConnetctToastTimer();
// 1
Future.delayed(const Duration(seconds: 2), () {
// +1
sendFileToDevice(data, token);
});
// showBlueConnetctToast(); // showBlueConnetctToast();
} }
}); });