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

Merge branch 'master' of https://gitee.com/weishaoyang/star_lock

Browse Source
This commit is contained in:
魏少阳 2023-10-20 14:25:09 +08:00
commit 169e28992c
6 changed files with 203 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
star_lock/lib/main/lockDetail/authorizedAdmin/volumeAuthorizationLock/volumeAuthorizationLock_page.dart
View File

@ -285,10 +285,14 @@ class _VolumeAuthorizationLockPageState
alignment: Alignment.center, alignment: Alignment.center,
child: InkWell( child: InkWell(
onTap: () async { onTap: () async {
Contact? contact = await _contactPicker.selectContact(); Contact? currentContact =
await _contactPicker.selectContact();
setState(() { setState(() {
_contact = contact!; if (currentContact!.phoneNumbers!.isNotEmpty) {
// print("object111111111111 ${_contact.fullName} ${_contact.phoneNumbers}"); _emailOrPhoneController.text = currentContact
.phoneNumbers![0]
.replaceAll(RegExp(r"\s+\b|\b\s"), "");
}
}); });
}, },
), ),

10
star_lock/lib/mine/mineSet/addAuthorizedAdministrator/addAuthorizedAdministrator_page.dart
View File

@ -335,10 +335,14 @@ class _AddAuthorizedAdministratorPageState
alignment: Alignment.center, alignment: Alignment.center,
child: InkWell( child: InkWell(
onTap: () async { onTap: () async {
Contact? contact = await _contactPicker.selectContact(); Contact? currentContact =
await _contactPicker.selectContact();
setState(() { setState(() {
_contact = contact!; if (currentContact!.phoneNumbers!.isNotEmpty) {
// print("object111111111111 ${_contact.fullName} ${_contact.phoneNumbers}"); _emailOrPhoneController.text = currentContact
.phoneNumbers![0]
.replaceAll(RegExp(r"\s+\b|\b\s"), "");
}
}); });
}, },
), ),

109
star_lock/lib/mine/mineSet/lockGroup/groupAddLock_page.dart Normal file
View File

@ -0,0 +1,109 @@
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import 'package:star_lock/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendLockGroupListEntity.dart';
import 'package:star_lock/tools/noData.dart';
import 'package:star_lock/tools/submitBtn.dart';
import '../../../../../app_settings/app_colors.dart';
import '../../../../../tools/titleAppBar.dart';
import '../../../../../translations/trans_lib.dart';
class GroupAddLockPage extends StatefulWidget {
const GroupAddLockPage({Key? key}) : super(key: key);
@override
State<GroupAddLockPage> createState() => _GroupAddLockPageState();
}
class _GroupAddLockPageState extends State<GroupAddLockPage> {
List<LockListItem> lockList = [];
@override
Widget build(BuildContext context) {
dynamic obj = ModalRoute.of(context)?.settings.arguments;
if (obj != null && (obj["lockList"] != null)) {
lockList = obj["lockList"];
}
return Scaffold(
backgroundColor: AppColors.mainBackgroundColor,
appBar: TitleAppBar(
barTitle: TranslationLoader.lanKeys!.lock!.tr,
haveBack: true,
actionsList: [
IconButton(
icon: Image.asset(
'images/icon_bar_more.png',
height: 30.h,
width: 10.w,
),
onPressed: () {
// 处理操作按钮的点击事件-添加锁分组
},
),
],
backgroundColor: AppColors.mainColor),
body: lockList.isNotEmpty
? ListView.separated(
itemBuilder: (context, index) {
LockListItem itemData = lockList[index];
return _listItemView(itemData);
},
itemCount: lockList.length,
separatorBuilder: (BuildContext context, int index) {
return Divider(
height: 1.h,
color: AppColors.greyLineColor,
);
},
)
: Stack(
alignment: Alignment.center,
children: [
Positioned(
bottom: 350.h,
left: (ScreenUtil().screenWidth - 200.w) / 2,
width: 200.w,
child: SubmitBtn(
btnName: '添加',
onClick: () {
//选择要添加到分组的锁
},
)),
const NoData(),
],
));
}
Widget _listItemView(LockListItem itemData) {
return GestureDetector(
child: Container(
color: Colors.white,
height: 80.h,
child: Row(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
SizedBox(
width: 20.w,
),
Image.asset(
'images/icon_lockGroup_item.png',
width: 36,
height: 36,
fit: BoxFit.fill,
),
SizedBox(
width: 10.w,
),
Text(
itemData.lockAlias ?? '',
style: TextStyle(fontSize: 24.sp),
)
],
),
),
onTap: () {},
);
}
}

