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

1，更新登录、注册、忘记密码模块UI

Browse Source
This commit is contained in:
Daisy 2023-07-29 10:58:26 +08:00
parent bb725a7592
commit f53921fa5d
7 changed files with 440 additions and 276 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

2
star_lock/images/lan/lan_keys.json
View File

@ -296,7 +296,7 @@
"whenAddingLockThePhoneMustBeNextToTheLock":"whenAddingLockThePhoneMustBeNextToTheLock", "whenAddingLockThePhoneMustBeNextToTheLock":"whenAddingLockThePhoneMustBeNextToTheLock",
"login":"login", "login":"login",
"register":"Register", "register":"register",
"forgetPassword":"forgetPassword", "forgetPassword":"forgetPassword",
"readAndAgree":"readAndAgree", "readAndAgree":"readAndAgree",
"verificationCode":"verificationCode", "verificationCode":"verificationCode",

160
star_lock/lib/login/forgetPassword/starLock_forgetPassword_page.dart
View File

@ -1,4 +1,3 @@
import 'dart:async'; import 'dart:async';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -17,10 +16,12 @@ class StarLockForgetPasswordPage extends StatefulWidget {
const StarLockForgetPasswordPage({Key? key}) : super(key: key); const StarLockForgetPasswordPage({Key? key}) : super(key: key);
@override @override
State<StarLockForgetPasswordPage> createState() => _StarLockForgetPasswordPageState(); State<StarLockForgetPasswordPage> createState() =>
_StarLockForgetPasswordPageState();
} }
class _StarLockForgetPasswordPageState extends State<StarLockForgetPasswordPage> { class _StarLockForgetPasswordPageState
extends State<StarLockForgetPasswordPage> {
final TextEditingController _phoneController = TextEditingController(); final TextEditingController _phoneController = TextEditingController();
final TextEditingController _pwdController = TextEditingController(); final TextEditingController _pwdController = TextEditingController();
final TextEditingController _codeController = TextEditingController(); final TextEditingController _codeController = TextEditingController();
@ -34,89 +35,129 @@ class _StarLockForgetPasswordPageState extends State<StarLockForgetPasswordPage>
return Scaffold( return Scaffold(
resizeToAvoidBottomInset: false, resizeToAvoidBottomInset: false,
backgroundColor: const Color(0xFFFFFFFF), backgroundColor: const Color(0xFFFFFFFF),
appBar: TitleAppBar(barTitle: "${TranslationLoader.lanKeys!.reset!.tr} ${TranslationLoader.lanKeys!.password!.tr}", haveBack:true, backgroundColor: AppColors.mainColor), appBar: TitleAppBar(
body:ListView( barTitle:
padding: EdgeInsets.only( "${TranslationLoader.lanKeys!.reset!.tr}${TranslationLoader.lanKeys!.password!.tr}",
top: 40.h, haveBack: true,
left: 40.w, backgroundColor: AppColors.mainColor),
right: 40.w body: ListView(
), padding: EdgeInsets.only(top: 40.h, left: 40.w, right: 40.w),
children: [ children: [
LoginInput(controller: _phoneController, LoginInput(
leftWidget:Padding( controller: _phoneController,
padding: EdgeInsets.only(top:30.w, bottom: 20.w, right: 20.w, left: 5.w), leftWidget: Padding(
child: Image.asset('images/main/icon_main_search.png', width: 40.w, height: 40.w,), padding: EdgeInsets.only(
top: 30.w, bottom: 20.w, right: 20.w, left: 5.w),
child: Image.asset(
'images/icon_login_account.png',
width: 36.w,
height: 36.w,
),
), ),
hintText: TranslationLoader.lanKeys!.pleaseEnterNumberOrEmail!.tr, hintText:
TranslationLoader.lanKeys!.pleaseEnterNumberOrEmail!.tr,
keyboardType: TextInputType.number, keyboardType: TextInputType.number,
inputFormatters: [ inputFormatters: [
FilteringTextInputFormatter.allow(RegExp('[0-9]')), FilteringTextInputFormatter.allow(RegExp('[0-9]')),
LengthLimitingTextInputFormatter(20), LengthLimitingTextInputFormatter(20),
]), ]),
SizedBox(height: 10.w), SizedBox(height: 10.h),
LoginInput( LoginInput(
controller: _pwdController, controller: _pwdController,
isPwd: true, isPwd: true,
leftWidget:Padding( leftWidget: Padding(
padding: EdgeInsets.only(top:30.w, bottom: 20.w, right: 20.w, left: 5.w), padding: EdgeInsets.only(
child: Image.asset('images/main/icon_main_search.png', width: 40.w, height: 40.w,), top: 30.w, bottom: 20.w, right: 20.w, left: 5.w),
child: Image.asset(
'images/icon_login_password.png',
width: 36.w,
height: 36.w,
),
), ),
hintText: "${TranslationLoader.lanKeys!.pleaseEnter!.tr} ${TranslationLoader.lanKeys!.password!.tr}", hintText:
"${TranslationLoader.lanKeys!.pleaseEnter!.tr}${TranslationLoader.lanKeys!.password!.tr}",
inputFormatters: [ inputFormatters: [
LengthLimitingTextInputFormatter(20), LengthLimitingTextInputFormatter(20),
]), ]),
SizedBox(height: 15.w), SizedBox(height: 15.w),
Text(TranslationLoader.lanKeys!.registerPasswordTip!.tr, style: TextStyle(color: const Color(0xFF999999), fontSize: 26.sp),), Text(
SizedBox(height: 10.w), TranslationLoader.lanKeys!.registerPasswordTip!.tr,
LoginInput( style: TextStyle(
controller: _pwdController, color: AppColors.placeholderTextColor, fontSize: 20.sp),
isPwd: true,
leftWidget:Padding(
padding: EdgeInsets.only(top:30.w, bottom: 20.w, right: 20.w, left: 5.w),
child: Image.asset('images/main/icon_main_search.png', width: 40.w, height: 40.w,),
),
hintText: "${TranslationLoader.lanKeys!.sure!.tr} ${TranslationLoader.lanKeys!.password!.tr}",
inputFormatters: [
LengthLimitingTextInputFormatter(20),
]
), ),
SizedBox(height: 10.w), SizedBox(height: 10.w),
LoginInput(
controller: _pwdController,
isPwd: true,
leftWidget: Padding(
padding: EdgeInsets.only(
top: 30.w, bottom: 20.w, right: 20.w, left: 5.w),
child: Image.asset(
'images/icon_login_password.png',
width: 36.w,
height: 36.w,
),
),
hintText:
"${TranslationLoader.lanKeys!.sure!.tr}${TranslationLoader.lanKeys!.password!.tr}",
inputFormatters: [
LengthLimitingTextInputFormatter(20),
]),
SizedBox(height: 10.h),
Row( Row(
children: [ children: [
Expanded( Expanded(
child: LoginInput( child: LoginInput(
controller: _codeController, controller: _codeController,
isPwd: true, isPwd: true,
leftWidget:Padding( leftWidget: Padding(
padding: EdgeInsets.only(top:30.w, bottom: 20.w, right: 20.w, left: 5.w), padding: EdgeInsets.only(
child: Image.asset('images/main/icon_main_search.png', width: 40.w, height: 40.w,), top: 30.w, bottom: 20.w, right: 20.w, left: 5.w),
), child: SizedBox(
hintText: "${TranslationLoader.lanKeys!.pleaseEnter!.tr} ${TranslationLoader.lanKeys!.verificationCode!.tr}", width: 36.w,
height: 36.w,
)
// Image.asset(
// 'images/main/icon_main_search.png',
// width: 40.w,
// height: 40.w,
// ),
),
hintText:
"${TranslationLoader.lanKeys!.pleaseEnter!.tr}${TranslationLoader.lanKeys!.verificationCode!.tr}",
inputFormatters: [ inputFormatters: [
LengthLimitingTextInputFormatter(20), LengthLimitingTextInputFormatter(20),
]), ]),
),
SizedBox(
width: 20.w,
), ),
SizedBox(width: 20.w,),
GestureDetector( GestureDetector(
child: Container( child: Container(
width: 180.w, width: 160.w,
height: 60.h, height: 60.h,
padding: EdgeInsets.all(5.h), padding: EdgeInsets.all(5.h),
decoration: BoxDecoration( decoration: BoxDecoration(
color: AppColors.mainColor, color: AppColors.mainColor,
borderRadius: BorderRadius.circular(5) borderRadius: BorderRadius.circular(5)),
),
child: Center( child: Center(
child: Text(_seconds==60?'${TranslationLoader.lanKeys!.getTip!.tr} ${TranslationLoader.lanKeys!.verificationCode!.tr}': (_seconds<10)?'0$_seconds s':'$_seconds s', textAlign:TextAlign.center, style: TextStyle( child: Text(
color: Colors.white, _seconds == 60
fontSize: 26.sp, ? '${TranslationLoader.lanKeys!.getTip!.tr}${TranslationLoader.lanKeys!.verificationCode!.tr}'
)), : (_seconds < 10)
? '0$_seconds s'
: '$_seconds s',
textAlign: TextAlign.center,
style: TextStyle(
color: Colors.white,
fontSize: 26.sp,
)),
), ),
), ),
onTap: (){ onTap: () {
if(_seconds==60){ if (_seconds == 60) {
// _setVerify(); // _setVerify();
}else{ } else {
// Toast.show(msg: '正在获取验证码'); // Toast.show(msg: '正在获取验证码');
} }
}, },
@ -124,13 +165,14 @@ class _StarLockForgetPasswordPageState extends State<StarLockForgetPasswordPage>
], ],
), ),
SizedBox(height: 50.w), SizedBox(height: 50.w),
SubmitBtn(btnName: "${TranslationLoader.lanKeys!.reset!.tr} ${TranslationLoader.lanKeys!.password!.tr}", fontSize: 30.sp, borderRadius: 20.w, padding: EdgeInsets.only(top: 25.w, bottom: 25.w), onClick: (){ SubmitBtn(
btnName:
}), "${TranslationLoader.lanKeys!.reset!.tr}${TranslationLoader.lanKeys!.password!.tr}",
fontSize: 30.sp,
borderRadius: 20.w,
padding: EdgeInsets.only(top: 25.w, bottom: 25.w),
onClick: () {}),
], ],
) ));
);
} }
} }

