1、修改开锁页-开锁键-蓝牙开锁成功后有英文弹框

2、修改卡、指纹、人脸-详情、遥控、掌静脉修改姓名 为空,弹框黑无内容问题
3、修改操作记录bug
This commit is contained in:
魏少阳 2024-09-27 10:15:24 +08:00
parent 146944f334
commit f082212f92
8 changed files with 21 additions and 9 deletions

View File

@ -50,7 +50,7 @@ class _CardDetailPageState extends State<CardDetailPage> with RouteAware {
ShowTipView().showTFViewAlertDialog(
state.changeNameController,
'请输入姓名'.tr,
'', () {
'请输入姓名'.tr, () {
if (state.changeNameController.text.isEmpty) {
logic.showToast('请输入姓名'.tr);
return;

View File

@ -25,7 +25,6 @@ class DoorLockLogLogic extends BaseGetXController {
//
late StreamSubscription<Reply> _replySubscription;
void _initReplySubscription() {
_replySubscription =
EventBusManager().eventBus!.on<Reply>().listen((Reply reply) {
@ -77,8 +76,10 @@ class DoorLockLogLogic extends BaseGetXController {
(0xff & indexList[5]) << 8 |
(0xFF & indexList[6]);
final operateDate = time * 1000;
final serverTime = state.currentDate;
if (DateTime.fromMillisecondsSinceEpoch(operateDate).isAfter(
DateTime.fromMillisecondsSinceEpoch(state.currentDate))) {
DateTime.fromMillisecondsSinceEpoch(serverTime*1000))) {
// AppLog.log('operateDate:$operateDate state.currentDate:${state.currentDate}');
continue;
}
indexMap['date'] = '$operateDate';
@ -213,6 +214,7 @@ class DoorLockLogLogic extends BaseGetXController {
//
Future<void> lockRecordUploadData(List list) async {
AppLog.log('上传数据:$list');
//
if(list.isEmpty){
return;
@ -251,7 +253,7 @@ class DoorLockLogLogic extends BaseGetXController {
if (isDemoMode == false) {
// _initReplySubscription();
mockNetworkDataRequest(isRefresh: true);
// mockNetworkDataRequest(isRefresh: true);
_getDoorLockLogListRefreshUIAction();
}
}

View File

@ -50,7 +50,7 @@ class _FaceDetailPageState extends State<FaceDetailPage> with RouteAware {
ShowTipView().showTFViewAlertDialog(
state.changeNameController,
'修改姓名'.tr,
'', () {
'修改姓名'.tr, () {
if (state.changeNameController.text.isEmpty) {
logic.showToast('请输入姓名'.tr);
return;

View File

@ -50,7 +50,7 @@ class _FingerprintDetailPageState extends State<FingerprintDetailPage>
ShowTipView().showTFViewAlertDialog(
state.changeNameController,
'修改姓名'.tr,
'', () {
'修改姓名'.tr, () {
if (state.changeNameController.text.isEmpty) {
logic.showToast('请输入姓名'.tr);
return;

View File

@ -489,6 +489,9 @@ class LockDetailLogic extends BaseGetXController {
//
Future<void> lockRecordUploadData(List list) async {
if(list.isEmpty){
return;
}
final KeyOperationRecordEntity entity = await ApiRepository.to
.lockRecordUploadData(
lockId: state.keyInfos.value.lockId.toString(), records: list);

View File

@ -74,8 +74,9 @@ class LockOperatingRecordLogic extends BaseGetXController {
(0xff & indexList[5]) << 8 |
(0xFF & indexList[6]);
final operateDate = time * 1000;
final serverTime = state.currentDate;
if (DateTime.fromMillisecondsSinceEpoch(operateDate).isAfter(
DateTime.fromMillisecondsSinceEpoch(state.currentDate))) {
DateTime.fromMillisecondsSinceEpoch(serverTime*1000))) {
continue;
}
indexMap['date'] = '$operateDate';
@ -192,6 +193,9 @@ class LockOperatingRecordLogic extends BaseGetXController {
//
Future<void> lockRecordUploadData(List list) async {
if(list.isEmpty){
return;
}
final KeyOperationRecordEntity entity = await ApiRepository.to
.lockRecordUploadData(
lockId: CommonDataManage().currentKeyInfo.lockId.toString(),

View File

@ -46,7 +46,10 @@ class _LockSelectGroupingPageState extends State<LockSelectGroupingPage> {
padding: EdgeInsets.only(top: 25.w, bottom: 25.w),
onClick: () {
// showCupertinoAlertDialog(context);
ShowTipView().showTFViewAlertDialog(state.changeNameController, TranslationLoader.lanKeys!.createNewGroup!.tr, '请输入分组名称'.tr, (){
ShowTipView().showTFViewAlertDialog(
state.changeNameController,
TranslationLoader.lanKeys!.createNewGroup!.tr,
'请输入分组名称'.tr, (){
logic.addLockGroupRequest();
Get.back();
}, isShowSuffixIcon:true, inputFormatters: <TextInputFormatter>[

View File

@ -46,7 +46,7 @@ class _RemoteControlDetailPageState extends State<RemoteControlDetailPage> with
isHaveDirection: false,
isHaveLine: true)),
Obx(() => lockDataListItem('姓名'.tr, state.typeName.value, () {
ShowTipView().showTFViewAlertDialog(state.changeNameController, '修改姓名'.tr, '', () {
ShowTipView().showTFViewAlertDialog(state.changeNameController, '修改姓名'.tr, '修改姓名'.tr, () {
if (state.changeNameController.text.isEmpty) {
logic.showToast('请输入姓名'.tr);
return;