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

fix:修复鑫泓佳判断

Browse Source
This commit is contained in:
anfe 2024-04-29 15:13:13 +08:00
parent 2178a622db
commit dd87cb6243
2 changed files with 156 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

210
star_lock/lib/login/login/starLock_login_xhj_page.dart
View File

@ -23,7 +23,9 @@ class StarLockLoginXHJPage extends StatefulWidget {
class _StarLockLoginPageState extends State<StarLockLoginXHJPage> { class _StarLockLoginPageState extends State<StarLockLoginXHJPage> {
final logic = Get.put(StarLockLoginLogic()); final logic = Get.put(StarLockLoginLogic());
final state = Get.find<StarLockLoginLogic>().state; final state = Get
.find<StarLockLoginLogic>()
.state;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -65,11 +67,14 @@ class _StarLockLoginPageState extends State<StarLockLoginXHJPage> {
SizedBox( SizedBox(
width: 40.w, width: 40.w,
), ),
Text( Obx(() {
'${state.countryName.value} +${state.countryCode.value}', return Text(
style: TextStyle( '${state.countryName.value} +${state.countryCode
fontSize: 22.sp, color: AppColors.mainColor), .value}',
) style: TextStyle(
fontSize: 22.sp, color: AppColors.mainColor),
);
})
], ],
), ),
), ),
@ -109,7 +114,8 @@ class _StarLockLoginPageState extends State<StarLockLoginXHJPage> {
), ),
), ),
label: label:
"${TranslationLoader.lanKeys!.pleaseEnter!.tr}${TranslationLoader.lanKeys!.password!.tr}", "${TranslationLoader.lanKeys!.pleaseEnter!
.tr}${TranslationLoader.lanKeys!.password!.tr}",
inputFormatters: [ inputFormatters: [
LengthLimitingTextInputFormatter(20), LengthLimitingTextInputFormatter(20),
]), ]),
@ -125,83 +131,90 @@ class _StarLockLoginPageState extends State<StarLockLoginXHJPage> {
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: [ children: [
Obx( Obx(
() => Container( () =>
padding: EdgeInsets.only( Container(
left: 5.w, padding: EdgeInsets.only(
right: 10.w, left: 5.w,
), right: 10.w,
child: Image.asset( ),
state.agree.value child: Image.asset(
? 'images/icon_round_select.png' state.agree.value
: 'images/icon_round_unSelect.png', ? 'images/icon_round_select.png'
width: 20.w, : 'images/icon_round_unSelect.png',
height: 20.w, width: 20.w,
), height: 20.w,
), ),
),
), ),
Flexible( Flexible(
child: RichText( child: RichText(
text: TextSpan( text: TextSpan(
text: TranslationLoader.lanKeys!.readAndAgree!.tr, text: TranslationLoader.lanKeys!.readAndAgree!.tr,
style: TextStyle( style: TextStyle(
color: const Color(0xff333333), fontSize: 20.sp), color: const Color(0xff333333),
children: [ fontSize: 20.sp),
WidgetSpan( children: [
alignment: PlaceholderAlignment.middle, WidgetSpan(
child: GestureDetector( alignment: PlaceholderAlignment.middle,
child: Text( child: GestureDetector(
'《${TranslationLoader.lanKeys!.userAgreement!.tr}》', child: Text(
style: TextStyle( '《${TranslationLoader.lanKeys!
color: AppColors.mainColor, .userAgreement!.tr}》',
fontSize: 20.sp)), style: TextStyle(
onTap: () { color: AppColors.mainColor,
Get.toNamed(Routers.webviewShowPage, fontSize: 20.sp)),
arguments: { onTap: () {
"url": XSConstantMacro.userAgreementURL, Get.toNamed(Routers.webviewShowPage,
"title": '用户协议'.tr arguments: {
}); "url": XSConstantMacro
}, .userAgreementURL,
)), "title": '用户协议'.tr
WidgetSpan( });
alignment: PlaceholderAlignment.middle, },
child: GestureDetector( )),
child: Text( WidgetSpan(
'《${TranslationLoader.lanKeys!.privacyPolicy!.tr}》', alignment: PlaceholderAlignment.middle,
style: TextStyle( child: GestureDetector(
color: AppColors.mainColor, child: Text(
fontSize: 20.sp)), '《${TranslationLoader.lanKeys!
onTap: () { .privacyPolicy!.tr}》',
Get.toNamed(Routers.webviewShowPage, style: TextStyle(
arguments: { color: AppColors.mainColor,
"url": XSConstantMacro.privacyPolicyURL, fontSize: 20.sp)),
"title": '隐私政策'.tr onTap: () {
}); Get.toNamed(Routers.webviewShowPage,
}, arguments: {
)), "url": XSConstantMacro
], .privacyPolicyURL,
)), "title": '隐私政策'.tr
});
},
)),
],
)),
) )
], ],
), ),
), ),
), ),
SizedBox(height: 15.w), SizedBox(height: 15.w),
Obx(() => SubmitBtn( Obx(() =>
btnName: TranslationLoader.lanKeys!.login!.tr, SubmitBtn(
fontSize: 28.sp, btnName: TranslationLoader.lanKeys!.login!.tr,
borderRadius: 20.w, fontSize: 28.sp,
padding: EdgeInsets.only(top: 25.w, bottom: 25.w), borderRadius: 20.w,
isDisabled: state.canNext.value, padding: EdgeInsets.only(top: 25.w, bottom: 25.w),
onClick: state.canNext.value isDisabled: state.canNext.value,
? () { onClick: state.canNext.value
if (state.agree.value == false) { ? () {
logic.showToast('请先同意用户协议及隐私政策'.tr); if (state.agree.value == false) {
return; logic.showToast('请先同意用户协议及隐私政策'.tr);
} else { return;
logic.login(); } else {
} logic.login();
} }
: null)), }
: null)),
SizedBox(height: 10.h), SizedBox(height: 10.h),
ElevatedButton( ElevatedButton(
onPressed: () async { onPressed: () async {
@ -243,41 +256,40 @@ class _StarLockLoginPageState extends State<StarLockLoginXHJPage> {
), ),
Expanded( Expanded(
child: SizedBox( child: SizedBox(
width: 10.sp, width: 10.sp,
)), )),
F.isLite F.isLite
? Container() ? Container()
: GestureDetector( : GestureDetector(
child: SizedBox( child: SizedBox(
// width: 150.w, // width: 150.w,
height: 50.h, height: 50.h,
// color: Colors.red, // color: Colors.red,
child: Center( child: Center(
child: Text('演示模式'.tr, child: Text('演示模式'.tr,
style: TextStyle( style: TextStyle(
fontSize: 22.sp, fontSize: 22.sp,
color: AppColors.mainColor)), color: AppColors.mainColor)),
), ),
), ),
onTap: () { onTap: () {
Get.toNamed(Routers.demoModeLockDetailPage); Get.toNamed(Routers.demoModeLockDetailPage);
}, },
) )
], ],
), ),
], ],
)); ));
} }
Widget loginInput( Widget loginInput({TextEditingController? controller,
{TextEditingController? controller, List<TextInputFormatter>? inputFormatters,
List<TextInputFormatter>? inputFormatters, String? hintText,
String? hintText, bool? isHaveLeftWidget,
bool? isHaveLeftWidget, Widget? leftWidget,
Widget? leftWidget, String? label,
String? label, bool? isPwd,
bool? isPwd, BlockStrCallback? onchangeAction}) {
BlockStrCallback? onchangeAction}) {
return Container( return Container(
width: 1.sp, width: 1.sp,
child: Column( child: Column(

88
star_lock/lib/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_page.dart
View File

@ -39,49 +39,51 @@ class _MinePersonInfoPageState extends State<MinePersonInfoPage> {
: null, : null,
body: Column( body: Column(
children: [ children: [
Container( F.sw(
width: 1.sw, defaultCall: () => SizedBox(),
height: 0.2.sw, xhjCall: () => Container(
margin: EdgeInsets.symmetric(horizontal: 15.w), width: 1.sw,
padding: EdgeInsets.symmetric(horizontal: 25.w), height: 0.2.sw,
decoration: BoxDecoration( margin: EdgeInsets.symmetric(horizontal: 15.w),
image: const DecorationImage( padding: EdgeInsets.symmetric(horizontal: 25.w),
image: AssetImage('images/xhj_main_bg.jpg'), decoration: BoxDecoration(
fit: BoxFit.cover, image: const DecorationImage(
), image: AssetImage('images/xhj_main_bg.jpg'),
borderRadius: BorderRadius.circular(20.r), fit: BoxFit.cover,
boxShadow: [ ),
BoxShadow( borderRadius: BorderRadius.circular(20.r),
color: Colors.black.withOpacity(0.15), boxShadow: [
offset: const Offset(0, 0), BoxShadow(
blurRadius: 10.r, color: Colors.black.withOpacity(0.15),
spreadRadius: 0, offset: const Offset(0, 0),
), blurRadius: 10.r,
], spreadRadius: 0,
), ),
child: Column( ],
crossAxisAlignment: CrossAxisAlignment.start, ),
mainAxisAlignment: MainAxisAlignment.center, child: Column(
children: [ crossAxisAlignment: CrossAxisAlignment.start,
Text( mainAxisAlignment: MainAxisAlignment.center,
'系统设置', children: [
style: TextStyle( Text(
color: AppColors.blackColor, '系统设置',
fontSize: 28.sp, style: TextStyle(
fontWeight: FontWeight.w600, color: AppColors.blackColor,
), fontSize: 28.sp,
), fontWeight: FontWeight.w600,
Text( ),
'系统的全局配置在此项内进行设置', ),
style: TextStyle( Text(
color: AppColors.blackColor.withOpacity(0.6), '系统的全局配置在此项内进行设置',
fontSize: 20.sp, style: TextStyle(
fontWeight: FontWeight.w600, color: AppColors.blackColor.withOpacity(0.6),
), fontSize: 20.sp,
), fontWeight: FontWeight.w600,
], ),
), ),
), ],
),
)),
SizedBox( SizedBox(
height: 20.h, height: 20.h,
), ),