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

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	star_lock/lib/appRouters.dart
This commit is contained in:
魏少阳 2023-07-29 18:34:10 +08:00
commit b8f44e330c
36 changed files with 489 additions and 353 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
star_lock/images/icon_recordDate.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

21
star_lock/lib/appRouters.dart
View File

@ -10,8 +10,7 @@ import 'package:star_lock/mine/mineSet/transferSmartLock/recipientInformation_pa
import 'package:star_lock/mine/mineSet/transferSmartLock/selectBranch_page.dart'; import 'package:star_lock/mine/mineSet/transferSmartLock/selectBranch_page.dart';
import 'package:star_lock/mine/mineSet/transferSmartLock/transferSmartLock_page.dart'; import 'package:star_lock/mine/mineSet/transferSmartLock/transferSmartLock_page.dart';
import 'common/safetyVerification/safetyVerification_binding.dart'; import 'common/safetyVerification_page.dart';
import 'common/safetyVerification/safetyVerification_page.dart';
import 'login/forgetPassword/starLock_forgetPassword_page.dart'; import 'login/forgetPassword/starLock_forgetPassword_page.dart';
import 'login/login/starLock_login_page.dart'; import 'login/login/starLock_login_page.dart';
import 'login/register/starLock_register_page.dart'; import 'login/register/starLock_register_page.dart';
@ -386,8 +385,7 @@ abstract class AppRouters {
), ),
GetPage( GetPage(
name: Routers.starLockRegisterPage, name: Routers.starLockRegisterPage,
page: () => const StarLockRegisterPage(), page: () => const StarLockRegisterPage(), binding:StarLockRegisterBinding()
binding:StarLockRegisterBinding()
), ),
GetPage( GetPage(
name: Routers.starLockForgetPasswordPage, name: Routers.starLockForgetPasswordPage,
@ -670,12 +668,10 @@ abstract class AppRouters {
page: () => const LockUserManageListListPage() page: () => const LockUserManageListListPage()
), ),
GetPage( GetPage(
name: Routers.lockGroupListPage, name: Routers.lockGroupListPage, page: () => const LockGroupListPage()
page: () => const LockGroupListPage()
), ),
GetPage( GetPage(
name: Routers.lockItemListPage, name: Routers.lockItemListPage, page: () => const LockItemListPage()
page: () => const LockItemListPage()
), ),
GetPage( GetPage(
name: Routers.transferSmartLockPage, name: Routers.transferSmartLockPage,
@ -686,8 +682,7 @@ abstract class AppRouters {
page: () => const RecipientInformationPage() page: () => const RecipientInformationPage()
), ),
GetPage( GetPage(
name: Routers.selectBranchPage, name: Routers.selectBranchPage, page: () => const SelectBranchPage()
page: () => const SelectBranchPage()
), ),
GetPage( GetPage(
name: Routers.selectGetewayListPage, name: Routers.selectGetewayListPage,
@ -703,12 +698,10 @@ abstract class AppRouters {
), ),
GetPage( GetPage(
name: Routers.safetyVerificationPage, name: Routers.safetyVerificationPage,
page: () => const SafetyVerificationPage(), page: () => const SafetyVerificationPage()
binding: SafetyVerificationBinding()
), ),
GetPage( GetPage(
name: Routers.ownedKeyListPage, name: Routers.ownedKeyListPage, page: () => const OwnedKeyListPage()
page: () => const OwnedKeyListPage()
) )
]; ];
} }

2
star_lock/lib/app_settings/app_colors.dart
View File

@ -115,7 +115,7 @@ class AppColors {
static Color progressBgColor = const Color(0xFF022345); static Color progressBgColor = const Color(0xFF022345);
static Color progressValueColor = const Color(0xFF0093E5); static Color progressValueColor = const Color(0xFF0093E5);
static const greyLineColor = Color.fromRGBO(220, 220, 220, 1); //灰色分割线 static const greyLineColor = Color.fromRGBO(240, 240, 240, 1); //灰色分割线220
static const darkGrayTextColor = Color.fromRGBO(65, 65, 65, 1); //深灰色字体 static const darkGrayTextColor = Color.fromRGBO(65, 65, 65, 1); //深灰色字体
static const placeholderTextColor = Color.fromRGBO(128, 128, 128, 1); //占位字体颜色 static const placeholderTextColor = Color.fromRGBO(128, 128, 128, 1); //占位字体颜色
static const greyBackgroundColor = Color.fromRGBO(240, 240, 240, 1); //灰色背景色 static const greyBackgroundColor = Color.fromRGBO(240, 240, 240, 1); //灰色背景色

2
star_lock/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_page.dart
View File

@ -115,7 +115,7 @@ class _AuthorizedAdminPageState extends State<AuthorizedAdminPage> {
leftTitel: TranslationLoader.lanKeys!.realNameAuthentication!.tr, leftTitel: TranslationLoader.lanKeys!.realNameAuthentication!.tr,
rightTitle: "", rightTitle: "",
isHaveRightWidget: true, isHaveRightWidget: true,
rightWidget: Container(width: 80.w, height: 50.h, child: _switch()), rightWidget: SizedBox(width: 60.w, height: 50.h, child: _switch()),
action: () {}), action: () {}),
Container(height: 10.h), Container(height: 10.h),
], ],

36
star_lock/lib/main/lockDetail/authorizedAdmin/authorizedAdminList/authorizedAdminList_page.dart
View File

@ -41,40 +41,12 @@ class _AuthorizedAdminListPageState extends State<AuthorizedAdminListPage> {
SizedBox( SizedBox(
height: 20.h, height: 20.h,
), ),
GestureDetector( AddBottomWhiteBtn(
child: Container( btnName: TranslationLoader.lanKeys!.addAuthorizedAdmin!.tr,
height: 80.h, onClick: () {
margin: EdgeInsets.only(left: 20.w, right: 20.w),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(8.w)),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Image.asset(
'images/icon_btn_add.png',
width: 28.w,
height: 28.w,
),
SizedBox(
width: 6.w,
),
Text(
TranslationLoader.lanKeys!.addAuthorizedAdmin!.tr,
style: TextStyle(
color: AppColors.mainColor,
fontSize: 24.sp,
fontWeight: FontWeight.bold),
)
],
),
),
onTap: () {
Navigator.pushNamed(context, Routers.authorizedAdminManagePage); Navigator.pushNamed(context, Routers.authorizedAdminManagePage);
}, },
), ),
// SubmitBtn( // SubmitBtn(
// btnName: TranslationLoader.lanKeys!.authorizedAdmin!.tr, // btnName: TranslationLoader.lanKeys!.authorizedAdmin!.tr,
// onClick: () { // onClick: () {
@ -140,7 +112,7 @@ class _AuthorizedAdminListPageState extends State<AuthorizedAdminListPage> {
), ),
Container( Container(
padding: EdgeInsets.only( padding: EdgeInsets.only(
left: 4.w, right: 4.w, top: 2.w, bottom: 2.w), left: 4.w, right: 4.w, top: 1.w, bottom: 1.w),
decoration: BoxDecoration( decoration: BoxDecoration(
color: AppColors.toBeReceiveBgColor, color: AppColors.toBeReceiveBgColor,
borderRadius: BorderRadius.circular(5.0), borderRadius: BorderRadius.circular(5.0),

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

@ -122,7 +122,7 @@ class _VolumeAuthorizationLockPageState
leftTitel: TranslationLoader.lanKeys!.remoteUnlockingAllowed!.tr, leftTitel: TranslationLoader.lanKeys!.remoteUnlockingAllowed!.tr,
rightTitle: "", rightTitle: "",
isHaveRightWidget: true, isHaveRightWidget: true,
rightWidget: SizedBox(width: 80.w, height: 50.h, child: _switch()), rightWidget: SizedBox(width: 60.w, height: 50.h, child: _switch()),
action: () {}), action: () {}),
Container(height: 10.h), Container(height: 10.h),
], ],

212
star_lock/lib/main/lockDetail/checkingIn/checkingInDetail/checkingInDetail_page.dart
View File