79
star_lock/lib/mine/mineSet/lockGroup/lockItemList_page.dart
View File

@ -3,6 +3,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:star_lock/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendLockGroupListEntity.dart'; import 'package:star_lock/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendLockGroupListEntity.dart';
import 'package:star_lock/tools/noData.dart'; import 'package:star_lock/tools/noData.dart';
import 'package:star_lock/tools/submitBtn.dart';
import '../../../../../app_settings/app_colors.dart'; import '../../../../../app_settings/app_colors.dart';
import '../../../../../tools/titleAppBar.dart'; import '../../../../../tools/titleAppBar.dart';
@ -25,39 +26,53 @@ class _LockItemListPageState extends State<LockItemListPage> {
} }
return Scaffold( return Scaffold(
backgroundColor: AppColors.mainBackgroundColor, backgroundColor: AppColors.mainBackgroundColor,
appBar: TitleAppBar( appBar: TitleAppBar(
barTitle: TranslationLoader.lanKeys!.lock!.tr, barTitle: TranslationLoader.lanKeys!.lock!.tr,
haveBack: true, haveBack: true,
actionsList: [ actionsList: [
IconButton( IconButton(
icon: Image.asset( icon: Image.asset(
'images/icon_bar_more.png', 'images/icon_bar_more.png',
height: 30.h, height: 30.h,
width: 10.w, width: 10.w,
),
onPressed: () {
// 处理操作按钮的点击事件-添加锁分组
},
), ),
onPressed: () { ],
// 处理操作按钮的点击事件-添加锁分组 backgroundColor: AppColors.mainColor),
}, body: lockList.isNotEmpty
), ? ListView.separated(
], itemBuilder: (context, index) {
backgroundColor: AppColors.mainColor), LockListItem itemData = lockList[index];
body: lockList.isNotEmpty return _listItemView(itemData);
? ListView.separated( },
itemBuilder: (context, index) { itemCount: lockList.length,
LockListItem itemData = lockList[index]; separatorBuilder: (BuildContext context, int index) {
return _listItemView(itemData); return Divider(
}, height: 1.h,
itemCount: lockList.length, color: AppColors.greyLineColor,
separatorBuilder: (BuildContext context, int index) { );
return Divider( },
height: 1.h, )
color: AppColors.greyLineColor, : Stack(
); alignment: Alignment.center,
}, children: [
) Positioned(
: const NoData(), bottom: 350.h,
); left: (ScreenUtil().screenWidth - 200.w) / 2,
width: 200.w,
child: SubmitBtn(
btnName: '添加',
onClick: () {
//选择要添加到分组的锁
},
)),
const NoData(),
],
));
} }
Widget _listItemView(LockListItem itemData) { Widget _listItemView(LockListItem itemData) {

4
star_lock/lib/mine/valueAddedServices/valueAddedServicesHighFunction/valueAddedServicesHighFunction_page.dart
View File

@ -156,6 +156,10 @@ class _ValueAddedServicesHighFunctionPageState
TranslationLoader.lanKeys!.markedHouseState!.tr), TranslationLoader.lanKeys!.markedHouseState!.tr),
_buildItem("images/mine/icon_mine_highFunctionContent_fkgj.png", _buildItem("images/mine/icon_mine_highFunctionContent_fkgj.png",
TranslationLoader.lanKeys!.cardIssuingtool!.tr), TranslationLoader.lanKeys!.cardIssuingtool!.tr),
_buildItem(
"images/mine/icon_mine_highFunctionContent_fkgj.png", '推送'),
_buildItem(
"images/mine/icon_mine_highFunctionContent_fkgj.png", '考勤'),
], ],
), ),
), ),

58
star_lock/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_page.dart
View File

