diff --git a/lib/main/lockDetail/authorizedAdmin/authorizedAdminList/authorizedAdminList_page.dart b/lib/main/lockDetail/authorizedAdmin/authorizedAdminList/authorizedAdminList_page.dart index 4faef337..cd1220d8 100755 --- a/lib/main/lockDetail/authorizedAdmin/authorizedAdminList/authorizedAdminList_page.dart +++ b/lib/main/lockDetail/authorizedAdmin/authorizedAdminList/authorizedAdminList_page.dart @@ -196,7 +196,7 @@ class _AuthorizedAdminListPageState extends State { onTap: action, child: Container( color: Colors.white, - height: 100.h, + padding: EdgeInsets.only(top: 20.h, bottom: 20.h), child: Row( children: [ SizedBox(width: 30.w), @@ -226,7 +226,7 @@ class _AuthorizedAdminListPageState extends State { children: [ Flexible( child: Text(receiveUser, - maxLines: 1, + maxLines: 3, overflow: TextOverflow.ellipsis, style: TextStyle( fontSize: 24.sp, diff --git a/lib/main/lockDetail/checkingIn/checkingInHolidays/checkingInAddHolidays/checkingInAddHolidays_page.dart b/lib/main/lockDetail/checkingIn/checkingInHolidays/checkingInAddHolidays/checkingInAddHolidays_page.dart index 4cad5ecd..45318c4e 100755 --- a/lib/main/lockDetail/checkingIn/checkingInHolidays/checkingInAddHolidays/checkingInAddHolidays_page.dart +++ b/lib/main/lockDetail/checkingIn/checkingInHolidays/checkingInAddHolidays/checkingInAddHolidays_page.dart @@ -44,7 +44,8 @@ class _CheckingInAddHolidaysPageState extends State { isHaveRightWidget: true, setHeight: false, rightWidget: getTFWidget( - '(${TranslationLoader.lanKeys!.mustFillIn!.tr})')), + '(${TranslationLoader.lanKeys!.mustFillIn!.tr})', + maxSize: 50)), Obx(() => CommonItem( leftTitel: TranslationLoader.lanKeys!.startDate!.tr, rightTitle: state.beginDate.value.isEmpty @@ -123,7 +124,7 @@ class _CheckingInAddHolidaysPageState extends State { ); } - Widget getTFWidget(String tfStr) { + Widget getTFWidget(String tfStr, {int maxSize = 30}) { return Expanded( child: TextField( //输入框一行 @@ -143,7 +144,7 @@ class _CheckingInAddHolidaysPageState extends State { isCollapsed: true, ), inputFormatters: [ - LengthLimitingTextInputFormatter(30), + LengthLimitingTextInputFormatter(maxSize), ], ), ); diff --git a/lib/main/lockDetail/checkingIn/checkingInList/checkingInList_page.dart b/lib/main/lockDetail/checkingIn/checkingInList/checkingInList_page.dart index 2e80f194..68b8ca4a 100755 --- a/lib/main/lockDetail/checkingIn/checkingInList/checkingInList_page.dart +++ b/lib/main/lockDetail/checkingIn/checkingInList/checkingInList_page.dart @@ -433,6 +433,8 @@ class _CheckingInListPageState extends State { Expanded( child: Text( name!, + maxLines: 3, + overflow: TextOverflow.ellipsis, style: TextStyle(fontSize: 24.sp), ), ), diff --git a/lib/main/lockDetail/electronicKey/electronicKeyList/electronicKeyList_page.dart b/lib/main/lockDetail/electronicKey/electronicKeyList/electronicKeyList_page.dart index 7820d81c..7359179c 100755 --- a/lib/main/lockDetail/electronicKey/electronicKeyList/electronicKeyList_page.dart +++ b/lib/main/lockDetail/electronicKey/electronicKeyList/electronicKeyList_page.dart @@ -245,7 +245,7 @@ class _ElectronicKeyListPageState extends State { onTap: action, child: Container( color: Colors.white, - height: 90.h, + padding: EdgeInsets.only(top: 20.h, bottom: 20.h), child: Row( children: [ SizedBox(width: 30.w), @@ -262,11 +262,6 @@ class _ElectronicKeyListPageState extends State { ), ), ), - // Image.asset( - // avatarURL, - // width: 60.w, - // height: 60.w, - // ), SizedBox(width: 20.w), Expanded( child: Column( @@ -281,7 +276,7 @@ class _ElectronicKeyListPageState extends State { children: [ Flexible( child: Text(receiveUser, - maxLines: 1, + maxLines: 3, overflow: TextOverflow.ellipsis, style: TextStyle( fontSize: 24.sp, diff --git a/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_page.dart b/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_page.dart index f47c378e..187a5f10 100755 --- a/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_page.dart +++ b/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_page.dart @@ -3,6 +3,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:star_lock/app_settings/app_colors.dart'; import 'package:star_lock/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_logic.dart'; +import 'package:star_lock/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_state.dart'; import 'package:star_lock/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/view/sendElectronicKeyView_page.dart'; import '../../../../../tools/CustomUnderlineTabIndicator.dart'; @@ -18,8 +19,8 @@ class SendElectronicKeyPage extends StatefulWidget { class _SendElectronicKeyPageState extends State with SingleTickerProviderStateMixin { - final logic = Get.put(SendElectronicKeyLogic()); - final state = Get.find().state; + final SendElectronicKeyLogic logic = Get.put(SendElectronicKeyLogic()); + final SendElectronicKeyState state = Get.find().state; @override void initState() { @@ -37,7 +38,7 @@ class _SendElectronicKeyPageState extends State haveBack: true, backgroundColor: AppColors.mainColor), body: Column( - children: [ + children: [ _tabBar(), _pageWidget(), ], @@ -48,10 +49,10 @@ class _SendElectronicKeyPageState extends State TabBar _tabBar() { return TabBar( controller: state.tabController, - onTap: (index) { + onTap: (int index) { FocusScope.of(context).requestFocus(FocusNode()); }, - tabs: _itemTabs.map((ItemView item) => _tab(item)).toList(), + tabs: _itemTabs.map(_tab).toList(), isScrollable: true, indicatorColor: Colors.red, unselectedLabelColor: Colors.black, @@ -97,10 +98,10 @@ class _SendElectronicKeyPageState extends State } final List _itemTabs = [ - ItemView(title: TranslationLoader.lanKeys!.timeLimit!.tr, type: "0"), - ItemView(title: TranslationLoader.lanKeys!.permanent!.tr, type: "1"), - ItemView(title: TranslationLoader.lanKeys!.once!.tr, type: "2"), - ItemView(title: TranslationLoader.lanKeys!.circulation!.tr, type: "3"), + ItemView(title: TranslationLoader.lanKeys!.timeLimit!.tr, type: '0'), + ItemView(title: TranslationLoader.lanKeys!.permanent!.tr, type: '1'), + ItemView(title: TranslationLoader.lanKeys!.once!.tr, type: '2'), + ItemView(title: TranslationLoader.lanKeys!.circulation!.tr, type: '3'), ]; } diff --git a/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/view/sendElectronicKeyView_page.dart b/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/view/sendElectronicKeyView_page.dart index 654cc2df..a9cedb69 100755 --- a/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/view/sendElectronicKeyView_page.dart +++ b/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/view/sendElectronicKeyView_page.dart @@ -143,7 +143,8 @@ class _SendElectronicKeyViewState extends State rightTitle: '', isHaveRightWidget: true, rightWidget: getTFWidget( - false, TranslationLoader.lanKeys!.enterYourName!.tr, 2, logic)), + false, TranslationLoader.lanKeys!.enterYourName!.tr, 2, logic, + maxSize: 50)), Container(height: 10.h), ], ); @@ -441,7 +442,8 @@ class _SendElectronicKeyViewState extends State // 接受者信息输入框 Widget getTFWidget(bool isHaveBtn, String tfStr, int lineIndex, - SendElectronicKeyViewLogic logic) { + SendElectronicKeyViewLogic logic, + {int maxSize = 30}) { return SizedBox( height: 65.h, width: 320.w, @@ -454,7 +456,7 @@ class _SendElectronicKeyViewState extends State maxLines: 1, inputFormatters: [ FilteringTextInputFormatter.deny('\n'), - LengthLimitingTextInputFormatter(30), + LengthLimitingTextInputFormatter(maxSize), ], // controller: _controller, autofocus: false, diff --git a/lib/main/lockMian/lockMain/lockMain_page.dart b/lib/main/lockMian/lockMain/lockMain_page.dart index 393105f1..2d52b952 100755 --- a/lib/main/lockMian/lockMain/lockMain_page.dart +++ b/lib/main/lockMian/lockMain/lockMain_page.dart @@ -124,6 +124,23 @@ class _StarLockMainPageState extends State with BaseWidget { fit: BoxFit.cover, ), ), + // decoration: BoxDecoration( + // // 设置渐变 + // gradient: LinearGradient( + // // 渐变颜色列表 + // colors: [ + // AppColors.mainColor.withOpacity(0.8), // 左上角颜色 + // AppColors.mainColor.withOpacity(0.4), // 右上角颜色 + // Colors.white, // 右下角颜色 + // Colors.white, // 左下角颜色 + // ], + // // 渐变的起始和结束位置 + // begin: Alignment.topLeft, + // end: Alignment.bottomRight, + // // 颜色停靠点,对应颜色数组的索引位置 + // stops: [0.0, 0.23, 0.47, 1], + // ), + // ), child: child, )); return child; @@ -215,12 +232,15 @@ class _StarLockMainPageState extends State with BaseWidget { SizedBox( height: 160.h, ), - if (F.isLite) Container() else SubmitBtn( - btnName: '演示模式', - onClick: () { - Get.toNamed(Routers.demoModeLockDetailPage); - }, - ) + if (F.isLite) + Container() + else + SubmitBtn( + btnName: '演示模式', + onClick: () { + Get.toNamed(Routers.demoModeLockDetailPage); + }, + ) ], ), ],