sky/app-starlock
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_sky' into 'release_sky'

Browse Source 
fix:修复卡片、人脸、指纹详情页点击删除不弹出确认窗口的问题

See merge request StarlockTeam/app-starlock!122
This commit is contained in:
李仪 2025-05-30 09:21:49 +00:00
commit d4f64f37ea
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/main/lockDetail/card/cardDetail/cardDetail_page.dart
View File

@ -220,8 +220,7 @@ class _CardDetailPageState extends State<CardDetailPage> with RouteAware {
left: 30.w, right: 30.w, top: 30.w, bottom: 30.w),
padding: EdgeInsets.only(top: 25.w, bottom: 25.w),
onClick: () async {
final bool isNetWork =
await LockMainLogic.to()?.judgeTheNetwork() ?? false;
final bool isNetWork = await logic.isConnected();
if (!isNetWork) {
return;
}

10
lib/main/lockDetail/face/faceDetail/faceDetail_page.dart
View File

@ -1,4 +1,3 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
@ -49,9 +48,7 @@ class _FaceDetailPageState extends State<FaceDetailPage> with RouteAware {
Obx(() => lockDataListItem('姓名'.tr, state.typeName.value, () {
// showCupertinoAlertDialog(context);
ShowTipView().showTFViewAlertDialog(
state.changeNameController,
'修改姓名'.tr,
'修改姓名'.tr, () {
state.changeNameController, '修改姓名'.tr, '修改姓名'.tr, () {
if (state.changeNameController.text.isEmpty) {
logic.showToast('请输入姓名'.tr);
return;
@ -178,7 +175,7 @@ class _FaceDetailPageState extends State<FaceDetailPage> with RouteAware {
Visibility(
visible: !F.isSKY,
child: Obx(
() => CommonItem(
() => CommonItem(
leftTitel: '是否为管理员'.tr,
rightTitle: '',
isTipsImg: false,
@ -215,8 +212,7 @@ class _FaceDetailPageState extends State<FaceDetailPage> with RouteAware {
left: 30.w, right: 30.w, top: 30.w, bottom: 30.w),
padding: EdgeInsets.only(top: 25.w, bottom: 25.w),
onClick: () async {
final bool isNetWork =
await LockMainLogic.to()?.judgeTheNetwork() ?? false;
final bool isNetWork = await logic.isConnected();
if (!isNetWork) {
return;
}

3
lib/main/lockDetail/fingerprint/fingerprintDetail/fingerprintDetail_page.dart
View File

@ -222,8 +222,7 @@ class _FingerprintDetailPageState extends State<FingerprintDetailPage>
left: 30.w, right: 30.w, top: 30.w, bottom: 30.w),
padding: EdgeInsets.only(top: 25.w, bottom: 25.w),
onClick: () async {
final bool isNetWork =
await LockMainLogic.to()?.judgeTheNetwork() ?? false;
final bool isNetWork = await logic.isConnected();
if (!isNetWork) {
return;
}

10
lib/tools/baseGetXController.dart
View File

@ -1,6 +1,7 @@
import 'dart:async';
import 'dart:io';
import 'package:connectivity_plus/connectivity_plus.dart';
import 'package:flutter/material.dart';
import 'package:flutter_easyloading/flutter_easyloading.dart';
import 'package:get/get.dart';
@ -175,6 +176,13 @@ class BaseGetXController extends GetxController {
});
}
/// 判断网络是否连接
Future<bool> isConnected() async {
final List<ConnectivityResult> connectResults =
await Connectivity().checkConnectivity();
return !connectResults.contains(ConnectivityResult.none);
}
String getUseKeyTypeStr(int? startDate, int? endDate, int? keyType) {
String useDateStr = '';
if (keyType == XSConstantMacro.keyTypeTime) {
@ -241,6 +249,8 @@ class BaseGetXController extends GetxController {
}
return result;
}
}
///Extension_Int