266
star_lock/lib/login/login/starLock_login_page.dart
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';
@ -25,133 +24,148 @@ class _StarLockLoginPageState extends State<StarLockLoginPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
resizeToAvoidBottomInset: false, resizeToAvoidBottomInset: false,
backgroundColor: const Color(0xFFFFFFFF), backgroundColor: const Color(0xFFFFFFFF),
appBar: TitleAppBar(barTitle: TranslationLoader.lanKeys!.login!.tr, haveBack:true, backgroundColor: AppColors.mainColor, actionsList: [ appBar: TitleAppBar(
TextButton( barTitle: TranslationLoader.lanKeys!.login!.tr,
child: Text(TranslationLoader.lanKeys!.register!.tr, style: const TextStyle(color: Colors.white),), haveBack: true,
onPressed: (){ backgroundColor: AppColors.mainColor,
Navigator.pushNamed(context, Routers.starLockRegisterPage); actionsList: [
},), TextButton(
],), child: Text(
body:ListView( TranslationLoader.lanKeys!.register!.tr,
padding: EdgeInsets.only( style: const TextStyle(color: Colors.white),
top: 120.h, ),
left: 40.w, onPressed: () {
right: 40.w Navigator.pushNamed(context, Routers.starLockRegisterPage);
},
),
],
), ),
children: [ body: ListView(
Container( padding: EdgeInsets.only(top: 120.h, left: 40.w, right: 40.w),
padding: EdgeInsets.all(10.w), children: [
child: Center( Container(
child: Image.asset('images/icon_main_1024.png', width: 150.w, height: 150.w) padding: EdgeInsets.all(10.w),
) child: Center(
), child: Image.asset('images/icon_main_1024.png',
SizedBox(height: 50.w), width: 110.w, height: 110.w))),
LoginInput( SizedBox(height: 50.w),
controller: _phoneController, LoginInput(
leftWidget:Padding( controller: _phoneController,
padding: EdgeInsets.only(top:30.w, bottom: 20.w, right: 20.w, left: 5.w), leftWidget: Padding(
child: Image.asset('images/main/icon_main_search.png', width: 40.w, height: 40.w,), padding: EdgeInsets.only(
), top: 30.w, bottom: 20.w, right: 20.w, left: 5.w),
hintText: TranslationLoader.lanKeys!.pleaseEnterNumberOrEmail!.tr, child: Image.asset(
keyboardType: TextInputType.number, 'images/icon_login_account.png',
inputFormatters: [ width: 36.w,
FilteringTextInputFormatter.allow(RegExp('[0-9]')), height: 36.w,
LengthLimitingTextInputFormatter(20),
]
),
SizedBox(height: 50.w),
LoginInput(
controller: _pwdController,
isPwd: true,
leftWidget:Padding(
padding: EdgeInsets.only(top:30.w, bottom: 20.w, right: 20.w, left: 5.w),
child: Image.asset('images/main/icon_main_search.png', width: 40.w, height: 40.w,),
),
hintText: "${TranslationLoader.lanKeys!.pleaseEnter!.tr} ${TranslationLoader.lanKeys!.password!.tr}",
inputFormatters: [
LengthLimitingTextInputFormatter(20),
]
),
SizedBox(height: 20.h),
Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
SizedBox(
height: 20.h,
width: 26.w,
child: Checkbox(value: false, onChanged: (value){
})
),
SizedBox(width: 15.w,),
Flexible(
child: RichText(
text: TextSpan(
text: TranslationLoader.lanKeys!.readAndAgree!.tr,
style: TextStyle(
color: const Color(0xff333333),
fontSize: 26.sp
),
children: [
WidgetSpan(
alignment: PlaceholderAlignment.middle,
child: GestureDetector(
child: Text('《${TranslationLoader.lanKeys!.userAgreement!.tr}》',style: TextStyle(
color: AppColors.mainColor,
fontSize: 26.sp
)),
onTap: (){
},
)
),
WidgetSpan(
alignment: PlaceholderAlignment.middle,
child: GestureDetector(
child: Text('《${TranslationLoader.lanKeys!.privacyPolicy!.tr}》',style: TextStyle(
color: AppColors.mainColor,
fontSize: 26.sp
)),
onTap: (){
},
)
),
],
)
),
)
],
),
SizedBox(height: 50.w),
SubmitBtn(btnName: TranslationLoader.lanKeys!.login!.tr, fontSize: 28.sp, borderRadius: 20.w, padding: EdgeInsets.only(top: 25.w, bottom: 25.w), onClick: (){
}),
SizedBox(height: 50.w),
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
GestureDetector(
child: SizedBox(
// width: 150.w,
height: 50.h,
// color: Colors.red,
child: Center(
child: Text('${TranslationLoader.lanKeys!.forgetPassword!.tr}？',style: TextStyle(fontSize: 24.sp)),
), ),
), ),
onTap: (){ hintText:
Navigator.pushNamed(context, Routers.starLockForgetPasswordPage); TranslationLoader.lanKeys!.pleaseEnterNumberOrEmail!.tr,
}, keyboardType: TextInputType.number,
) inputFormatters: [
], FilteringTextInputFormatter.allow(RegExp('[0-9]')),
), LengthLimitingTextInputFormatter(20),
], ]),
) SizedBox(height: 10.h),
); LoginInput(
controller: _pwdController,
isPwd: true,
leftWidget: Padding(
padding: EdgeInsets.only(
top: 30.w, bottom: 20.w, right: 20.w, left: 5.w),
child: Image.asset(
'images/icon_login_password.png',
width: 36.w,
height: 36.w,
),
),
hintText:
"${TranslationLoader.lanKeys!.pleaseEnter!.tr}${TranslationLoader.lanKeys!.password!.tr}",
inputFormatters: [
LengthLimitingTextInputFormatter(20),
]),
SizedBox(height: 20.h),
Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
Image.asset(
'images/icon_select_circle.png',
width: 28.w,
height: 28.w,
),
// SizedBox(
// height: 20.h,
// width: 26.w,
// child: Checkbox(value: false, onChanged: (value) {})),
SizedBox(
width: 15.w,
),
Flexible(
child: RichText(
text: TextSpan(
text: TranslationLoader.lanKeys!.readAndAgree!.tr,
style: TextStyle(
color: const Color(0xff333333), fontSize: 20.sp),
children: [
WidgetSpan(
alignment: PlaceholderAlignment.middle,
child: GestureDetector(
child: Text(
'《${TranslationLoader.lanKeys!.userAgreement!.tr}》',
style: TextStyle(
color: AppColors.mainColor,
fontSize: 20.sp)),
onTap: () {},
)),
WidgetSpan(
alignment: PlaceholderAlignment.middle,
child: GestureDetector(
child: Text(
'《${TranslationLoader.lanKeys!.privacyPolicy!.tr}》',
style: TextStyle(
color: AppColors.mainColor,
fontSize: 20.sp)),
onTap: () {},
)),
],
)),
)
],
),
SizedBox(height: 50.w),
SubmitBtn(
btnName: TranslationLoader.lanKeys!.login!.tr,
fontSize: 28.sp,
borderRadius: 20.w,
padding: EdgeInsets.only(top: 25.w, bottom: 25.w),
onClick: () {}),
SizedBox(height: 50.w),
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
GestureDetector(
child: SizedBox(
// width: 150.w,
height: 50.h,
// color: Colors.red,
child: Center(
child: Text(
'${TranslationLoader.lanKeys!.forgetPassword!.tr}？',
style: TextStyle(
fontSize: 22.sp, color: AppColors.mainColor)),
),
),
onTap: () {
Navigator.pushNamed(
context, Routers.starLockForgetPasswordPage);
},
)
],
),
],
));
} }
} }

