修复星锁bug

This commit is contained in:
“DaisyWu” 2024-08-07 18:00:35 +08:00
parent 004a38b341
commit e97d78fe99
3 changed files with 36 additions and 29 deletions

View File

@ -1,4 +1,3 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
@ -79,7 +78,8 @@ class _StarLockRegisterPageState extends State<StarLockRegisterXHJPage> {
onTap: (int index) { onTap: (int index) {
state.isIphoneType.value = index == 0; state.isIphoneType.value = index == 0;
}, },
overlayColor: MaterialStateProperty.resolveWith((Set<MaterialState> states) { overlayColor: MaterialStateProperty.resolveWith(
(Set<MaterialState> states) {
return Colors.transparent; return Colors.transparent;
}), }),
dividerHeight: 0, dividerHeight: 0,
@ -113,24 +113,26 @@ class _StarLockRegisterPageState extends State<StarLockRegisterXHJPage> {
child: Obx(() => Container( child: Obx(() => Container(
color: Colors.white, color: Colors.white,
height: 70.h, height: 70.h,
child: Row( child: Visibility(
children: <Widget>[ visible: state.isIphoneType.value,
SizedBox(width: 5.w), child: Row(
Text(TranslationLoader.lanKeys!.countryAndRegion!.tr, children: <Widget>[
style: TextStyle( SizedBox(width: 5.w),
fontSize: 26.sp, color: AppColors.blackColor)), Text(TranslationLoader.lanKeys!.countryAndRegion!.tr,
SizedBox(width: 50.w), style: TextStyle(
Text( fontSize: 26.sp, color: AppColors.blackColor)),
state.isIphoneType.value SizedBox(width: 50.w),
? '${state.countryName.value} +${state.countryCode.value}' Text(
: state.countryName.value, state.isIphoneType.value
style: TextStyle( ? '${state.countryName.value} +${state.countryCode.value}'
fontSize: 26.sp, color: AppColors.mainColor), : state.countryName.value,
), style: TextStyle(
], fontSize: 26.sp, color: AppColors.mainColor),
), ),
],
)),
)), )),
), )
], ],
); );
} }
@ -270,10 +272,11 @@ class _StarLockRegisterPageState extends State<StarLockRegisterXHJPage> {
style: TextStyle( style: TextStyle(
color: AppColors.mainColor, fontSize: 20.sp)), color: AppColors.mainColor, fontSize: 20.sp)),
onTap: () { onTap: () {
Get.toNamed(Routers.webviewShowPage, arguments: <String, String>{ Get.toNamed(Routers.webviewShowPage,
'url': XSConstantMacro.userAgreementURL, arguments: <String, String>{
'title': '用户协议'.tr 'url': XSConstantMacro.userAgreementURL,
}); 'title': '用户协议'.tr
});
}, },
)), )),
WidgetSpan( WidgetSpan(
@ -284,10 +287,11 @@ class _StarLockRegisterPageState extends State<StarLockRegisterXHJPage> {
style: TextStyle( style: TextStyle(
color: AppColors.mainColor, fontSize: 20.sp)), color: AppColors.mainColor, fontSize: 20.sp)),
onTap: () { onTap: () {
Get.toNamed(Routers.webviewShowPage, arguments: <String, String>{ Get.toNamed(Routers.webviewShowPage,
'url': XSConstantMacro.privacyPolicyURL, arguments: <String, String>{
'title': '隐私政策'.tr 'url': XSConstantMacro.privacyPolicyURL,
}); 'title': '隐私政策'.tr
});
}, },
)), )),
], ],

View File

@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import '../../../../../../app_settings/app_colors.dart'; import '../../../../../../app_settings/app_colors.dart';
import '../../../../../../tools/titleAppBar.dart'; import '../../../../../../tools/titleAppBar.dart';
import '../../../../../../translations/trans_lib.dart';
import 'massSendElectronicKeyManage_tabbar.dart'; import 'massSendElectronicKeyManage_tabbar.dart';
class MassSendElectronicKeyManagePage extends StatefulWidget { class MassSendElectronicKeyManagePage extends StatefulWidget {

View File

@ -1,10 +1,10 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_native_contact_picker/flutter_native_contact_picker.dart'; import 'package:flutter_native_contact_picker/flutter_native_contact_picker.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; 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/lockUserList/lockUserList_entity.dart'; import 'package:star_lock/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/lockUserList/lockUserList_entity.dart';
import 'package:star_lock/tools/regexp_tool.dart'; import 'package:star_lock/tools/regexp_tool.dart';
import 'package:star_lock/translations/trans_lib.dart';
import '../../../../../../app_settings/app_colors.dart'; import '../../../../../../app_settings/app_colors.dart';
class MassSendReceiverCell extends StatefulWidget { class MassSendReceiverCell extends StatefulWidget {
@ -207,6 +207,10 @@ class _MassSendReceiverCellState extends State<MassSendReceiverCell> {
border: InputBorder.none, border: InputBorder.none,
), ),
onSubmitted: onSubmitted, onSubmitted: onSubmitted,
//
inputFormatters: <TextInputFormatter>[
LengthLimitingTextInputFormatter(50),
],
), ),
), ),
if (isContactPickerEnabled) if (isContactPickerEnabled)