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

1、修改添加卡界面，左右滑动概率类型选择不成功问题。2、修改开锁、关锁bit位问题

Browse Source
This commit is contained in:
魏少阳 2024-04-25 09:41:07 +08:00
parent 92d5a3b473
commit 1d160c9581
10 changed files with 186 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
star_lock/lib/appRouters.dart
View File

@ -56,7 +56,6 @@ import 'login/forgetPassword/starLock_forgetPassword_page.dart';
import 'login/login/starLock_login_page.dart';
import 'login/register/starLock_register_page.dart';
import 'login/selectCountryRegion/selectCountryRegion_page.dart';
import 'main/lockDetail/card/addCardType/addCardManage/addCardTypeManage_page.dart';
import 'main/lockDetail/card/addCardType/addCardType_page.dart';
import 'main/lockDetail/card/addICCard/addICCard_page.dart';
import 'main/lockDetail/card/cardDetail/cardDetail_page.dart';
@ -80,7 +79,7 @@ import 'main/lockDetail/face/addFace/addFace_page.dart';
import 'main/lockDetail/face/addFaceType/addFaceTypeManage/addFaceTypeManage_page.dart';
import 'main/lockDetail/face/faceList/faceList_page.dart';
import 'main/lockDetail/fingerprint/addFingerprint/addFingerprint_page.dart';
import 'main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintManage/addFingerprintTypeManage_page.dart';
import 'main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintType_page.dart';
import 'main/lockDetail/fingerprint/addFingerprintTip/addFingerprintTip_page.dart';
import 'main/lockDetail/fingerprint/fingerprintDetail/fingerprintDetail_page.dart';
import 'main/lockDetail/fingerprint/fingerprintList/fingerprintList_page.dart';
@ -421,8 +420,7 @@ abstract class Routers {
static const addCardPage = '/AddCardPage'; // 添加卡
static const cardDetailPage = '/CardDetailPage'; // 卡详情
static const fingerprintListPage = '/FingerprintListPage'; // 指纹列表
static const addFingerprintTypeManagePage =
'/AddFingerprintTypeManagePage'; // 添加指纹
static const addFingerprintTypePage = '/AddFingerprintTypePage'; // 添加指纹
static const fingerprintDetailPage = '/FingerprintDetailPage'; // 指纹详情
static const faceListPage = '/FaceListPage'; // 人脸列表
static const addFaceTypeManagePage = '/AddFaceTypeManagePage'; // 添加人脸
@ -1022,8 +1020,8 @@ abstract class AppRouters {
name: Routers.fingerprintListPage,
page: () => const FingerprintListPage()),
GetPage(
name: Routers.addFingerprintTypeManagePage,
page: () => const AddFingerprintTypeManagePage()),
name: Routers.addFingerprintTypePage,
page: () => const AddFingerprintTypePage()),
GetPage(
name: Routers.fingerprintDetailPage,
page: () => const FingerprintDetailPage()),

2
star_lock/lib/main/lockDetail/card/addICCard/addICCard_logic.dart
View File