286
star_lock/lib/login/register/starLock_register_page.dart
View File

@ -1,5 +1,5 @@
import 'dart:async'; import 'dart:async';
import 'dart:ffi';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
@ -22,7 +22,6 @@ class StarLockRegisterPage extends StatefulWidget {
} }
class _StarLockRegisterPageState extends State<StarLockRegisterPage> { class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
final logic = Get.find<StarLockRegisterLogic>(); final logic = Get.find<StarLockRegisterLogic>();
final state = Get.find<StarLockRegisterLogic>().state; final state = Get.find<StarLockRegisterLogic>().state;
@ -34,13 +33,12 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
return Scaffold( return Scaffold(
resizeToAvoidBottomInset: false, resizeToAvoidBottomInset: false,
backgroundColor: const Color(0xFFFFFFFF), backgroundColor: const Color(0xFFFFFFFF),
appBar: TitleAppBar(barTitle: TranslationLoader.lanKeys!.register!.tr, haveBack:true, backgroundColor: AppColors.mainColor), appBar: TitleAppBar(
body:ListView( barTitle: TranslationLoader.lanKeys!.register!.tr,
padding: EdgeInsets.only( haveBack: true,
top: 40.h, backgroundColor: AppColors.mainColor),
left: 40.w, body: ListView(
right: 40.w padding: EdgeInsets.only(top: 40.h, left: 40.w, right: 40.w),
),
children: [ children: [
topSeletCountryAndRegionWidget(), topSeletCountryAndRegionWidget(),
middleTFWidget(), middleTFWidget(),
@ -53,64 +51,73 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
borderRadius: 20.w, borderRadius: 20.w,
padding: EdgeInsets.only(top: 25.w, bottom: 25.w), padding: EdgeInsets.only(top: 25.w, bottom: 25.w),
isDisabled: state.canSub.value, isDisabled: state.canSub.value,
onClick: state.canSub.value ? (){ onClick: state.canSub.value
logic.register(); ? () {
}:null logic.register();
); }
: null);
}), }),
SizedBox(
height: 20.h,
),
_buildBottomAgreement()
], ],
) ));
);
} }
Widget topSeletCountryAndRegionWidget (){ Widget topSeletCountryAndRegionWidget() {
return Column( return Column(
children: [ children: [
SizedBox(height:50.h), SizedBox(height: 50.h),
Row( Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
Container( Container(
width: 420.w, width: 340.w,
height: 60.h, height: 60.h,
// color: Colors.red, // color: Colors.red,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(30.h)), borderRadius: BorderRadius.all(Radius.circular(30.h)),
border: const Border( border: const Border(
top: BorderSide(width: 1.0, color: Color(0xffC0C0C0)), top: BorderSide(width: 1.0, color: AppColors.greyLineColor),
left: BorderSide(width: 1.0, color: Color(0xffC0C0C0)), left:
right: BorderSide(width: 1.0, color: Color(0xffC0C0C0)), BorderSide(width: 1.0, color: AppColors.greyLineColor),
bottom: BorderSide(width: 1.0, color: Color(0xffC0C0C0)), right:
) BorderSide(width: 1.0, color: AppColors.greyLineColor),
), bottom:
BorderSide(width: 1.0, color: AppColors.greyLineColor),
)),
child: Row( child: Row(
children: [ children: [
GestureDetector( GestureDetector(
onTap: (){ onTap: () {},
},
child: Container( child: Container(
width: 210.w, width: 170.w,
height: 60.h, height: 60.h,
// color: Colors.red, // color: Colors.red,
decoration: BoxDecoration( decoration: BoxDecoration(
color: AppColors.mainColor, color: AppColors.mainColor,
borderRadius: BorderRadius.all(Radius.circular(30.h)), borderRadius:
BorderRadius.all(Radius.circular(30.h)),
border: const Border( border: const Border(
top: BorderSide(width: 1.0, color: Color(0xffC0C0C0)), top: BorderSide(
left: BorderSide(width: 1.0, color: Color(0xffC0C0C0)), width: 1.0, color: AppColors.greyLineColor),
right: BorderSide(width: 1.0, color: Color(0xffC0C0C0)), left: BorderSide(
bottom: BorderSide(width: 1.0, color: Color(0xffC0C0C0)), width: 1.0, color: AppColors.greyLineColor),
) right: BorderSide(
), width: 1.0, color: AppColors.greyLineColor),
child: Center(child: Text(TranslationLoader.lanKeys!.iphone!.tr, style: TextStyle(color: Colors.white),)) bottom: BorderSide(
), width: 1.0, color: AppColors.greyLineColor),
)),
child: Center(
child: Text(
TranslationLoader.lanKeys!.iphone!.tr,
style: TextStyle(color: Colors.white),
))),
), ),
Expanded( Expanded(
child: GestureDetector( child: GestureDetector(
onTap: (){ onTap: () {},
},
child: Container( child: Container(
height: 60.h, height: 60.h,
// color: Colors.red, // color: Colors.red,
@ -123,22 +130,26 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
// bottom: BorderSide(width: 1.0, color: Color(0xffC0C0C0)), // bottom: BorderSide(width: 1.0, color: Color(0xffC0C0C0)),
// ) // )
// ), // ),
child: Center(child: Text(TranslationLoader.lanKeys!.email!.tr, style: const TextStyle(color: Colors.black),)) child: Center(
), child: Text(
TranslationLoader.lanKeys!.email!.tr,
style: const TextStyle(color: Colors.black),
))),
), ),
), ),
], ],
), ),
), ),
], ],
), ),
SizedBox(height:60.h), SizedBox(height: 60.h),
GestureDetector( GestureDetector(
onTap: () async { onTap: () async {
Navigator.pushNamed(context, Routers.seletCountryRegionPage); Navigator.pushNamed(context, Routers.seletCountryRegionPage);
var result = await Navigator.pushNamed(context, Routers.seletCountryRegionPage); var result = await Navigator.pushNamed(
logic.state.countryCode.value = (result as Map<String, dynamic>)['code']; context, Routers.seletCountryRegionPage);
logic.state.countryCode.value =
(result as Map<String, dynamic>)['code'];
logic.state.countryId.value = result["countryId"]; logic.state.countryId.value = result["countryId"];
// print("路由返回值: ${result}, countryCode:${logic.state.countryCode} ,countryId:${logic.state.countryId}"); // print("路由返回值: ${result}, countryCode:${logic.state.countryCode} ,countryId:${logic.state.countryId}");
}, },
@ -148,27 +159,42 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
// 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:5.w), SizedBox(width: 5.w),
Expanded(child: Text(TranslationLoader.lanKeys!.countryAndRegion!.tr, style: TextStyle(fontSize: 26.sp))), Expanded(
SizedBox(width:20.w), child: Text(TranslationLoader.lanKeys!.countryAndRegion!.tr,
style: TextStyle(
fontSize: 26.sp, color: AppColors.blackColor))),
SizedBox(width: 20.w),
Row( Row(
mainAxisAlignment: MainAxisAlignment.end, mainAxisAlignment: MainAxisAlignment.end,
children: [ children: [
Text("中国+86", textAlign: TextAlign.end, style: TextStyle(fontSize: 26.sp),) Text(
"中国+86",
textAlign: TextAlign.end,
style: TextStyle(
fontSize: 26.sp, color: AppColors.blackColor),
)
], ],
), ),
SizedBox(width:5.w), SizedBox(width: 5.w),
Image.asset('images/icon_right.png', width: 50.w, height: 50.w,), Image.asset(
'images/icon_right.png',
width: 50.w,
height: 50.w,
),
], ],
), ),
), ),
), ),
Container(height: 0.5.h, color: Colors.grey,) Container(
height: 0.5.h,
color: Colors.grey,
)
], ],
); );
} }
Widget middleTFWidget (){ Widget middleTFWidget() {
return Column( return Column(
children: [ children: [
LoginInput( LoginInput(
@ -177,17 +203,21 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
print("3333333:${v}"); print("3333333:${v}");
logic.checkNext(state.phoneOrEmailController); logic.checkNext(state.phoneOrEmailController);
}, },
leftWidget:Padding( leftWidget: Padding(
padding: EdgeInsets.only(top:30.w, bottom: 20.w, right: 20.w, left: 5.w), padding: EdgeInsets.only(
child: Image.asset('images/main/icon_main_search.png', width: 40.w, height: 40.w,), top: 30.w, bottom: 20.w, right: 20.w, left: 5.w),
child: Image.asset(
'images/icon_login_account.png',
width: 40.w,
height: 40.w,
),
), ),
hintText: TranslationLoader.lanKeys!.pleaseEnterNumberOrEmail!.tr, hintText: TranslationLoader.lanKeys!.pleaseEnterNumberOrEmail!.tr,
keyboardType: TextInputType.number, keyboardType: TextInputType.number,
inputFormatters: [ inputFormatters: [
FilteringTextInputFormatter.allow(RegExp('[0-9]')), FilteringTextInputFormatter.allow(RegExp('[0-9]')),
LengthLimitingTextInputFormatter(20), LengthLimitingTextInputFormatter(20),
] ]),
),
SizedBox(height: 10.w), SizedBox(height: 10.w),
LoginInput( LoginInput(
controller: state.pwdController, controller: state.pwdController,
@ -195,17 +225,26 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
logic.checkNext(state.pwdController); logic.checkNext(state.pwdController);
}, },
isPwd: true, isPwd: true,
leftWidget:Padding( leftWidget: Padding(
padding: EdgeInsets.only(top:30.w, bottom: 20.w, right: 20.w, left: 5.w), padding: EdgeInsets.only(
child: Image.asset('images/main/icon_main_search.png', width: 40.w, height: 40.w,), top: 30.w, bottom: 20.w, right: 20.w, left: 5.w),
child: Image.asset(
'images/icon_login_password.png',
width: 40.w,
height: 40.w,
),
), ),
hintText: "${TranslationLoader.lanKeys!.pleaseEnter!.tr} ${TranslationLoader.lanKeys!.password!.tr}", hintText:
"${TranslationLoader.lanKeys!.pleaseEnter!.tr}${TranslationLoader.lanKeys!.password!.tr}",
inputFormatters: [ inputFormatters: [
LengthLimitingTextInputFormatter(20), LengthLimitingTextInputFormatter(20),
] ]),
),
SizedBox(height: 15.w), SizedBox(height: 15.w),
Text(TranslationLoader.lanKeys!.registerPasswordTip!.tr, style: TextStyle(color: const Color(0xFF999999), fontSize: 26.sp),), Text(
TranslationLoader.lanKeys!.registerPasswordTip!.tr,
style:
TextStyle(color: AppColors.placeholderTextColor, fontSize: 20.sp),
),
SizedBox(height: 10.w), SizedBox(height: 10.w),
LoginInput( LoginInput(
controller: state.sureController, controller: state.sureController,
@ -213,15 +252,20 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
logic.checkNext(state.sureController); logic.checkNext(state.sureController);
}, },
isPwd: true, isPwd: true,
leftWidget:Padding( leftWidget: Padding(
padding: EdgeInsets.only(top:30.w, bottom: 20.w, right: 20.w, left: 5.w), padding: EdgeInsets.only(
child: Image.asset('images/main/icon_main_search.png', width: 40.w, height: 40.w,), top: 30.w, bottom: 20.w, right: 20.w, left: 5.w),
child: Image.asset(
'images/icon_login_password.png',
width: 40.w,
height: 40.w,
),
), ),
hintText: "${TranslationLoader.lanKeys!.sure!.tr} ${TranslationLoader.lanKeys!.password!.tr}", hintText:
"${TranslationLoader.lanKeys!.sure!.tr}${TranslationLoader.lanKeys!.password!.tr}",
inputFormatters: [ inputFormatters: [
LengthLimitingTextInputFormatter(20), LengthLimitingTextInputFormatter(20),
] ]),
),
SizedBox(height: 10.w), SizedBox(height: 10.w),
Row( Row(
children: [ children: [
@ -232,17 +276,28 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
onchangeAction: (v) { onchangeAction: (v) {
logic.checkNext(state.codeController); logic.checkNext(state.codeController);
}, },
leftWidget:Padding( leftWidget: Padding(
padding: EdgeInsets.only(top:30.w, bottom: 20.w, right: 20.w, left: 5.w), padding: EdgeInsets.only(
child: Image.asset('images/main/icon_main_search.png', width: 40.w, height: 40.w,), top: 30.w, bottom: 20.w, right: 20.w, left: 5.w),
child: SizedBox(
width: 36.w,
height: 36.w,
),
// Image.asset(
// 'images/main/icon_main_search.png',
// width: 40.w,
// height: 40.w,
// ),
), ),
hintText: "${TranslationLoader.lanKeys!.pleaseEnter!.tr} ${TranslationLoader.lanKeys!.verificationCode!.tr}", hintText:
"${TranslationLoader.lanKeys!.pleaseEnter!.tr}${TranslationLoader.lanKeys!.verificationCode!.tr}",
inputFormatters: [ inputFormatters: [
LengthLimitingTextInputFormatter(20), LengthLimitingTextInputFormatter(20),
] ]),
), ),
SizedBox(
width: 20.w,
), ),
SizedBox(width: 20.w,),
GestureDetector( GestureDetector(
child: Container( child: Container(
width: 180.w, width: 180.w,
@ -250,20 +305,26 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
padding: EdgeInsets.all(5.h), padding: EdgeInsets.all(5.h),
decoration: BoxDecoration( decoration: BoxDecoration(
color: AppColors.mainColor, color: AppColors.mainColor,
borderRadius: BorderRadius.circular(5) borderRadius: BorderRadius.circular(5)),
),
child: Center( child: Center(
child: Text(_seconds==60?'${TranslationLoader.lanKeys!.getTip!.tr} ${TranslationLoader.lanKeys!.verificationCode!.tr}': (_seconds<10)?'0$_seconds s':'$_seconds s', textAlign:TextAlign.center, style: TextStyle( child: Text(
color: Colors.white, _seconds == 60
fontSize: 26.sp, ? '${TranslationLoader.lanKeys!.getTip!.tr}${TranslationLoader.lanKeys!.verificationCode!.tr}'
)), : (_seconds < 10)
? '0$_seconds s'
: '$_seconds s',
textAlign: TextAlign.center,
style: TextStyle(
color: Colors.white,
fontSize: 26.sp,
)),
), ),
), ),
onTap: (){ onTap: () {
Navigator.pushNamed(context, Routers.safetyVerificationPage); Navigator.pushNamed(context, Routers.safetyVerificationPage);
if(_seconds==60){ if (_seconds == 60) {
// _setVerify(); // _setVerify();
}else{ } else {
// Toast.show(msg: '正在获取验证码'); // Toast.show(msg: '正在获取验证码');
} }
}, },
@ -274,4 +335,51 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
], ],
); );
} }
Widget _buildBottomAgreement() {
return Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
Image.asset(
'images/icon_select_circle.png',
width: 28.w,
height: 28.w,
),
// SizedBox(
// height: 20.h,
// width: 26.w,
// child: Checkbox(value: false, onChanged: (value) {})),
SizedBox(
width: 15.w,
),
Flexible(
child: RichText(
text: TextSpan(
text: TranslationLoader.lanKeys!.readAndAgree!.tr,
style: TextStyle(color: const Color(0xff333333), fontSize: 20.sp),
children: [
WidgetSpan(
alignment: PlaceholderAlignment.middle,
child: GestureDetector(
child: Text(
'《${TranslationLoader.lanKeys!.userAgreement!.tr}》',
style: TextStyle(
color: AppColors.mainColor, fontSize: 20.sp)),
onTap: () {},
)),
WidgetSpan(
alignment: PlaceholderAlignment.middle,
child: GestureDetector(
child: Text(
'《${TranslationLoader.lanKeys!.privacyPolicy!.tr}》',
style: TextStyle(
color: AppColors.mainColor, fontSize: 20.sp)),
onTap: () {},
)),
],
)),
)
],
);
}
} }