diff --git a/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart b/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart index 9307e4b6..da7878bd 100644 --- a/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart +++ b/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart @@ -251,7 +251,7 @@ class _LockDetailPageState extends State width: 100.r, height: 100.r, decoration: BoxDecoration( - color: Colors.white.withOpacity(0.9), + color: Colors.white, borderRadius: BorderRadius.circular(100.w), boxShadow: [ BoxShadow( diff --git a/star_lock/lib/mine/about/about_page.dart b/star_lock/lib/mine/about/about_page.dart index 17ae37cd..4d1f9a2c 100644 --- a/star_lock/lib/mine/about/about_page.dart +++ b/star_lock/lib/mine/about/about_page.dart @@ -56,148 +56,179 @@ class _AboutPageState extends State { body: Column( crossAxisAlignment: CrossAxisAlignment.center, children: [ - Align( - alignment: Alignment.topRight, - child: GestureDetector( - onTap: logic.handleTap, - child: Container( - color: Colors.transparent, - width: 80.w, - height: 80.h, - ), - ), - ), - SizedBox(height: 70.h), - Row(mainAxisAlignment: MainAxisAlignment.center, children: [ - Image.asset( - F.sw( - defaultCall: () => "images/icon_main_1024.png", - xhjCall: () => "images/icon_main_xhj_1024.png"), - width: 160.w, - height: 160.w), - ]), - SizedBox(height: 20.h), - Text( - "${F.title} $version+$buildNumber", - style: - TextStyle(fontSize: 24.sp, color: AppColors.blackColor), - ), - SizedBox(height: 20.h), - Text( - F.apiPrefix, - style: - TextStyle(fontSize: 24.sp, color: AppColors.blackColor), - ), - SizedBox( - height: 60.h, - ), - CommonItem( - leftTitel: TranslationLoader.lanKeys!.introduce!.tr, - rightTitle: "", - isHaveLine: false, - isHaveDirection: true, - action: () { - Navigator.pushNamed(context, Routers.webviewShowPage, - arguments: { - "url": XSConstantMacro.introduceURL, - "title": '介绍'.tr - }); - }), - Divider( - height: 1, - color: AppColors.greyLineColor, - indent: 20.w, - endIndent: 20.w, - ), - CommonItem( - leftTitel: TranslationLoader.lanKeys!.userAgreement!.tr, - rightTitle: "", - isHaveLine: false, - isHaveDirection: true, - action: () { - Get.toNamed(Routers.webviewShowPage, arguments: { - "url": XSConstantMacro.userAgreementURL, - "title": '用户协议'.tr - }); - }), - Divider( - height: 1, - color: AppColors.greyLineColor, - indent: 20.w, - endIndent: 20.w, - ), - CommonItem( - leftTitel: TranslationLoader.lanKeys!.privacyPolicy!.tr, - rightTitle: "", - isHaveLine: false, - isHaveDirection: true, - action: () { - Navigator.pushNamed(context, Routers.webviewShowPage, - arguments: { - "url": XSConstantMacro.privacyPolicyURL, - "title": '隐私政策'.tr - }); - }), - Divider( - height: 1, - color: AppColors.greyLineColor, - indent: 20.w, - endIndent: 20.w, - ), - CommonItem( - leftTitel: TranslationLoader - .lanKeys!.personalInformationCollectionList!.tr, - rightTitle: "", - isHaveLine: false, - isHaveDirection: true, - action: () { - Navigator.pushNamed(context, Routers.webviewShowPage, - arguments: { - "url": XSConstantMacro.collectionListURL, - "title": '个人信息收集清单'.tr - }); - }), - Divider( - height: 1, - color: AppColors.greyLineColor, - indent: 20.w, - endIndent: 20.w, - ), - CommonItem( - leftTitel: TranslationLoader - .lanKeys!.applicationPermissionDescription!.tr, - rightTitle: "", - isHaveLine: false, - isHaveDirection: true, - action: () { - Navigator.pushNamed(context, Routers.webviewShowPage, - arguments: { - "url": XSConstantMacro.appPermissionDescURL, - "title": '应用权限说明'.tr - }); - }), - Divider( - height: 1, - color: AppColors.greyLineColor, - indent: 20.w, - endIndent: 20.w, - ), - CommonItem( - leftTitel: TranslationLoader - .lanKeys!.thirdPartyInformationSharingList!.tr, - rightTitle: "", - isHaveLine: false, - isHaveDirection: true, - action: () { - Navigator.pushNamed(context, Routers.webviewShowPage, - arguments: { - "url": XSConstantMacro.thirdPartyInfShareListURL, - "title": '第三方信息共享清单'.tr - }); - }), + F.sw( + defaultCall: () => logoView(), + xhjCall: () => const SizedBox()), + listView(), + F.sw( + defaultCall: () => const SizedBox(), + xhjCall: () => logoView()), ], ), ); }); } + + //列表 + Widget listView() { + Widget view = Column( + children: [ + CommonItem( + leftTitel: TranslationLoader.lanKeys!.introduce!.tr, + rightTitle: "", + isHaveLine: false, + isHaveDirection: true, + action: () { + Navigator.pushNamed(context, Routers.webviewShowPage, arguments: { + "url": XSConstantMacro.introduceURL, + "title": '介绍'.tr + }); + }), + Divider( + height: 1, + color: AppColors.greyLineColor, + indent: 20.w, + endIndent: 20.w, + ), + CommonItem( + leftTitel: TranslationLoader.lanKeys!.userAgreement!.tr, + rightTitle: "", + isHaveLine: false, + isHaveDirection: true, + action: () { + Get.toNamed(Routers.webviewShowPage, arguments: { + "url": XSConstantMacro.userAgreementURL, + "title": '用户协议'.tr + }); + }), + Divider( + height: 1, + color: AppColors.greyLineColor, + indent: 20.w, + endIndent: 20.w, + ), + CommonItem( + leftTitel: TranslationLoader.lanKeys!.privacyPolicy!.tr, + rightTitle: "", + isHaveLine: false, + isHaveDirection: true, + action: () { + Navigator.pushNamed(context, Routers.webviewShowPage, arguments: { + "url": XSConstantMacro.privacyPolicyURL, + "title": '隐私政策'.tr + }); + }), + Divider( + height: 1, + color: AppColors.greyLineColor, + indent: 20.w, + endIndent: 20.w, + ), + CommonItem( + leftTitel: TranslationLoader + .lanKeys!.personalInformationCollectionList!.tr, + rightTitle: "", + isHaveLine: false, + isHaveDirection: true, + action: () { + Navigator.pushNamed(context, Routers.webviewShowPage, arguments: { + "url": XSConstantMacro.collectionListURL, + "title": '个人信息收集清单'.tr + }); + }), + Divider( + height: 1, + color: AppColors.greyLineColor, + indent: 20.w, + endIndent: 20.w, + ), + CommonItem( + leftTitel: + TranslationLoader.lanKeys!.applicationPermissionDescription!.tr, + rightTitle: "", + isHaveLine: false, + isHaveDirection: true, + action: () { + Navigator.pushNamed(context, Routers.webviewShowPage, arguments: { + "url": XSConstantMacro.appPermissionDescURL, + "title": '应用权限说明'.tr + }); + }), + Divider( + height: 1, + color: AppColors.greyLineColor, + indent: 20.w, + endIndent: 20.w, + ), + CommonItem( + leftTitel: + TranslationLoader.lanKeys!.thirdPartyInformationSharingList!.tr, + rightTitle: "", + isHaveLine: false, + isHaveDirection: true, + action: () { + Navigator.pushNamed(context, Routers.webviewShowPage, arguments: { + "url": XSConstantMacro.thirdPartyInfShareListURL, + "title": '第三方信息共享清单'.tr + }); + }), + ], + ); + view = F.sw( + defaultCall: () => view, + xhjCall: () => Container( + margin: EdgeInsets.only(top: 20.h, left: 20.w, right: 20.w), + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.all(Radius.circular(20.r))), + child: ClipRRect( + borderRadius: BorderRadius.circular(20.r), + child: view, + ), + )); + return view; + } + + //图标 + Widget logoView() { + return GetBuilder(builder: (AboutConsole logic) { + return Padding( + padding: EdgeInsets.only(top: 70.h, bottom: 60.h), + child: Column( + children: [ + Align( + alignment: Alignment.topRight, + child: GestureDetector( + onTap: logic.handleTap, + child: Container( + color: Colors.transparent, + width: 80.w, + height: 80.h, + ), + ), + ), + ClipRRect( + borderRadius: BorderRadius.circular(20.r), + child: Image.asset( + F.sw( + defaultCall: () => "images/icon_main_1024.png", + xhjCall: () => "images/icon_main_xhj_1024.png"), + width: 160.w, + height: 160.w), + ), + SizedBox(height: 20.h), + Text( + "${F.title} $version+$buildNumber", + style: TextStyle(fontSize: 24.sp, color: AppColors.blackColor), + ), + SizedBox(height: 20.h), + Text( + F.apiPrefix, + style: TextStyle(fontSize: 24.sp, color: AppColors.blackColor), + ), + ], + ), + ); + }); + } }