@ -105,7 +105,7 @@ class AddICCardLogic extends BaseGetXController{
Future<void> _replyAddICCardConfirmation(Reply reply) async {
int status = reply.data[2];
Get.log("_replyAddFingerprintstatus:$status");
Get.log("_replyAddCardtatus:$status");
switch(status){
case 0x00:

2
star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_page.dart
View File

@ -169,7 +169,7 @@ class _CheckingInAddStaffPageState extends State<CheckingInAddStaffPage> {
}
var data = await Get.toNamed(
Routers.addFingerprintTypeManagePage,
Routers.addFingerprintTypePage,
arguments: {
"lockId": state.getKeyInfosData.value.lockId,
"fromType": 2, // 1从添加钥匙列表进入 2从考勤添加员工入口进入

4
star_lock/lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintManage/addFingerprintTypeManage_tabbar.dart
View File

@ -101,8 +101,8 @@ class _AddFingerprintTypeManageTabbarState extends State<AddFingerprintTypeManag
controller: _tabController,
children:
widget.fromType == 1
? _itemTabs.map((ItemView item) => AddFingerprintTypePage(selectType: item.selectType, lockId: widget.lockId, fromType: widget.fromType, fromTypeTwoStaffName:widget.fromTypeTwoStaffName)).toList()
:_itemTabs.map((ItemView item) => AddFingerprintTypePage(selectType: item.selectType, lockId: widget.lockId, fromType: widget.fromType, fromTypeTwoStaffName:widget.fromTypeTwoStaffName)).toList(),
? _itemTabs.map((ItemView item) => const AddFingerprintTypePage()).toList()
:_itemTabs.map((ItemView item) => const AddFingerprintTypePage()).toList(),
),
);
}

11
star_lock/lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintType_logic.dart
View File

@ -24,8 +24,8 @@ class AddFingerprintTypeLogic extends BaseGetXController{
endTime = "0";
} else if (state.selectType.value == "1") {
fingerprintType = 2;
startDate = DateTool().dateToTimestamp(state.beginTime.value, 1).toString();
endDate = DateTool().dateToTimestamp(state.endTime.value, 1).toString();
startDate = DateTool().dateToTimestamp(state.timeLimitBeginTime.value, 1).toString();
endDate = DateTool().dateToTimestamp(state.timeLimitEndTime.value, 1).toString();
startTime = "0";
endTime = "0";
@ -48,17 +48,16 @@ class AddFingerprintTypeLogic extends BaseGetXController{
return;
}
} else if (state.selectType.value == "2") {
if (state.beginTime.value.isEmpty) {
if (state.cycleBeginTime.value.isEmpty) {
showToast("请选择有效期".tr);
return;
}
startDate = DateTool().dateToTimestamp(state.beginTime.value, 1).toString();
endDate = DateTool().dateToTimestamp(state.endTime.value, 1).toString();
startDate = DateTool().dateToTimestamp(state.cycleBeginTime.value, 1).toString();
endDate = DateTool().dateToTimestamp(state.cycleEndTime.value, 1).toString();
startTime = DateTool().dateToTimestamp(state.effectiveDateTime.value, 0).toString();
endTime = DateTool().dateToTimestamp(state.failureDateTime.value, 0).toString();
fingerprintType = 4;
}
// var isCoerced = state.isStressFingerprint.value == false ? "1" : "2"; // 1:非胁迫指纹 2:胁迫指纹
// Get.log("addOtherType startDate:$startDate endDate:$endDate isCoerced:$isCoerced");

216
star_lock/lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintType_page.dart
View File

@ -8,32 +8,23 @@ import 'package:star_lock/tools/pickers/time_picker/model/date_mode.dart';
import '../../../../appRouters.dart';
import '../../../../app_settings/app_colors.dart';
import '../../../../tools/CustomUnderlineTabIndicator.dart';
import '../../../../tools/commonItem.dart';
import '../../../../tools/dateTool.dart';
import '../../../../tools/storage.dart';
import '../../../../tools/submitBtn.dart';
import '../../../../tools/titleAppBar.dart';
import '../../../../translations/trans_lib.dart';
import 'addFingerprintType_logic.dart';
class AddFingerprintTypePage extends StatefulWidget {
final String selectType; // 永久限时循环下标
final int lockId;
final int fromType; // // 1从添加钥匙列表进入 2从考勤添加员工入口进入
final String fromTypeTwoStaffName; // 从添加员工进入 传入员工名字
const AddFingerprintTypePage(
{Key? key,
required this.selectType,
required this.lockId,
required this.fromType,
required this.fromTypeTwoStaffName})
: super(key: key);
const AddFingerprintTypePage({Key? key}) : super(key: key);
@override
State<AddFingerprintTypePage> createState() => _AddFingerprintTypePageState();
}
class _AddFingerprintTypePageState extends State<AddFingerprintTypePage> {
class _AddFingerprintTypePageState extends State<AddFingerprintTypePage> with SingleTickerProviderStateMixin{
final logic = Get.put(AddFingerprintTypeLogic());
final state = Get.find<AddFingerprintTypeLogic>().state;
@ -42,33 +33,41 @@ class _AddFingerprintTypePageState extends State<AddFingerprintTypePage> {
// TODO: implement initState
super.initState();
WidgetsBinding.instance.addPostFrameCallback((_) {
if(state.selectType.value == "1"){
state.beginTime.value = DateTool().dateToYMDHNString(DateTime.now().millisecondsSinceEpoch.toString()); //默认为当前时间
state.endTime.value = DateTool().dateToYMDHNString(DateTime.now().millisecondsSinceEpoch.toString());//默认为当前时间
}else{
state.beginTime.value = ""; //默认为当前时间
state.endTime.value = "";//默认为当前时间
state.tabController = TabController(
vsync: this,
length: state.fromType.value == 1 ? _itemTabs.length : _fromCheckInTypeItemTabs.length,
initialIndex: 0);
state.tabController.addListener(() {
WidgetsBinding.instance.addPostFrameCallback((_) {
state.selectType.value = state.tabController.index.toString();
});
if (state.tabController.animation!.value == state.tabController.index) {
FocusScope.of(context).requestFocus(FocusNode());
}
});
}
@override
Widget build(BuildContext context) {
state.selectType.value = widget.selectType;
state.lockId.value = widget.lockId;
if(widget.fromTypeTwoStaffName.isNotEmpty){
state.nameController.text = widget.fromTypeTwoStaffName;
}
state.fromType.value = widget.fromType;
return SingleChildScrollView(
child: indexChangeWidget()
return Scaffold(
backgroundColor: AppColors.mainBackgroundColor,
appBar: TitleAppBar(
barTitle:
"${TranslationLoader.lanKeys!.addTip!.tr}${TranslationLoader.lanKeys!.fingerprint!.tr}",
haveBack: true,
backgroundColor: AppColors.mainColor),
body: Column(
children: [
_tabBar(),
_pageWidget(),
],
),
);
}
Widget indexChangeWidget() {
switch (int.parse(widget.selectType)) {
switch (int.parse(state.selectType.value)) {
case 0:
{
// 永久
@ -139,22 +138,24 @@ class _AddFingerprintTypePageState extends State<AddFingerprintTypePage> {
children: [
Obx(() => CommonItem(
leftTitel: TranslationLoader.lanKeys!.effectiveTime!.tr,
rightTitle: state.beginTime.value,
rightTitle: state.timeLimitBeginTime.value,
isHaveLine: true,
isHaveDirection: true,
action: () async {
Pickers.showDatePicker(context, mode: DateMode.YMDHM, onConfirm: (p) {
state.beginTime.value = DateTool().getYMDHNDateString(p, 1);
});
Pickers.showDatePicker(context, mode: DateMode.YMDHM,
onConfirm: (p) {
state.timeLimitBeginTime.value = DateTool().getYMDHNDateString(p, 1);
});
})),
Obx(() => CommonItem(
leftTitel: TranslationLoader.lanKeys!.failureTime!.tr,
rightTitle: state.endTime.value,
rightTitle: state.timeLimitEndTime.value,
isHaveDirection: true,
action: () {
Pickers.showDatePicker(context, mode: DateMode.YMDHM, onConfirm: (p) {
state.endTime.value = DateTool().getYMDHNDateString(p, 1);
});
Pickers.showDatePicker(context, mode: DateMode.YMDHM,
onConfirm: (p) {
state.timeLimitEndTime.value = DateTool().getYMDHNDateString(p, 1);
});
})),
Container(height: 10.h),
],
@ -162,30 +163,28 @@ class _AddFingerprintTypePageState extends State<AddFingerprintTypePage> {
}
// 循环顶部选择日期
Widget keyCyclicDate(){
Widget keyCyclicDate() {
return Column(
children: [
Obx(() => CommonItem(
leftTitel: TranslationLoader.lanKeys!.periodValidity!.tr,
rightTitle: "${state.beginTime.value}\n${state.endTime.value}",
rightTitle:"${state.cycleBeginTime.value}\n${state.cycleEndTime.value}",
isHaveDirection: true,
isHaveLine: true,
action: () async {
var result = await Get.toNamed(Routers.seletKeyCyclicDatePage,
arguments: {
'validityValue': state.weekdaysList.value,
'starDate': state.beginTime.value,
'endDate': state.endTime.value,
'starTime': state.effectiveDateTime.value,
'endTime': state.failureDateTime.value
});
if(result != null && result.isNotEmpty){
var result = await Get.toNamed(Routers.seletKeyCyclicDatePage, arguments: {
'validityValue': state.weekdaysList.value,
'starDate': state.cycleBeginTime.value,
'endDate': state.cycleEndTime.value,
'starTime': state.effectiveDateTime.value,
'endTime': state.failureDateTime.value
});
if (result != null && result.isNotEmpty) {
state.weekdaysList.value = result['validityValue'];
state.beginTime.value = result['starDate'];
state.endTime.value = result['endDate'];
state.cycleBeginTime.value = result['starDate'];
state.cycleEndTime.value = result['endDate'];
state.effectiveDateTime.value = result['starTime'];
state.failureDateTime.value = result['endTime'];
Get.log('得到的有效期数据:${state.weekdaysList.value} == ${state.beginTime.value} == ${state.endTime.value}== ${state.effectiveDateTime.value} == ${state.failureDateTime.value}');
}
})),
Obx(() => Visibility(
@ -196,23 +195,21 @@ class _AddFingerprintTypePageState extends State<AddFingerprintTypePage> {
isHaveDirection: true,
isHaveLine: true,
action: () async {
var result = await Get.toNamed(Routers.seletKeyCyclicDatePage,
arguments: {
'validityValue': state.weekdaysList.value,
'starDate': state.beginTime.value,
'endDate': state.endTime.value,
'starTime': state.effectiveDateTime.value,
'endTime': state.failureDateTime.value
});
if(result != null && result.isNotEmpty){
var result = await Get.toNamed(Routers.seletKeyCyclicDatePage, arguments: {
'validityValue': state.weekdaysList.value,
'starDate': state.cycleBeginTime.value,
'endDate': state.cycleEndTime.value,
'starTime': state.effectiveDateTime.value,
'endTime': state.failureDateTime.value
});
if (result != null && result.isNotEmpty) {
state.weekdaysList.value = result['validityValue'];
state.beginTime.value = result['starDate'];
state.endTime.value = result['endDate'];
state.cycleBeginTime.value = result['starDate'];
state.cycleEndTime.value = result['endDate'];
state.effectiveDateTime.value = result['starTime'];
state.failureDateTime.value = result['endTime'];
}
})
)),
}))),
Obx(() => Visibility(
visible: state.effectiveDateTime.value.isNotEmpty,
child: CommonItem(
@ -220,24 +217,21 @@ class _AddFingerprintTypePageState extends State<AddFingerprintTypePage> {
rightTitle: "${state.effectiveDateTime.value}-${state.failureDateTime.value}",
isHaveDirection: true,
action: () async {
var result = await Get.toNamed(Routers.seletKeyCyclicDatePage,
arguments: {
'validityValue': state.weekdaysList.value,
'starDate': state.beginTime.value,
'endDate': state.endTime.value,
'starTime': state.effectiveDateTime.value,
'endTime': state.failureDateTime.value
});
if(result != null && result.isNotEmpty){
var result = await Get.toNamed(Routers.seletKeyCyclicDatePage, arguments: {
'validityValue': state.weekdaysList.value,
'starDate': state.cycleBeginTime.value,
'endDate': state.cycleEndTime.value,
'starTime': state.effectiveDateTime.value,
'endTime': state.failureDateTime.value
});
if (result != null && result.isNotEmpty) {
state.weekdaysList.value = result['validityValue'];
state.beginTime.value = result['starDate'];
state.endTime.value = result['endDate'];
state.cycleBeginTime.value = result['starDate'];
state.cycleEndTime.value = result['endDate'];
state.effectiveDateTime.value = result['starTime'];
state.failureDateTime.value = result['endTime'];
Get.back(result: result);
}
})
)),
}))),
],
);
}
@ -435,4 +429,68 @@ class _AddFingerprintTypePageState extends State<AddFingerprintTypePage> {
);
}
final List<ItemView> _itemTabs = <ItemView>[
ItemView(title: TranslationLoader.lanKeys!.permanent!.tr, selectType: "0"),
ItemView(title: TranslationLoader.lanKeys!.timeLimit!.tr, selectType: "1"),
ItemView(title: TranslationLoader.lanKeys!.circulation!.tr, selectType: "2"),
];
final List<ItemView> _fromCheckInTypeItemTabs = <ItemView>[
ItemView(title: TranslationLoader.lanKeys!.permanent!.tr, selectType: "0"),
ItemView(title: TranslationLoader.lanKeys!.timeLimit!.tr, selectType: "1"),
];
TabBar _tabBar() {
return TabBar(
controller: state.tabController,
onTap: (index) {
FocusScope.of(context).requestFocus(FocusNode());
},
tabs: state.fromType.value == 1 ? _itemTabs.map((ItemView item) => _tab(item)).toList() : _fromCheckInTypeItemTabs.map((ItemView item) => _tab(item)).toList(),
isScrollable: true,
indicatorColor: Colors.red,
unselectedLabelColor: Colors.black,
unselectedLabelStyle: TextStyle(
color: AppColors.mainColor,
fontSize: 24.sp,
),
automaticIndicatorColorAdjustment: true,
labelColor: AppColors.mainColor,
labelStyle: TextStyle(
color: AppColors.mainColor,
fontSize: 24.sp,
fontWeight: FontWeight.w600),
indicator: CustomUnderlineTabIndicator(
borderSide: BorderSide(color: AppColors.mainColor, width: 4.w),
strokeCap: StrokeCap.round,
width: 30.w),
);
}
Tab _tab(ItemView item) {
return Tab(
child: SizedBox(
width: 1.sw / 5,
child: Text(item.title, textAlign: TextAlign.center)));
}
Widget _pageWidget() {
return Expanded(
child: TabBarView(
controller: state.tabController,
children:
state.fromType.value == 1
? _itemTabs.map((ItemView item) => Obx(() => indexChangeWidget())).toList()
: _fromCheckInTypeItemTabs.map((ItemView item) => Obx(() => indexChangeWidget())).toList(),
),
);
}
}
class ItemView {
const ItemView({required this.title, required this.selectType});
final String title;
final String selectType;
}

20
star_lock/lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintType_state.dart
View File

@ -2,6 +2,8 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import '../../../../tools/dateTool.dart';
class AddFingerprintState{
final lockId = 0.obs;
final selectType = "0".obs;// 0永久 1显示 2循环
@ -9,16 +11,24 @@ class AddFingerprintState{
final isStressFingerprint = false.obs;
final isAdministrator = false.obs;// 是否是管理员
var beginTime = "".obs;// 开始时间
var endTime = "".obs;// 结束时间
var timeLimitBeginTime = DateTool().dateToYMDHNString(DateTime.now().millisecondsSinceEpoch.toString()).obs;// 限时开始时间
var timeLimitEndTime = DateTool().dateToYMDHNString(DateTime.now().millisecondsSinceEpoch.toString()).obs;// 限时结束时间
var cycleBeginTime = "".obs;// 循环开始时间
var cycleEndTime = "".obs;// 循环结束时间
var effectiveDateTime = "".obs;// 生效时间
var failureDateTime = "".obs;// 失效时间
var weekdaysList = [].obs;
var fromTypeTwoStaffName = "".obs; // 从添加员工进入 传入员工名字
final TextEditingController nameController = TextEditingController();
late TabController tabController;
AddFingerprintState() {
// Map map = Get.arguments;
// lockId.value = map["lockId"];
// fromType.value = map["fromType"];
Map map = Get.arguments;
lockId.value = map["lockId"];
fromType.value = map["fromType"];
// 1从添加钥匙列表进入 2从考勤添加员工入口进入
if(fromType.value == 2){
fromTypeTwoStaffName.value = map["fromTypeTwoStaffName"]; // 从添加员工进入 传入员工名字
}
}
}

2
star_lock/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_page.dart
View File

@ -108,7 +108,7 @@ class _FingerprintListPageState extends State<FingerprintListPage> with RouteAwa
btnName: '${TranslationLoader.lanKeys!.add!.tr}${TranslationLoader.lanKeys!.fingerprint!.tr}',
onClick: () async {
var data =
await Get.toNamed(Routers.addFingerprintTypeManagePage, arguments: {
await Get.toNamed(Routers.addFingerprintTypePage, arguments: {
"lockId": state.lockId.value,
"fromType": 1 // 1从添加钥匙列表进入 2从考勤添加员工入口进入
});

41
star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart
View File

@ -50,8 +50,9 @@ class _LockDetailPageState extends State<LockDetailPage>
// TODO: implement initState
super.initState();
print("openDoor：${DateTool().accordingTheCycleIntoTheCorrespondingNumber([5])}");
print("onLine：${DateTool().accordingTheCycleIntoTheCorrespondingNumber([1])}");
// print("openDoor：${DateTool().accordingTheCycleIntoTheCorrespondingNumber([5])}");
// print("onLine：${DateTool().accordingTheCycleIntoTheCorrespondingNumber([1])}");
// print("onLine openDoor：${DateTool().accordingTheCycleIntoTheCorrespondingNumber([5, 1])}");
// logic.startScanAction();
listeningAnimations();
@ -1225,20 +1226,15 @@ class _LockDetailPageState extends State<LockDetailPage>
state.openLockBtnState.value = 1;
// state.animationController!.forward();
// if (state.lockUserNo == 0) {
// // 电子钥匙lockUserNo为0 要先添加用户
// logic.addUserConnectBlue();
// } else {
// print("state.isOpenLockNeedOnline.value:${state.isOpenLockNeedOnline.value}");
if (state.isOpenLockNeedOnline.value == 0) {
// 不需要联网
logic.openDoorAction();
} else {
// 需要联网
logic.getLockNetToken();
}
// }
// });
if (state.isOpenLockNeedOnline.value == 0) {
// 不需要联网
state.openDoorModel = 0;
logic.openDoorAction();
} else {
// 需要联网
state.openDoorModel = 2;
logic.getLockNetToken();
}
}
startUnLock() {
@ -1249,15 +1245,16 @@ class _LockDetailPageState extends State<LockDetailPage>
state.iSClosedUnlockSuccessfulPopup.value = false;
state.openLockBtnState.value = 1;
state.animationController!.forward();
state.openDoorModel = 32;
// if (state.lockUserNo == 0) {
// // 电子钥匙lockUserNo为0 要先添加用户
// logic.addUserConnectBlue();
// } else {
if (state.isOpenLockNeedOnline.value == 0) {
// 不需要联网
state.openDoorModel = 32;
logic.openDoorAction();
// }
} else {
// 需要联网
state.openDoorModel = 34;
logic.getLockNetToken();
}
}
@override

2
star_lock/lib/main/lockDetail/lockDetail/lockDetail_state.dart
View File

@ -34,7 +34,7 @@ class LockDetailState {
var bottomBtnisEable = true.obs; // 是否不可用 用于限制底部按钮是否可用
var openDoorBtnisUneable = true.obs; // 当钥匙状态不能使用的情况下开锁按钮禁止使用,默认可用
var openDoorModel = 0;
var openDoorModel = 0;// 离线开门0, 在线开门2 离线关门32 在线关门34
//过渡动画控制器
AnimationController? animationController;