@ -27,7 +27,7 @@ class _CheckingInDetailPageState extends State<CheckingInDetailPage> {
_setDatas(year: _year, month: _month); _setDatas(year: _year, month: _month);
//设置模拟数据，日历月事件，可根据接口返回的结果 //设置模拟数据，日历月事件，可根据接口返回的结果
_loadAttendanceMonthRecord( "$_year-$_month"); _loadAttendanceMonthRecord("$_year-$_month");
//日历日事件 //日历日事件
_loadAttendanceDayRecord("$_year-$_month-$_day"); _loadAttendanceDayRecord("$_year-$_month-$_day");
@ -36,12 +36,18 @@ class _CheckingInDetailPageState extends State<CheckingInDetailPage> {
//加载月历事件，请求接口 //加载月历事件，请求接口
_loadAttendanceMonthRecord(String dateTime) async { _loadAttendanceMonthRecord(String dateTime) async {
CalendarModel bean1 = CalendarModel(year: _year,month: _month,day: 1,workType: "2"); CalendarModel bean1 =
CalendarModel bean2 = CalendarModel(year: _year,month: _month,day: 2,workType: "1"); CalendarModel(year: _year, month: _month, day: 1, workType: "2");
CalendarModel bean3 = CalendarModel(year: _year,month: _month,day: 3,workType: "2"); CalendarModel bean2 =
CalendarModel bean4 = CalendarModel(year: _year,month: _month,day: 4,workType: "0"); CalendarModel(year: _year, month: _month, day: 2, workType: "1");
CalendarModel bean5 = CalendarModel(year: _year,month: _month,day: 5,workType: "0"); CalendarModel bean3 =
CalendarModel bean6 = CalendarModel(year: _year,month: _month,day: 6,workType: "1"); CalendarModel(year: _year, month: _month, day: 3, workType: "2");
CalendarModel bean4 =
CalendarModel(year: _year, month: _month, day: 4, workType: "0");
CalendarModel bean5 =
CalendarModel(year: _year, month: _month, day: 5, workType: "0");
CalendarModel bean6 =
CalendarModel(year: _year, month: _month, day: 6, workType: "1");
_listDatas.add(bean1); _listDatas.add(bean1);
_listDatas.add(bean2); _listDatas.add(bean2);
_listDatas.add(bean3); _listDatas.add(bean3);
@ -52,7 +58,7 @@ class _CheckingInDetailPageState extends State<CheckingInDetailPage> {
setState(() { setState(() {
for (int i = 0; i < _datas.length; i++) { for (int i = 0; i < _datas.length; i++) {
for (int j = 0; j < _listDatas.length; j++) { for (int j = 0; j < _listDatas.length; j++) {
if (_datas[i].year== _listDatas[j].year && if (_datas[i].year == _listDatas[j].year &&
_datas[i].month == _listDatas[j].month && _datas[i].month == _listDatas[j].month &&
_datas[i].day == _listDatas[j].day) { _datas[i].day == _listDatas[j].day) {
_datas[i].workType = _listDatas[j].workType; _datas[i].workType = _listDatas[j].workType;
@ -63,40 +69,44 @@ class _CheckingInDetailPageState extends State<CheckingInDetailPage> {
} }
//加载日事件，请求接口 //加载日事件，请求接口
_loadAttendanceDayRecord(String dateTime) async{ _loadAttendanceDayRecord(String dateTime) async {
//可根据接口返回的内容在日历下面打卡信息或者其余内容 //可根据接口返回的内容在日历下面打卡信息或者其余内容
print("点击的是$dateTime"); print("点击的是$dateTime");
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
appBar: TitleAppBar(barTitle:"张三", haveBack:true, backgroundColor: AppColors.mainColor), appBar: TitleAppBar(
barTitle: "张三",
haveBack: true,
backgroundColor: AppColors.mainColor),
body: SingleChildScrollView( body: SingleChildScrollView(
child: Column( child: Column(
children: [ children: [
Container( Container(
// margin: EdgeInsets.all(20.sp), // margin: EdgeInsets.all(20.sp),
decoration: BoxDecoration( decoration: BoxDecoration(
//设置颜色 //设置颜色
color: Colors.white, color: Colors.white,
borderRadius: BorderRadius.all(Radius.circular(12.r)), borderRadius: BorderRadius.all(Radius.circular(12.r)),
//设置四周边框 //设置四周边框
), ),
child: Column( child: Column(
children: [ children: [
_yearHeader(), _yearHeader(),
SizedBox(height: 10.h), SizedBox(height: 10.h),
_weekHeader(), _weekHeader(),
_everyDay(), _everyDay(),
_bottomStatisticsWidget() _bottomStatisticsWidget()
], ],
), ),
), ),
//下面可以添加日事件中的信息，例如打卡信息 //下面可以添加日事件中的信息，例如打卡信息
Container(), Container(),
], ],
))); )));
} }
//头部年 //头部年
@ -120,9 +130,17 @@ class _CheckingInDetailPageState extends State<CheckingInDetailPage> {
), ),
), ),
), ),
SizedBox(width: 60.w,), SizedBox(
Text("$_year-$_month", style: TextStyle(fontSize: 34.sp, color: Colors.black, fontWeight: FontWeight.w500)), width: 60.w,
SizedBox(width: 60.w,), ),
Text("$_year-$_month",
style: TextStyle(
fontSize: 34.sp,
color: Colors.black,
fontWeight: FontWeight.w500)),
SizedBox(
width: 60.w,
),
GestureDetector( GestureDetector(
onTap: () { onTap: () {
_nextMonth(); _nextMonth();
@ -150,7 +168,8 @@ class _CheckingInDetailPageState extends State<CheckingInDetailPage> {
TranslationLoader.lanKeys!.thursdayShort!.tr, TranslationLoader.lanKeys!.thursdayShort!.tr,
TranslationLoader.lanKeys!.fridayShort!.tr, TranslationLoader.lanKeys!.fridayShort!.tr,
TranslationLoader.lanKeys!.saturdayShort!.tr, TranslationLoader.lanKeys!.saturdayShort!.tr,
TranslationLoader.lanKeys!.sundayShort!.tr]; TranslationLoader.lanKeys!.sundayShort!.tr
];
return Container( return Container(
height: 50.h, height: 50.h,
child: GridView.builder( child: GridView.builder(
@ -159,7 +178,7 @@ class _CheckingInDetailPageState extends State<CheckingInDetailPage> {
shrinkWrap: true, shrinkWrap: true,
physics: const NeverScrollableScrollPhysics(), physics: const NeverScrollableScrollPhysics(),
gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount( gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
//横轴元素个数 //横轴元素个数
crossAxisCount: 7, crossAxisCount: 7,
//纵轴间距 //纵轴间距
// mainAxisSpacing: ScreenUtil().setHeight(10), // mainAxisSpacing: ScreenUtil().setHeight(10),
@ -192,7 +211,7 @@ class _CheckingInDetailPageState extends State<CheckingInDetailPage> {
shrinkWrap: true, shrinkWrap: true,
physics: const NeverScrollableScrollPhysics(), physics: const NeverScrollableScrollPhysics(),
gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount( gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
//横轴元素个数 //横轴元素个数
crossAxisCount: 7, crossAxisCount: 7,
// //纵轴间距 // //纵轴间距
// mainAxisSpacing: ScreenUtil().setHeight(10), // mainAxisSpacing: ScreenUtil().setHeight(10),
@ -213,7 +232,8 @@ class _CheckingInDetailPageState extends State<CheckingInDetailPage> {
_datas[i].isSelect = true; _datas[i].isSelect = true;
//加载选中的日期事件 //加载选中的日期事件
_loadAttendanceDayRecord( "${_datas[i].year}-${_datas[i].month}-${_datas[i].day}"); _loadAttendanceDayRecord(
"${_datas[i].year}-${_datas[i].month}-${_datas[i].day}");
} else { } else {
_datas[i].isSelect = false; _datas[i].isSelect = false;
} }
@ -233,9 +253,9 @@ class _CheckingInDetailPageState extends State<CheckingInDetailPage> {
//设置底部背景 //设置底部背景
decoration: _datas[index].isSelect! decoration: _datas[index].isSelect!
? const BoxDecoration( ? const BoxDecoration(
color: Color(0xFF2C91F6), color: Color(0xFF2C91F6),
shape: BoxShape.circle, shape: BoxShape.circle,
) )
: const BoxDecoration(), : const BoxDecoration(),
child: Center( child: Center(
child: Text( child: Text(
@ -247,29 +267,31 @@ class _CheckingInDetailPageState extends State<CheckingInDetailPage> {
//设置选中字体颜色，以及周末和工作日颜色 //设置选中字体颜色，以及周末和工作日颜色
style: _datas[index].isSelect! style: _datas[index].isSelect!
? TextStyle( ? TextStyle(
fontSize: 32.sp, color: const Color(0xFFFFFFFF)) fontSize: 32.sp, color: const Color(0xFFFFFFFF))
: (index % 7 == 5 || index % 7 == 6 : (index % 7 == 5 || index % 7 == 6
? TextStyle( ? TextStyle(
fontSize: 32.sp, color: const Color(0xFFC4C8D0)) fontSize: 32.sp,
: TextStyle( color: const Color(0xFFC4C8D0))
fontSize: 32.sp, color: const Color(0xFF3C3E43))), : TextStyle(
fontSize: 32.sp,
color: const Color(0xFF3C3E43))),
), ),
), ),
), ),
const SizedBox(height: 5), const SizedBox(height: 5),
//设置底部小圆点，非当前月的不显示，设置为透明，其余的根据状态判断显示 //设置底部小圆点，非当前月的不显示，设置为透明，其余的根据状态判断显示
_datas[index].month == _month && _datas[index].month == _month &&
_datas[index].workType != "" && _datas[index].workType != "" &&
_datas[index].workType != "0" _datas[index].workType != "0"
? Container( ? Container(
height: 6.0, height: 6.0,
width: 6.0, width: 6.0,
decoration: BoxDecoration( decoration: BoxDecoration(
shape: BoxShape.circle, shape: BoxShape.circle,
color: _datas[index].workType == "1" color: _datas[index].workType == "1"
? const Color(0xFFF48835) ? const Color(0xFFF48835)
: const Color(0xFF2C91F6)), : const Color(0xFF2C91F6)),
) )
: Container(), : Container(),
], ],
), ),
@ -280,7 +302,7 @@ class _CheckingInDetailPageState extends State<CheckingInDetailPage> {
); );
} }
Widget _bottomStatisticsWidget(){ Widget _bottomStatisticsWidget() {
return Column( return Column(
children: [ children: [
Row( Row(
@ -288,45 +310,64 @@ class _CheckingInDetailPageState extends State<CheckingInDetailPage> {
Container( Container(
width: 1.sw, width: 1.sw,
// height: 40.h, // height: 40.h,
padding: EdgeInsets.only(left: 50.w,top: 5.h, bottom: 5.h), padding: EdgeInsets.only(left: 50.w, top: 5.h, bottom: 5.h),
color: Colors.grey, color: Colors.grey,
child: Text("月统计", style: TextStyle(color: Colors.white, fontSize: 32.sp, fontWeight: FontWeight.w500),), child: Text(
"月统计",
style: TextStyle(
color: Colors.white,
fontSize: 32.sp,
fontWeight: FontWeight.w500),
),
), ),
], ],
), ),
_bottomStatisticsItemWidget(Colors.red ,"迟到", "0"), _bottomStatisticsItemWidget(Colors.red, "迟到", "0"),
_bottomStatisticsItemWidget(Colors.orange ,"早退", "0"), _bottomStatisticsItemWidget(Colors.orange, "早退", "0"),
_bottomStatisticsItemWidget(Colors.grey ,"未打卡", "0"), _bottomStatisticsItemWidget(Colors.grey, "未打卡", "0"),
], ],
); );
} }
Widget _bottomStatisticsItemWidget(Color color,String leftTitel, String rightTitle,){ Widget _bottomStatisticsItemWidget(
Color color,
String leftTitel,
String rightTitle,
) {
return Column( return Column(
children: [ children: [
Container( Container(
height: 70.h, height: 70.h,
padding: EdgeInsets.only(left:20.w, right: 10.w, top: 20.w, bottom: 20.w), padding:
EdgeInsets.only(left: 20.w, right: 10.w, top: 20.w, bottom: 20.w),
child: Row( child: Row(
children: [ children: [
SizedBox(width:20.w), SizedBox(width: 20.w),
Container( Container(
width: 35.w, width: 35.w,
height: 35.w, height: 35.w,
decoration: BoxDecoration( decoration: BoxDecoration(
color: color, color: color,
borderRadius:BorderRadius.all(Radius.circular(35.h)) borderRadius: BorderRadius.all(Radius.circular(35.h))),
),
), ),
SizedBox(width:20.w), SizedBox(width: 20.w),
Expanded(child: Text(leftTitel, style: TextStyle(fontSize: 28.sp, fontWeight: FontWeight.w500))), Expanded(
SizedBox(width:20.w), child: Text(leftTitel,
Text(rightTitle, textAlign: TextAlign.end, style: TextStyle(fontSize: 28.sp, fontWeight: FontWeight.w500)), style: TextStyle(
SizedBox(width:10.w), fontSize: 28.sp, fontWeight: FontWeight.w500))),
SizedBox(width: 20.w),
Text(rightTitle,
textAlign: TextAlign.end,
style:
TextStyle(fontSize: 28.sp, fontWeight: FontWeight.w500)),
SizedBox(width: 10.w),
], ],
), ),
), ),
Container(height: 0.5.h, color: Colors.grey,) Container(
height: 0.5.h,
color: Colors.grey,
)
], ],
); );
} }
@ -424,7 +465,7 @@ class _CheckingInDetailPageState extends State<CheckingInDetailPage> {
nextMonth = 1; nextMonth = 1;
} }
var nextPlaceholderDays = var nextPlaceholderDays =
_getPlaceholderDays(year: nextYear, month: nextMonth); _getPlaceholderDays(year: nextYear, month: nextMonth);
for (var i = 0; i < 7 - nextPlaceholderDays; i++) { for (var i = 0; i < 7 - nextPlaceholderDays; i++) {
_datas.add(CalendarModel( _datas.add(CalendarModel(
year: nextYear, year: nextYear,
@ -448,7 +489,7 @@ class _CheckingInDetailPageState extends State<CheckingInDetailPage> {
_datas.clear(); _datas.clear();
_setDatas(year: _year, month: _month); _setDatas(year: _year, month: _month);
//更新月历事件 //更新月历事件
_loadAttendanceMonthRecord( "$_year-$_month"); _loadAttendanceMonthRecord("$_year-$_month");
//更新日事件 //更新日事件
_loadAttendanceDayRecord("$_year-$_month-$_day"); _loadAttendanceDayRecord("$_year-$_month-$_day");
}); });
@ -456,12 +497,15 @@ class _CheckingInDetailPageState extends State<CheckingInDetailPage> {
// 下月 // 下月
_nextMonth() { _nextMonth() {
if(_month==12){//当前月是12月，下一个月就是下一年 if (_month == 12) {
if(DateTime.now().year>=_year+1){//判断下一年是否大于当前年 //当前月是12月，下一个月就是下一年
if (DateTime.now().year >= _year + 1) {
//判断下一年是否大于当前年
_setNextMonthData(); _setNextMonthData();
} }
}else{//当前月不是12月，还处于当前年 } else {
if(DateTime.now().month>=_month+1){ //当前月不是12月，还处于当前年
if (DateTime.now().month >= _month + 1) {
//判断下一个月是否超过当前月，超过当前月不做操作 //判断下一个月是否超过当前月，超过当前月不做操作
_setNextMonthData(); _setNextMonthData();
} }
@ -469,7 +513,7 @@ class _CheckingInDetailPageState extends State<CheckingInDetailPage> {
} }
//设置下个月的数据 //设置下个月的数据
_setNextMonthData(){ _setNextMonthData() {
setState(() { setState(() {
if (_month == 12) { if (_month == 12) {
_year = _year + 1; _year = _year + 1;
@ -487,7 +531,7 @@ class _CheckingInDetailPageState extends State<CheckingInDetailPage> {
_datas.clear(); _datas.clear();
_setDatas(year: _year, month: _month); _setDatas(year: _year, month: _month);
//更新月历事件 //更新月历事件
_loadAttendanceMonthRecord( "$_year-$_month"); _loadAttendanceMonthRecord("$_year-$_month");
//更新日事件 //更新日事件
_loadAttendanceDayRecord("$_year-$_month-$_day"); _loadAttendanceDayRecord("$_year-$_month-$_day");
}); });
@ -499,7 +543,7 @@ class CalendarModel {
int? year; int? year;
int? month; int? month;
int? day; int? day;
String? workType = "";//日期事件，0，休息，1，异常，2，正常 String? workType = ""; //日期事件，0，休息，1，异常，2，正常
bool? isSelect = false; bool? isSelect = false;
CalendarModel( CalendarModel(

8
star_lock/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_page.dart
View File

@ -55,10 +55,12 @@ class _ElectronicKeyDetailPageState extends State<ElectronicKeyDetailPage> {
leftTitel: TranslationLoader.lanKeys!.receiver!.tr, leftTitel: TranslationLoader.lanKeys!.receiver!.tr,
rightTitle: "786612630@qq.com", rightTitle: "786612630@qq.com",
action: () {}), action: () {}),
const SizedBox(height: 1),
CommonItem( CommonItem(
leftTitel: TranslationLoader.lanKeys!.sender!.tr, leftTitel: TranslationLoader.lanKeys!.sender!.tr,
rightTitle: "15080825640", rightTitle: "15080825640",
action: () {}), action: () {}),
const SizedBox(height: 1),
CommonItem( CommonItem(
leftTitel: TranslationLoader.lanKeys!.senderTime!.tr, leftTitel: TranslationLoader.lanKeys!.senderTime!.tr,
rightTitle: "2020.06.21 11:49", rightTitle: "2020.06.21 11:49",
@ -68,14 +70,16 @@ class _ElectronicKeyDetailPageState extends State<ElectronicKeyDetailPage> {
leftTitel: TranslationLoader.lanKeys!.realNameAuthentication!.tr, leftTitel: TranslationLoader.lanKeys!.realNameAuthentication!.tr,
rightTitle: "", rightTitle: "",
isHaveRightWidget: true, isHaveRightWidget: true,
rightWidget: Container(width: 80.w, child: _switch()), rightWidget: SizedBox(width: 60.w, child: _switch()),
action: () {}), action: () {}),
Container(height: 10.h), Container(height: 10.h),
CommonItem( CommonItem(
leftTitel: TranslationLoader.lanKeys!.operatingRecord!.tr, leftTitel: TranslationLoader.lanKeys!.operatingRecord!.tr,
rightTitle: "", rightTitle: "",
isHaveDirection: true, isHaveDirection: true,
action: () {}), action: () {
Navigator.pushNamed(context, Routers.keyOperationRecordPage);
}),
Container(height: 40.h), Container(height: 40.h),
SubmitBtn( SubmitBtn(
btnName: TranslationLoader.lanKeys!.delete!.tr, btnName: TranslationLoader.lanKeys!.delete!.tr,

83
star_lock/lib/main/lockDetail/electronicKey/electronicKeyDetail/keyOperationRecord_page.dart Normal file
View File

@ -0,0 +1,83 @@
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import '../../../../appRouters.dart';
import '../../../../app_settings/app_colors.dart';
import '../../../../tools/submitBtn.dart';
import '../../../../tools/titleAppBar.dart';
import '../../../../translations/trans_lib.dart';
class KeyOperationRecordPage extends StatefulWidget {
const KeyOperationRecordPage({Key? key}) : super(key: key);
@override
State<KeyOperationRecordPage> createState() => _KeyOperationRecordPageState();
}
class _KeyOperationRecordPageState extends State<KeyOperationRecordPage> {
@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: AppColors.mainBackgroundColor,
appBar: TitleAppBar(
barTitle: TranslationLoader.lanKeys!.operatingRecord!.tr,
haveBack: true,
backgroundColor: AppColors.mainColor,
),
body: Column(
children: [
Expanded(child: _buildMainUI()),
],
),
);
}
Widget _buildMainUI() {
return ListView.separated(
itemCount: 5,
itemBuilder: (c, index) {
return _electronicKeyItem('images/icon_recordDate.png', "张三",
"2023.6.21 11.15", "2023.6.21 11.15", () {});
},
separatorBuilder: (BuildContext context, int index) {
return const Divider(
height: 1,
color: AppColors.greyLineColor,
);
},
);
}
Widget _electronicKeyItem(String lockTypeIcon, String lockTypeTitle,
String beginTime, String endTime, Function() action) {
return GestureDetector(
onTap: action,
child: Container(
color: Colors.white,
height: 68.h,
child: Row(
children: [
SizedBox(
width: 30.w,
),
Image.asset(
lockTypeIcon,
width: 24.w,
height: 24.w,
color: AppColors.darkGrayTextColor,
),
SizedBox(
width: 20.w,
),
Text(
'2023-07-29 14:50:33 开锁',
style: TextStyle(color: AppColors.blackColor, fontSize: 20.sp),
),
SizedBox(width: 20.h),
],
),
),
);
}
}

33
star_lock/lib/main/lockDetail/electronicKey/electronicKeyList/electronicKeyList_page.dart
View File

@ -41,36 +41,9 @@ class _ElectronicKeyListPageState extends State<ElectronicKeyListPage> {
height: 20.h, height: 20.h,
), ),
Expanded(child: _buildMainUI()), Expanded(child: _buildMainUI()),
GestureDetector( AddBottomWhiteBtn(
child: Container( btnName: TranslationLoader.lanKeys!.sendKey!.tr,
height: 80.h, onClick: () {
margin: EdgeInsets.only(left: 20.w, right: 20.w),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(8.w)),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Image.asset(
'images/icon_btn_add.png',
width: 28.w,
height: 28.w,
),
SizedBox(
width: 6.w,
),
Text(
TranslationLoader.lanKeys!.sendKey!.tr,
style: TextStyle(
color: AppColors.mainColor,
fontSize: 24.sp,
fontWeight: FontWeight.bold),
)
],
),
),
onTap: () {
Navigator.pushNamed(context, Routers.sendElectronicKeyManagePage); Navigator.pushNamed(context, Routers.sendElectronicKeyManagePage);
}, },
), ),

14
star_lock/lib/main/lockDetail/electronicKey/electronicKeyPeriodValidity/electronicKeyPeriodValidity_page.dart
View File

@ -29,8 +29,16 @@ class _ElectronicKeyPeriodValidityPageState
body: Column( body: Column(
children: [ children: [
topWidget(), topWidget(),
SizedBox( // SizedBox(
height: 1.h, // height: 1.h,
// ),
Container(
color: Colors.white,
height: 10.h,
),
const Divider(
height: 1,
color: AppColors.greyLineColor,
), ),
bottomWidget() bottomWidget()
], ],
@ -53,7 +61,7 @@ class _ElectronicKeyPeriodValidityPageState
style: style:
TextStyle(fontSize: 24.sp, fontWeight: FontWeight.w600))), TextStyle(fontSize: 24.sp, fontWeight: FontWeight.w600))),
SizedBox( SizedBox(
height: 80.h, height: 90.h,
child: GridView.builder( child: GridView.builder(
gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount( gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 7, childAspectRatio: 1.0), crossAxisCount: 7, childAspectRatio: 1.0),

6
star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendElectronicKey_page.dart
View File

@ -50,7 +50,6 @@ class _MassSendElectronicKeyPageState extends State<MassSendElectronicKeyPage> {
], ],
); );
} }
break;
case 1: case 1:
{ {
// 永久 // 永久
@ -62,7 +61,6 @@ class _MassSendElectronicKeyPageState extends State<MassSendElectronicKeyPage> {
], ],
); );
} }
break;
case 2: case 2:
{ {
// 单次 // 单次
@ -75,10 +73,8 @@ class _MassSendElectronicKeyPageState extends State<MassSendElectronicKeyPage> {
], ],
); );
} }
break;
default: default:
return Container(); return Container();
break;
} }
} }
@ -128,7 +124,7 @@ class _MassSendElectronicKeyPageState extends State<MassSendElectronicKeyPage> {
leftTitel: TranslationLoader.lanKeys!.remoteUnlockingAllowed!.tr, leftTitel: TranslationLoader.lanKeys!.remoteUnlockingAllowed!.tr,
rightTitle: "", rightTitle: "",
isHaveRightWidget: true, isHaveRightWidget: true,
rightWidget: Container(width: 80.w, height: 50.h, child: _switch()), rightWidget: SizedBox(width: 60.w, height: 50.h, child: _switch()),
action: () {}), action: () {}),
Container(height: 40.h), Container(height: 40.h),
], ],

4
star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_page.dart
View File

@ -148,7 +148,7 @@ class _SendElectronicKeyPageState extends State<SendElectronicKeyPage> {
rightTitle: "", rightTitle: "",
isTipsImg: true, isTipsImg: true,
isHaveRightWidget: true, isHaveRightWidget: true,
rightWidget: SizedBox(width: 80.w, height: 50.h, child: _switch()), rightWidget: SizedBox(width: 60.w, height: 50.h, child: _switch()),
action: () {}), action: () {}),
], ],
); );
@ -337,7 +337,7 @@ class _SendElectronicKeyPageState extends State<SendElectronicKeyPage> {
leftTitel: TranslationLoader.lanKeys!.remoteUnlockingAllowed!.tr, leftTitel: TranslationLoader.lanKeys!.remoteUnlockingAllowed!.tr,
rightTitle: "", rightTitle: "",
isHaveRightWidget: true, isHaveRightWidget: true,
rightWidget: SizedBox(width: 80.w, height: 50.h, child: _switch()), rightWidget: SizedBox(width: 60.w, height: 50.h, child: _switch()),
action: () {}), action: () {}),
Container(height: 10.h), Container(height: 10.h),
], ],