@ -28,20 +28,20 @@ class _ValueAddedServicesPageListState
backgroundColor: AppColors.mainColor), backgroundColor: AppColors.mainColor),
body: ListView( body: ListView(
children: [ children: [
_valueAddedServicesItem( // _valueAddedServicesItem(
Image.asset('images/mine/icon_mine_valueAddedServices_note.png'), // Image.asset('images/mine/icon_mine_valueAddedServices_note.png'),
TranslationLoader.lanKeys!.note!.tr, () { // TranslationLoader.lanKeys!.note!.tr, () {
Navigator.pushNamed( // Navigator.pushNamed(
context, Routers.valueAddedServicesNoteAndEmailDetailPage, // context, Routers.valueAddedServicesNoteAndEmailDetailPage,
arguments: 1); // arguments: 1);
}), // }),
_valueAddedServicesItem( // _valueAddedServicesItem(
Image.asset('images/mine/icon_mine_valueAddedServices_email.png'), // Image.asset('images/mine/icon_mine_valueAddedServices_email.png'),
TranslationLoader.lanKeys!.mail!.tr, () { // TranslationLoader.lanKeys!.mail!.tr, () {
Navigator.pushNamed( // Navigator.pushNamed(
context, Routers.valueAddedServicesNoteAndEmailDetailPage, // context, Routers.valueAddedServicesNoteAndEmailDetailPage,
arguments: 2); // arguments: 2);
}), // }),
_valueAddedServicesItem( _valueAddedServicesItem(
Image.asset( Image.asset(
'images/mine/icon_mine_valueAddedServices_realName.png'), 'images/mine/icon_mine_valueAddedServices_realName.png'),
@ -55,27 +55,27 @@ class _ValueAddedServicesPageListState
Navigator.pushNamed( Navigator.pushNamed(
context, Routers.valueAddedServicesHighFunctionPage); context, Routers.valueAddedServicesHighFunctionPage);
}), }),
_valueAddedServicesItem( // _valueAddedServicesItem(
Image.asset('images/mine/icon_mine_valueAddedServices_push.png'), // Image.asset('images/mine/icon_mine_valueAddedServices_push.png'),
TranslationLoader.lanKeys!.pushMessage!.tr, () { // TranslationLoader.lanKeys!.pushMessage!.tr, () {
Navigator.pushNamed(context, Routers.gatewayDetailPage); // Navigator.pushNamed(context, Routers.gatewayDetailPage);
}), // }),
_valueAddedServicesItem( // _valueAddedServicesItem(
Image.asset( // Image.asset(
'images/mine/icon_mine_valueAddedServices_checkIn.png'), // 'images/mine/icon_mine_valueAddedServices_checkIn.png'),
TranslationLoader.lanKeys!.checkingIn!.tr, () { // TranslationLoader.lanKeys!.checkingIn!.tr, () {
Navigator.pushNamed(context, Routers.gatewayDetailPage); // Navigator.pushNamed(context, Routers.gatewayDetailPage);
}), // }),
_valueAddedServicesItem( _valueAddedServicesItem(
Image.asset( Image.asset(
'images/mine/icon_mine_valueAddedServices_storage.png'), 'images/mine/icon_mine_valueAddedServices_storage.png'),
TranslationLoader.lanKeys!.recordsRetention!.tr, () { TranslationLoader.lanKeys!.recordsRetention!.tr, () {
Navigator.pushNamed(context, Routers.gatewayDetailPage); Toast.show(msg: "功能暂未开放");
}), }),
_valueAddedServicesItem( _valueAddedServicesItem(
Image.asset('images/mine/icon_mine_valueAddedServices_vip.png'), Image.asset('images/mine/icon_mine_valueAddedServices_vip.png'),
'可视对讲', () { '可视对讲', () {
Navigator.pushNamed(context, Routers.gatewayDetailPage); Toast.show(msg: "功能暂未开放");
}), }),
_valueAddedServicesItem( _valueAddedServicesItem(
Text( Text(
@ -86,7 +86,7 @@ class _ValueAddedServicesPageListState
fontWeight: FontWeight.w600), fontWeight: FontWeight.w600),
), ),
"Amazon Alexa", () { "Amazon Alexa", () {
Navigator.pushNamed(context, Routers.gatewayDetailPage); Toast.show(msg: "功能暂未开放");
}), }),
_valueAddedServicesItem( _valueAddedServicesItem(
Text( Text(
@ -97,7 +97,7 @@ class _ValueAddedServicesPageListState
fontWeight: FontWeight.w600), fontWeight: FontWeight.w600),
), ),
"Google Home", () { "Google Home", () {
Navigator.pushNamed(context, Routers.gatewayDetailPage); Toast.show(msg: "功能暂未开放");
}), }),
], ],
), ),