diff --git a/images/icon_main_1024.png b/images/icon_main_1024.png deleted file mode 100755 index e8cdae88..00000000 Binary files a/images/icon_main_1024.png and /dev/null differ diff --git a/images/icon_main_sky_1024.png b/images/icon_main_sky_1024.png new file mode 100755 index 00000000..dd761bc4 Binary files /dev/null and b/images/icon_main_sky_1024.png differ diff --git a/lib/login/login/starLock_login_page.dart b/lib/login/login/starLock_login_page.dart index 671b746f..c34904dd 100755 --- a/lib/login/login/starLock_login_page.dart +++ b/lib/login/login/starLock_login_page.dart @@ -77,7 +77,7 @@ class _StarLockLoginPageState extends State { Container( padding: EdgeInsets.all(10.w), child: Center( - child: Image.asset('images/icon_main_1024.png', + child: Image.asset('images/icon_main_sky_1024.png', width: 110.w, height: 110.w))), SizedBox(height: 50.w), Obx(() => CommonItem( @@ -190,10 +190,11 @@ class _StarLockLoginPageState extends State { color: AppColors.mainColor, fontSize: 20.sp)), onTap: () { - Get.toNamed(Routers.webviewShowPage, arguments: { - 'url': XSConstantMacro.userAgreementURL, - 'title': '用户协议'.tr - }); + Get.toNamed(Routers.webviewShowPage, + arguments: { + 'url': XSConstantMacro.userAgreementURL, + 'title': '用户协议'.tr + }); }, )), WidgetSpan( @@ -205,10 +206,11 @@ class _StarLockLoginPageState extends State { color: AppColors.mainColor, fontSize: 20.sp)), onTap: () { - Get.toNamed(Routers.webviewShowPage, arguments: { - 'url': XSConstantMacro.privacyPolicyURL, - 'title': '隐私政策'.tr - }); + Get.toNamed(Routers.webviewShowPage, + arguments: { + 'url': XSConstantMacro.privacyPolicyURL, + 'title': '隐私政策'.tr + }); }, )), ], diff --git a/lib/mine/about/about_page.dart b/lib/mine/about/about_page.dart index b688ccd4..6f036f25 100755 --- a/lib/mine/about/about_page.dart +++ b/lib/mine/about/about_page.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; +import 'package:package_info_plus/package_info_plus.dart'; import 'package:star_lock/appRouters.dart'; import 'package:star_lock/common/XSConstantMacro/XSConstantMacro.dart'; -import 'package:package_info_plus/package_info_plus.dart'; import 'package:star_lock/mine/about/about_console.dart'; import '../../app_settings/app_colors.dart'; @@ -21,10 +21,10 @@ class AboutPage extends StatefulWidget { class _AboutPageState extends State { late PackageInfo packageInfo; - String appName = ""; - String packageName = ""; - String version = "-----"; - String buildNumber = "---"; + String appName = ''; + String packageName = ''; + String version = '-----'; + String buildNumber = '---'; @override void initState() { @@ -66,13 +66,9 @@ class _AboutPageState extends State { body: Column( crossAxisAlignment: CrossAxisAlignment.center, children: [ - F.sw( - skyCall: () => logoView(), - xhjCall: () => const SizedBox()), + F.sw(skyCall: logoView, xhjCall: () => const SizedBox()), listView(), - F.sw( - skyCall: () => const SizedBox(), - xhjCall: () => logoView()), + F.sw(skyCall: () => const SizedBox(), xhjCall: logoView), ], ), ); @@ -85,13 +81,13 @@ class _AboutPageState extends State { children: [ CommonItem( leftTitel: TranslationLoader.lanKeys!.introduce!.tr, - rightTitle: "", + rightTitle: '', isHaveLine: false, isHaveDirection: true, action: () { Navigator.pushNamed(context, Routers.webviewShowPage, arguments: { - "url": XSConstantMacro.introduceURL, - "title": '介绍'.tr + 'url': XSConstantMacro.introduceURL, + 'title': '介绍'.tr }); }), Divider( @@ -102,13 +98,13 @@ class _AboutPageState extends State { ), CommonItem( leftTitel: TranslationLoader.lanKeys!.userAgreement!.tr, - rightTitle: "", + rightTitle: '', isHaveLine: false, isHaveDirection: true, action: () { Get.toNamed(Routers.webviewShowPage, arguments: { - "url": XSConstantMacro.userAgreementURL, - "title": '用户协议'.tr + 'url': XSConstantMacro.userAgreementURL, + 'title': '用户协议'.tr }); }), Divider( @@ -119,13 +115,13 @@ class _AboutPageState extends State { ), CommonItem( leftTitel: TranslationLoader.lanKeys!.privacyPolicy!.tr, - rightTitle: "", + rightTitle: '', isHaveLine: false, isHaveDirection: true, action: () { Navigator.pushNamed(context, Routers.webviewShowPage, arguments: { - "url": XSConstantMacro.privacyPolicyURL, - "title": '隐私政策'.tr + 'url': XSConstantMacro.privacyPolicyURL, + 'title': '隐私政策'.tr }); }), Divider( @@ -137,13 +133,13 @@ class _AboutPageState extends State { CommonItem( leftTitel: TranslationLoader .lanKeys!.personalInformationCollectionList!.tr, - rightTitle: "", + rightTitle: '', isHaveLine: false, isHaveDirection: true, action: () { Navigator.pushNamed(context, Routers.webviewShowPage, arguments: { - "url": XSConstantMacro.collectionListURL, - "title": '个人信息收集清单'.tr + 'url': XSConstantMacro.collectionListURL, + 'title': '个人信息收集清单'.tr }); }), Divider( @@ -155,13 +151,13 @@ class _AboutPageState extends State { CommonItem( leftTitel: TranslationLoader.lanKeys!.applicationPermissionDescription!.tr, - rightTitle: "", + rightTitle: '', isHaveLine: false, isHaveDirection: true, action: () { Navigator.pushNamed(context, Routers.webviewShowPage, arguments: { - "url": XSConstantMacro.appPermissionDescURL, - "title": '应用权限说明'.tr + 'url': XSConstantMacro.appPermissionDescURL, + 'title': '应用权限说明'.tr }); }), Divider( @@ -173,13 +169,13 @@ class _AboutPageState extends State { CommonItem( leftTitel: TranslationLoader.lanKeys!.thirdPartyInformationSharingList!.tr, - rightTitle: "", + rightTitle: '', isHaveLine: false, isHaveDirection: true, action: () { Navigator.pushNamed(context, Routers.webviewShowPage, arguments: { - "url": XSConstantMacro.thirdPartyInfShareListURL, - "title": '第三方信息共享清单'.tr + 'url': XSConstantMacro.thirdPartyInfShareListURL, + 'title': '第三方信息共享清单'.tr }); }), ], @@ -221,14 +217,14 @@ class _AboutPageState extends State { borderRadius: BorderRadius.circular(20.r), child: Image.asset( F.sw( - skyCall: () => "images/icon_main_1024.png", - xhjCall: () => "images/icon_main_xhj_1024.png"), + skyCall: () => 'images/icon_main_sky_1024.png', + xhjCall: () => 'images/icon_main_xhj_1024.png'), width: 160.w, height: 160.w), ), SizedBox(height: 20.h), Text( - "${F.title} $version+$buildNumber", + '${F.title} $version+$buildNumber', style: TextStyle(fontSize: 24.sp, color: AppColors.blackColor), ), SizedBox(height: 20.h),