4
star_lock/lib/main/lockDetail/electronicKey/sendEmailNotification/sendEmailNotification_page.dart
View File

@ -20,7 +20,7 @@ class _SendEmailNotificationPageState extends State<SendEmailNotificationPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
_emailController.text = _emailController.text =
"请爱的用户 \n\n你收到电子钥匙，请试用APP(www.baidu.com)或小程序开锁 \n\n星锁"; "亲爱的用户 \n\n你收到电子钥匙，请试用APP(www.baidu.com)或小程序开锁 \n\n星锁";
return Scaffold( return Scaffold(
backgroundColor: AppColors.mainBackgroundColor, backgroundColor: AppColors.mainBackgroundColor,
appBar: TitleAppBar( appBar: TitleAppBar(
@ -57,7 +57,7 @@ class _SendEmailNotificationPageState extends State<SendEmailNotificationPage> {
controller: _emailController, controller: _emailController,
style: TextStyle( style: TextStyle(
color: Colors.black, color: Colors.black,
fontSize: 28.sp, fontSize: 22.sp,
), ),
decoration: InputDecoration( decoration: InputDecoration(
border: OutlineInputBorder( border: OutlineInputBorder(

2
star_lock/lib/main/lockDetail/lcokSet/automaticBlocking/automaticBlocking_page.dart
View File

@ -37,7 +37,7 @@ class _AutomaticBlockingPageState extends State<AutomaticBlockingPage> {
isHaveLine: false, isHaveLine: false,
isHaveRightWidget: true, isHaveRightWidget: true,
rightWidget: rightWidget:
Container(width: 80.w, height: 50.h, child: _switch())), SizedBox(width: 60.w, height: 50.h, child: _switch())),
Container( Container(
height: 10.h, height: 10.h,
), ),

6
star_lock/lib/main/lockDetail/lcokSet/lockSet/lockSet_page.dart
View File

@ -205,15 +205,13 @@ class _LockSetPageState extends State<LockSetPage> {
rightTitle: "", rightTitle: "",
isHaveLine: true, isHaveLine: true,
isHaveRightWidget: true, isHaveRightWidget: true,
rightWidget: Container( rightWidget: SizedBox(width: 60.w, child: _switch())),
width: 80.w, height: 50.h, child: _switch())),
CommonItem( CommonItem(
leftTitel: TranslationLoader.lanKeys!.unlockReminder!.tr, leftTitel: TranslationLoader.lanKeys!.unlockReminder!.tr,
rightTitle: "", rightTitle: "",
isHaveLine: false, isHaveLine: false,
isHaveRightWidget: true, isHaveRightWidget: true,
rightWidget: Container( rightWidget: SizedBox(width: 60.w, child: _switch())),
width: 80.w, height: 50.h, child: _switch())),
SizedBox( SizedBox(
height: 30.h, height: 30.h,
), ),

2
star_lock/lib/main/lockDetail/lcokSet/lockSoundSet/lockSoundSet_page.dart
View File

@ -33,7 +33,7 @@ class _LockSoundSetPageState extends State<LockSoundSetPage> {
isHaveLine: false, isHaveLine: false,
isHaveRightWidget: true, isHaveRightWidget: true,
rightWidget: rightWidget:
Container(width: 80.w, height: 50.h, child: _switch())), SizedBox(width: 60.w, height: 50.h, child: _switch())),
Container( Container(
height: 10.h, height: 10.h,
), ),

8
star_lock/lib/main/lockDetail/lcokSet/normallyOpenMode/normallyOpenMode_page.dart
View File

@ -33,7 +33,7 @@ class _NormallyOpenModePageState extends State<NormallyOpenModePage> {
isHaveLine: false, isHaveLine: false,
isHaveRightWidget: true, isHaveRightWidget: true,
rightWidget: rightWidget:
Container(width: 80.w, height: 50.h, child: _switch())), SizedBox(width: 60.w, height: 50.h, child: _switch())),
Container( Container(
height: 10.h, height: 10.h,
), ),
@ -83,7 +83,7 @@ class _NormallyOpenModePageState extends State<NormallyOpenModePage> {
Widget topWidget() { Widget topWidget() {
return Container( return Container(
height: 150.h, height: 160.h,
width: 1.sw, width: 1.sw,
color: Colors.white, color: Colors.white,
child: Column( child: Column(
@ -98,8 +98,8 @@ class _NormallyOpenModePageState extends State<NormallyOpenModePage> {
style: style:
TextStyle(fontSize: 24.sp, fontWeight: FontWeight.w600))), TextStyle(fontSize: 24.sp, fontWeight: FontWeight.w600))),
Container( Container(
height: 90.h, height: 100.h,
padding: EdgeInsets.only(left: 10.w, right: 10.w), padding: EdgeInsets.only(left: 10.w, right: 10.w, bottom: 10.h),
child: GridView.builder( child: GridView.builder(
gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount( gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 7, childAspectRatio: 1.0), crossAxisCount: 7, childAspectRatio: 1.0),

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

@ -168,8 +168,8 @@ class _LockDetailPageState extends State<LockDetailPage> {
} }
Widget bottomItem(String iconUrl, String name, Function() onClick) { Widget bottomItem(String iconUrl, String name, Function() onClick) {
var width = 40.w; var width = 42.w;
var height = 36.h; var height = 42.h;
return GestureDetector( return GestureDetector(
onTap: onClick, onTap: onClick,
child: Container( child: Container(

41
star_lock/lib/main/lockDetail/otherTypeKey/otherTypeKeyList/otherTypeKeyList_page.dart
View File

@ -42,47 +42,14 @@ class _OtherTypeKeyListPageState extends State<OtherTypeKeyListPage> {
height: 20.h, height: 20.h,
), ),
Expanded(child: _buildMainUI(type)), Expanded(child: _buildMainUI(type)),
GestureDetector( AddBottomWhiteBtn(
child: Container( btnName:
height: 80.h, '${TranslationLoader.lanKeys!.add!.tr}${getAppBarTitle(type)}',
margin: EdgeInsets.only(left: 20.w, right: 20.w), onClick: () {
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(8.w)),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Image.asset(
'images/icon_btn_add.png',
width: 28.w,
height: 28.w,
),
SizedBox(
width: 6.w,
),
Text(
'${TranslationLoader.lanKeys!.add!.tr}${getAppBarTitle(type)}',
style: TextStyle(
color: AppColors.mainColor,
fontSize: 24.sp,
fontWeight: FontWeight.bold),
)
],
),
),
onTap: () {
Navigator.pushNamed(context, Routers.otherTypeKeyManagePage, Navigator.pushNamed(context, Routers.otherTypeKeyManagePage,
arguments: type); arguments: type);
}, },
), ),
// SubmitBtn(
// btnName:
// '${TranslationLoader.lanKeys!.add!.tr}${getAppBarTitle(type)}',
// onClick: () {
// Navigator.pushNamed(context, Routers.otherTypeKeyManagePage,
// arguments: type);
// }),
SizedBox( SizedBox(
height: 64.h, height: 64.h,
) )

43
star_lock/lib/main/lockDetail/passwordKey/passwordKeyList/passwordKeyList_page.dart
View File

@ -44,49 +44,12 @@ class _PasswordKeyListPageState extends State<PasswordKeyListPage> {
SizedBox( SizedBox(
height: 20.h, height: 20.h,
), ),
GestureDetector( AddBottomWhiteBtn(
child: Container( btnName: TranslationLoader.lanKeys!.getPassword!.tr,
height: 80.h, onClick: () {
margin: EdgeInsets.only(left: 20.w, right: 20.w),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(8.w)),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Image.asset(
'images/icon_btn_add.png',
width: 28.w,
height: 28.w,
),
SizedBox(
width: 6.w,
),
Text(
TranslationLoader.lanKeys!.getPassword!.tr,
style: TextStyle(
color: AppColors.mainColor,
fontSize: 24.sp,
fontWeight: FontWeight.bold),
)
],
),
),
onTap: () {
Navigator.pushNamed(context, Routers.passwordKeyManagePage); Navigator.pushNamed(context, Routers.passwordKeyManagePage);
}, },
), ),
// SubmitBtn(
// btnName: TranslationLoader.lanKeys!.getPassword!.tr,
// borderRadius: 20.w,
// margin: EdgeInsets.only(
// left: 30.w, right: 30.w, top: 30.w, bottom: 30.w),
// padding: EdgeInsets.only(top: 25.w, bottom: 25.w),
// onClick: () {
// Navigator.pushNamed(context, Routers.passwordKeyManagePage);
// }),
SizedBox( SizedBox(
height: 42.h, height: 42.h,
) )

2
star_lock/lib/main/lockDetail/passwordKey/passwordKey_perpetual/passwordKey_perpetual_page.dart
View File

@ -181,7 +181,7 @@ class _PasswordKeyPerpetualPageState extends State<PasswordKeyPerpetualPage> {
rightTitle: "", rightTitle: "",
isHaveRightWidget: true, isHaveRightWidget: true,
rightWidget: rightWidget:
Container(width: 80.w, height: 50.h, child: _switch()), SizedBox(width: 60.w, height: 50.h, child: _switch()),
action: () {}), action: () {}),
Container(height: 10.h), Container(height: 10.h),
], ],

25
star_lock/lib/main/lockMian/lockMain_page.dart
View File

@ -31,7 +31,6 @@ class _StarLockMainState extends State<StarLockMain> with BaseWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final logic = Get.put(GetxBle()); final logic = Get.put(GetxBle());
// Get.lazyPut(()=>GetxBle()); // Get.lazyPut(()=>GetxBle());
logic.scanner.startScan([]); logic.scanner.startScan([]);
@ -44,20 +43,20 @@ class _StarLockMainState extends State<StarLockMain> with BaseWidget {
haveOtherLeftWidget: true, haveOtherLeftWidget: true,
leftWidget: Builder( leftWidget: Builder(
builder: (context) => IconButton( builder: (context) => IconButton(
icon: Image.asset( icon: Image.asset(
"images/main/mainLeft_menu_icon.png", "images/main/mainLeft_menu_icon.png",
color: Colors.white, color: Colors.white,
width: 44.w, width: 44.w,
height: 44.w, height: 44.w,
), ),
onPressed: () { onPressed: () {
Scaffold.of(context).openDrawer(); Scaffold.of(context).openDrawer();
}, },
)), )),
backgroundColor: AppColors.mainColor, backgroundColor: AppColors.mainColor,
actionsList: [ actionsList: [
TextButton( TextButton(
child: Text("", style: const TextStyle(color: Colors.white)), child: const Text("", style: TextStyle(color: Colors.white)),
onPressed: () { onPressed: () {
Navigator.pushNamed(context, Routers.starLockLoginPage); Navigator.pushNamed(context, Routers.starLockLoginPage);
}, },
@ -132,7 +131,7 @@ class _StarLockMainState extends State<StarLockMain> with BaseWidget {
], ],
), ),
SizedBox( SizedBox(
height: 30.h, height: 20.h,
), ),
Row( Row(
children: [ children: [

30
star_lock/lib/mine/about/about_page.dart
View File

@ -55,18 +55,36 @@ class _AbountPageState extends State<AbountPage> {
isHaveLine: false, isHaveLine: false,
isHaveDirection: true, isHaveDirection: true,
action: () {}), action: () {}),
Divider(
height: 1,
color: AppColors.greyLineColor,
indent: 20.w,
endIndent: 20.w,
),
CommonItem( CommonItem(
leftTitel: TranslationLoader.lanKeys!.userAgreement!.tr, leftTitel: TranslationLoader.lanKeys!.userAgreement!.tr,
rightTitle: "", rightTitle: "",
isHaveLine: false, isHaveLine: false,
isHaveDirection: true, isHaveDirection: true,
action: () {}), action: () {}),
Divider(
height: 1,
color: AppColors.greyLineColor,
indent: 20.w,
endIndent: 20.w,
),
CommonItem( CommonItem(
leftTitel: TranslationLoader.lanKeys!.privacyPolicy!.tr, leftTitel: TranslationLoader.lanKeys!.privacyPolicy!.tr,
rightTitle: "", rightTitle: "",
isHaveLine: false, isHaveLine: false,
isHaveDirection: true, isHaveDirection: true,
action: () {}), action: () {}),
Divider(
height: 1,
color: AppColors.greyLineColor,
indent: 20.w,
endIndent: 20.w,
),
CommonItem( CommonItem(
leftTitel: TranslationLoader leftTitel: TranslationLoader
.lanKeys!.personalInformationCollectionList!.tr, .lanKeys!.personalInformationCollectionList!.tr,
@ -74,6 +92,12 @@ class _AbountPageState extends State<AbountPage> {
isHaveLine: false, isHaveLine: false,
isHaveDirection: true, isHaveDirection: true,
action: () {}), action: () {}),
Divider(
height: 1,
color: AppColors.greyLineColor,
indent: 20.w,
endIndent: 20.w,
),
CommonItem( CommonItem(
leftTitel: TranslationLoader leftTitel: TranslationLoader
.lanKeys!.applicationPermissionDescription!.tr, .lanKeys!.applicationPermissionDescription!.tr,
@ -81,6 +105,12 @@ class _AbountPageState extends State<AbountPage> {
isHaveLine: false, isHaveLine: false,
isHaveDirection: true, isHaveDirection: true,
action: () {}), action: () {}),
Divider(
height: 1,
color: AppColors.greyLineColor,
indent: 20.w,
endIndent: 20.w,
),
CommonItem( CommonItem(
leftTitel: TranslationLoader leftTitel: TranslationLoader
.lanKeys!.thirdPartyInformationSharingList!.tr, .lanKeys!.thirdPartyInformationSharingList!.tr,

41
star_lock/lib/mine/addLock/nearbyLock/nearbyLock_page.dart
View File

@ -22,14 +22,23 @@ class _NearbyLockPageState extends State<NearbyLockPage> {
barTitle: TranslationLoader.lanKeys!.nearbyLock!.tr, barTitle: TranslationLoader.lanKeys!.nearbyLock!.tr,
haveBack: true, haveBack: true,
backgroundColor: AppColors.mainColor), backgroundColor: AppColors.mainColor),
body: ListView.builder( body: ListView.separated(
itemCount: 20, itemCount: 5,
itemBuilder: (c, index) { itemBuilder: (c, index) {
return nearbyLockItem( return nearbyLockItem(
'images/icon_lockGroup_item.png', "MCBN01-ea9240", () { 'images/icon_lockGroup_item.png', "MCBN01-ea9240", () {
Navigator.pushNamed(context, Routers.lockAddressPage); Navigator.pushNamed(context, Routers.lockAddressPage);
}); });
}), },
separatorBuilder: (BuildContext context, int index) {
return Divider(
height: 1,
color: AppColors.greyLineColor,
indent: 20.w,
endIndent: 0,
);
},
),
); );
} }
@ -41,15 +50,15 @@ class _NearbyLockPageState extends State<NearbyLockPage> {
// mainAxisAlignment: MainAxisAlignment.center, // mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
Container( Container(
height: 80.h, height: 89.h,
color: Colors.white, color: Colors.white,
child: Row( child: Row(
children: [ children: [
SizedBox(width: 20.w), SizedBox(width: 20.w),
Image.asset( Image.asset(
lockTypeIcon, lockTypeIcon,
width: 50.w, width: 56.w,
height: 50.w, height: 56.w,
), ),
SizedBox(width: 20.w), SizedBox(width: 20.w),
Column( Column(
@ -59,7 +68,7 @@ class _NearbyLockPageState extends State<NearbyLockPage> {
Text( Text(
lockTypeTitle, lockTypeTitle,
style: TextStyle( style: TextStyle(
fontSize: 20.sp, color: AppColors.darkGrayTextColor), fontSize: 20.sp, color: AppColors.blackColor),
), ),
], ],
), ),
@ -74,17 +83,13 @@ class _NearbyLockPageState extends State<NearbyLockPage> {
Expanded(child: SizedBox(width: 20.w)), Expanded(child: SizedBox(width: 20.w)),
Image.asset( Image.asset(
'images/main/icon_main_addLock.png', 'images/main/icon_main_addLock.png',
width: 28.w, width: 36.w,
height: 28.w, height: 36.w,
), ),
SizedBox(width: 30.w), SizedBox(width: 30.w),
], ],
), ),
), ),
Container(
height: 0.5.h,
color: Colors.grey,
)
], ],
), ),
); );

35
star_lock/lib/mine/gateway/addGateway/gatewayConfigurationWifi/gatewayConfigurationWifi_page.dart
View File

@ -37,7 +37,10 @@ class _GatewayConfigurationWifiPageState
color: const Color(0xFFF2F6F9), color: const Color(0xFFF2F6F9),
padding: EdgeInsets.all(15.h), padding: EdgeInsets.all(15.h),
child: Text( child: Text(
TranslationLoader.lanKeys!.gatewayConfigurationWifiTip!.tr)), TranslationLoader.lanKeys!.gatewayConfigurationWifiTip!.tr,
style: TextStyle(
color: AppColors.darkGrayTextColor, fontSize: 20.sp),
)),
Expanded( Expanded(
child: ListView( child: ListView(
children: [ children: [
@ -108,8 +111,8 @@ class _GatewayConfigurationWifiPageState
rightTitle: "", rightTitle: "",
isHaveLine: true, isHaveLine: true,
isHaveRightWidget: true, isHaveRightWidget: true,
rightWidget: Container( rightWidget: SizedBox(
width: 80.w, height: 50.h, child: _switch())), width: 60.w, height: 50.h, child: _switch())),
Visibility( Visibility(
visible: true, visible: true,
child: Column( child: Column(
@ -141,15 +144,18 @@ class _GatewayConfigurationWifiPageState
SizedBox( SizedBox(
height: 50.h, height: 50.h,
), ),
SubmitBtn( Container(
btnName: TranslationLoader.lanKeys!.sure!.tr, margin: EdgeInsets.only(left: 20.w, right: 20.w),
borderRadius: 20.w, child: SubmitBtn(
margin: EdgeInsets.only( btnName: TranslationLoader.lanKeys!.sure!.tr,
left: 30.w, right: 30.w, top: 20.w, bottom: 20.w), borderRadius: 20.w,
padding: EdgeInsets.only(top: 15.w, bottom: 15.w), margin: EdgeInsets.only(
onClick: () { left: 30.w, right: 30.w, top: 20.w, bottom: 20.w),
// Navigator.pushNamed(context, Routers.seletGatewayPage); padding: EdgeInsets.only(top: 15.w, bottom: 15.w),
}), onClick: () {
// Navigator.pushNamed(context, Routers.seletGatewayPage);
}),
),
SizedBox( SizedBox(
height: 10.h, height: 10.h,
), ),
@ -165,7 +171,7 @@ class _GatewayConfigurationWifiPageState
child: Text( child: Text(
TranslationLoader.lanKeys!.noStaticIPIsUsed!.tr, TranslationLoader.lanKeys!.noStaticIPIsUsed!.tr,
style: TextStyle( style: TextStyle(
fontSize: 28.sp, color: AppColors.mainColor)), fontSize: 22.sp, color: AppColors.mainColor)),
), ),
), ),
onTap: () { onTap: () {
@ -190,7 +196,7 @@ class _GatewayConfigurationWifiPageState
Widget getTFWidget(TextEditingController controller, String tfStr) { Widget getTFWidget(TextEditingController controller, String tfStr) {
return SizedBox( return SizedBox(
height: 50.h, height: 50.h,
width: 400.w, width: 300.w,
child: Row( child: Row(
children: [ children: [
Expanded( Expanded(
@ -204,6 +210,7 @@ class _GatewayConfigurationWifiPageState
//输入里面输入文字内边距设置 //输入里面输入文字内边距设置
contentPadding: const EdgeInsets.only(top: 12.0, bottom: 8.0), contentPadding: const EdgeInsets.only(top: 12.0, bottom: 8.0),
hintText: tfStr, hintText: tfStr,
hintStyle: TextStyle(fontSize: 22.sp),
//不需要输入框下划线 //不需要输入框下划线
border: InputBorder.none, border: InputBorder.none,
), ),

33
star_lock/lib/mine/gateway/gatewayList/gatewayList_page.dart
View File

@ -38,17 +38,26 @@ class _GatewayListPageState extends State<GatewayListPage> {
), ),
], ],
), ),
body: ListView.builder( body: ListView.separated(
itemCount: 10, itemCount: 5,
itemBuilder: (c, index) { itemBuilder: (c, index) {
return _gatewatListItem( return _gatewatListItem(
'images/mine/icon_mine_gatewayListMainIcon.png', 'images/mine/icon_mine_gatewayListMainIcon.png',
"星锁网关", "星锁网关",
"在线", "在线",
"2", () { "2", () {
Navigator.pushNamed(context, Routers.gatewayDetailPage); Navigator.pushNamed(context, Routers.gatewayDetailPage);
}); });
}), },
separatorBuilder: (BuildContext context, int index) {
return Divider(
height: 1,
color: AppColors.greyLineColor,
indent: 20.w,
endIndent: 0,
);
},
),
); );
} }
@ -58,7 +67,7 @@ class _GatewayListPageState extends State<GatewayListPage> {
onTap: action, onTap: action,
child: Container( child: Container(
// height: 100.h, // height: 100.h,
margin: const EdgeInsets.only(bottom: 2), // margin: const EdgeInsets.only(bottom: 2),
padding: padding:
EdgeInsets.only(left: 10.w, right: 20.w, top: 18.h, bottom: 18.h), EdgeInsets.only(left: 10.w, right: 20.w, top: 18.h, bottom: 18.h),
decoration: BoxDecoration( decoration: BoxDecoration(

30
star_lock/lib/mine/minePersonInfo/minePersonInfoSetSafetyProblem/minePersonInfoSetSafetyProblem_page.dart
View File

@ -114,23 +114,47 @@ class _MinePersonInfoSetSafetyProblemPageState
child: ListView( child: ListView(
children: <Widget>[ children: <Widget>[
ListTile( ListTile(
title: Text('你第一次乘坐飞机取得是哪个城市？', textAlign: TextAlign.center), title: Text(
'你第一次乘坐飞机取得是哪个城市？',
textAlign: TextAlign.center,
style: TextStyle(fontSize: 22.sp),
),
onTap: () { onTap: () {
Navigator.of(context).pop(true); Navigator.of(context).pop(true);
}, },
), ),
const Divider(
color: AppColors.greyLineColor,
height: 1,
),
ListTile( ListTile(
title: Text('你的QQ号码是多少', textAlign: TextAlign.center), title: Text(
'你的QQ号码是多少',
textAlign: TextAlign.center,
style: TextStyle(fontSize: 22.sp),
),
onTap: () { onTap: () {
Navigator.of(context).pop(true); Navigator.of(context).pop(true);
}, },
), ),
const Divider(
color: AppColors.greyLineColor,
height: 1,
),
ListTile( ListTile(
title: Text('你的第一个宠物叫什么名字', textAlign: TextAlign.center), title: Text(
'你的第一个宠物叫什么名字',
textAlign: TextAlign.center,
style: TextStyle(fontSize: 22.sp),
),
onTap: () { onTap: () {
Navigator.of(context).pop(true); Navigator.of(context).pop(true);
}, },
), ),
const Divider(
color: AppColors.greyLineColor,
height: 1,
),
], ],
), ),
); );

2
star_lock/lib/mine/mineSet/authorizedAdministrator/addAuthorizedAdministrator_page.dart
View File

@ -265,7 +265,7 @@ class _AddAuthorizedAdministratorPageState
leftTitel: TranslationLoader.lanKeys!.remoteUnlockingAllowed!.tr, leftTitel: TranslationLoader.lanKeys!.remoteUnlockingAllowed!.tr,
rightTitle: "", rightTitle: "",
isHaveRightWidget: true, isHaveRightWidget: true,
rightWidget: SizedBox(width: 80.w, height: 50.h, child: _switch()), rightWidget: SizedBox(width: 60.w, height: 50.h, child: _switch()),
action: () {}), action: () {}),
Container(height: 40.h), Container(height: 40.h),
], ],

2
star_lock/lib/mine/mineSet/authorizedAdministrator/authorizedAdministratorList_page.dart
View File

@ -100,7 +100,7 @@ class _AuthorizedAdministratorListPageState
return GestureDetector( return GestureDetector(
onTap: action, onTap: action,
child: Container( child: Container(
height: 90.h, height: 100.h,
margin: EdgeInsets.only(left: 20.w, right: 20.w, top: 20.w), margin: EdgeInsets.only(left: 20.w, right: 20.w, top: 20.w),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,

2
star_lock/lib/mine/mineSet/lockUserManage/lockUserManageList_page.dart
View File

@ -44,7 +44,7 @@ class _LockUserManageListListPageState
Expanded(child: _buildMainUI()), Expanded(child: _buildMainUI()),
SizedBox( SizedBox(
width: ScreenUtil().screenWidth - 40.w, width: ScreenUtil().screenWidth - 40.w,
height: 80.h, height: 90.h,
child: ElevatedButton( child: ElevatedButton(
style: ElevatedButton.styleFrom( style: ElevatedButton.styleFrom(
backgroundColor: Colors.white, backgroundColor: Colors.white,

6
star_lock/lib/mine/mineSet/mineSet_page.dart
View File

@ -39,21 +39,21 @@ class _MineSetPageState extends State<MineSetPage> {
isHaveLine: true, isHaveLine: true,
isHaveRightWidget: true, isHaveRightWidget: true,
rightWidget: SizedBox( rightWidget: SizedBox(
width: 10.w, height: 50.h, child: _switch())), width: 60.w, height: 50.h, child: _switch())),
CommonItem( CommonItem(
leftTitel: TranslationLoader.lanKeys!.touchUnlock!.tr, leftTitel: TranslationLoader.lanKeys!.touchUnlock!.tr,
rightTitle: "", rightTitle: "",
isHaveLine: true, isHaveLine: true,
isHaveRightWidget: true, isHaveRightWidget: true,
rightWidget: SizedBox( rightWidget: SizedBox(
width: 10.w, height: 50.h, child: _switch())), width: 60.w, height: 50.h, child: _switch())),
CommonItem( CommonItem(
leftTitel: leftTitel:
TranslationLoader.lanKeys!.pushNotification!.tr, TranslationLoader.lanKeys!.pushNotification!.tr,
rightTitle: "", rightTitle: "",
isHaveRightWidget: true, isHaveRightWidget: true,
rightWidget: SizedBox( rightWidget: SizedBox(
width: 10.w, height: 50.h, child: _switch())), width: 60.w, height: 50.h, child: _switch())),
SizedBox( SizedBox(
height: 10.h, height: 10.h,
), ),

2
star_lock/lib/mine/supportStaff/supportStaff_page.dart
View File

@ -125,7 +125,7 @@ class _SupportStaffPageState extends State<SupportStaffPage> {
isHaveLine! isHaveLine!
? Container( ? Container(
height: 0.5.h, height: 0.5.h,
color: Colors.grey, color: AppColors.greyLineColor,
) )
: Container() : Container()
], ],

7
star_lock/lib/mine/valueAddedServices/valueAddedServicesSMSTemplate/valueAddedServicesAddSMSTemplate/valueAddedServicesAddSMSTemplate_page.dart
View File

@ -102,6 +102,9 @@ class _ValueAddedServicesAddSMSTemplatePageState
// Navigator.pushNamed(context, Routers.sendElectronicKeyManagePage); // Navigator.pushNamed(context, Routers.sendElectronicKeyManagePage);
}), }),
), ),
SizedBox(
height: 40.h,
)
], ],
)); ));
} }
@ -248,8 +251,8 @@ class _ValueAddedServicesAddSMSTemplatePageState
children: [ children: [
Image.asset( Image.asset(
'images/icon_round_unSelet.png', 'images/icon_round_unSelet.png',
width: 30.w, width: 26.w,
height: 30.w, height: 26.w,
), ),
], ],
), ),

3
star_lock/lib/mine/valueAddedServices/valueAddedServicesSMSTemplate/valueAddedServicesListSMSTemplate/valueAddedServicesListSMSTemplate_page.dart
View File

@ -41,6 +41,9 @@ class _ValueAddedServicesListSMSTemplatePageState
Navigator.pushNamed( Navigator.pushNamed(
context, Routers.valueAddedServicesAddSMSTemplatePage); context, Routers.valueAddedServicesAddSMSTemplatePage);
}), }),
SizedBox(
height: 40.h,
)
], ],
), ),
); );

87
star_lock/lib/tools/submitBtn.dart
View File

@ -31,21 +31,20 @@ class SubmitBtn extends StatelessWidget {
bool? isDelete; bool? isDelete;
bool? isDisabled; bool? isDisabled;
SubmitBtn( SubmitBtn({
{Key? key, Key? key,
required this.btnName, required this.btnName,
this.borderRadius, this.borderRadius,
this.color, this.color,
this.padding, this.padding,
this.onClick, this.onClick,
this.margin, this.margin,
this.width, this.width,
this.backgroundColorList, this.backgroundColorList,
this.isDelete, this.isDelete,
this.fontSize, this.fontSize,
this.isDisabled, this.isDisabled,
}) }) : super(key: key);
: super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -54,7 +53,9 @@ class SubmitBtn extends StatelessWidget {
height: 60.h, height: 60.h,
child: ElevatedButton( child: ElevatedButton(
style: ElevatedButton.styleFrom( style: ElevatedButton.styleFrom(
backgroundColor: isDisabled == false ? Colors.grey : (isDelete == true ? Colors.red : AppColors.mainColor), backgroundColor: isDisabled == false
? Colors.grey
: (isDelete == true ? Colors.red : AppColors.mainColor),
), ),
onPressed: () { onPressed: () {
if (onClick != null) { if (onClick != null) {
@ -105,3 +106,57 @@ class SubmitBtn extends StatelessWidget {
*/ */
} }
} }
/*
* 底部添加白色按钮 公用组件
* */
class AddBottomWhiteBtn extends StatelessWidget {
String? btnName;
Function()? onClick;
AddBottomWhiteBtn({
Key? key,
required this.btnName,
this.onClick,
}) : super(key: key);
@override
Widget build(BuildContext context) {
return GestureDetector(
child: Container(
height: 90.h,
margin: EdgeInsets.only(left: 20.w, right: 20.w),
decoration: BoxDecoration(
color: Colors.white, borderRadius: BorderRadius.circular(8.w)),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Image.asset(
'images/icon_btn_add.png',
width: 28.w,
height: 28.w,
),
SizedBox(
width: 6.w,
),
Text(
btnName!,
style: TextStyle(
color: AppColors.mainColor,
fontSize: 24.sp,
fontWeight: FontWeight.bold),
)
],
),
),
onTap: () {
if (onClick != null) {
onClick!();
}
},
);
}
}