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

Merge branch 'release' of gitee.com:starlock-cn/app-starlock into release

Browse Source 
# Conflicts:
#	android/app/build.gradle
解决冲突
This commit is contained in:
Daisy 2024-05-28 10:43:43 +08:00
commit 855ce1fb18
25 changed files with 62 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
android/build.gradle
View File

@ -1,10 +1,13 @@
buildscript { buildscript {
ext.kotlin_version = '1.8.20' ext.kotlin_version = '1.8.20'
repositories { repositories {
maven { url 'https://maven.aliyun.com/repository/public'}
maven { url 'https://maven.aliyun.com/repository/gradle-plugin'}
google() google()
mavenCentral() mavenCentral()
mavenLocal() mavenLocal()
// hms， 若不集成华为厂商通道，可直接跳过 // hms， 若不集成华为厂商通道，可直接跳过
// maven { url 'https://maven.aliyun.com/repository/central'}
maven { url 'https://developer.huawei.com/repo/'} maven { url 'https://developer.huawei.com/repo/'}
// fcm， 若不集成 FCM 通道，可直接跳过 // fcm， 若不集成 FCM 通道，可直接跳过
maven { url "https://maven.google.com" } maven { url "https://maven.google.com" }
@ -25,6 +28,8 @@ buildscript {
allprojects { allprojects {
repositories { repositories {
maven { url 'https://maven.aliyun.com/repository/public'}
maven { url 'https://maven.aliyun.com/repository/gradle-plugin'}
google() google()
mavenCentral() mavenCentral()
jcenter() jcenter()

8
lib/appRouters.dart
View File

@ -462,7 +462,7 @@ abstract class AppRouters {
GetPage( GetPage(
name: Routers.starLockMain, name: Routers.starLockMain,
page: () => F.sw( page: () => F.sw(
defaultCall: () => StarLockMainPage(), skyCall: () => StarLockMainPage(),
xhjCall: () => const StarLockMainXHJPage()), xhjCall: () => const StarLockMainXHJPage()),
), ),
GetPage( GetPage(
@ -572,19 +572,19 @@ abstract class AppRouters {
GetPage( GetPage(
name: Routers.starLockLoginPage, name: Routers.starLockLoginPage,
page: () => F.sw( page: () => F.sw(
defaultCall: () => const StarLockLoginPage(), skyCall: () => const StarLockLoginPage(),
xhjCall: () => const StarLockLoginXHJPage()), xhjCall: () => const StarLockLoginXHJPage()),
), ),
GetPage( GetPage(
name: Routers.starLockRegisterPage, name: Routers.starLockRegisterPage,
page: () => F.sw( page: () => F.sw(
defaultCall: () => const StarLockRegisterPage(), skyCall: () => const StarLockRegisterPage(),
xhjCall: () => const StarLockRegisterXHJPage()), xhjCall: () => const StarLockRegisterXHJPage()),
binding: StarLockRegisterBinding()), binding: StarLockRegisterBinding()),
GetPage( GetPage(
name: Routers.starLockForgetPasswordPage, name: Routers.starLockForgetPasswordPage,
page: () => F.sw( page: () => F.sw(
defaultCall: () => const StarLockForgetPasswordPage(), skyCall: () => const StarLockForgetPasswordPage(),
xhjCall: () => const StarLockForgetPasswordXHJPage()), xhjCall: () => const StarLockForgetPasswordXHJPage()),
), ),
GetPage( GetPage(

2
lib/app_settings/app_colors.dart
View File

@ -5,7 +5,7 @@ import 'package:star_lock/flavors.dart';
class AppColors { class AppColors {
// static Color mainColor = const Color(0xFF385DEA); // static Color mainColor = const Color(0xFF385DEA);
static Color get mainColor => F.sw( static Color get mainColor => F.sw(
defaultCall: () => const Color(0xFF4777EE), skyCall: () => const Color(0xFF4777EE),
xhjCall: () => const Color(0xFF68c1b9)); xhjCall: () => const Color(0xFF68c1b9));
static Color mainBackgroundColor = const Color(0xFFF5F5F5); static Color mainBackgroundColor = const Color(0xFFF5F5F5);

17
lib/flavors.dart
View File

@ -32,19 +32,19 @@ class F {
//便捷判断并返回值 //便捷判断并返回值
static dynamic sw( static dynamic sw(
{required fCallFunction defaultCall, fCallFunction? xhjCall}) { {required fCallFunction skyCall, required fCallFunction? xhjCall}) {
if (xhjCall == null) { if (xhjCall == null) {
return defaultCall(); return skyCall();
} }
switch (appFlavor) { switch (appFlavor) {
case Flavor.xhj: case Flavor.sky:
return xhjCall(); return skyCall();
case Flavor.local: case Flavor.local:
case Flavor.dev: case Flavor.dev:
case Flavor.pre: case Flavor.pre:
case Flavor.sky: case Flavor.xhj:
default: default:
return defaultCall(); return xhjCall();
} }
} }
@ -72,7 +72,7 @@ class F {
case Flavor.dev: case Flavor.dev:
return '${"starLock".tr}-dev'; return '${"starLock".tr}-dev';
case Flavor.pre: case Flavor.pre:
return "starLock".tr; return 'starLock'.tr;
case Flavor.sky: case Flavor.sky:
return '锁通通'; return '锁通通';
case Flavor.xhj: case Flavor.xhj:
@ -94,8 +94,7 @@ class F {
case Flavor.sky: case Flavor.sky:
return 'https://lock.skychip.top'; return 'https://lock.skychip.top';
case Flavor.xhj: case Flavor.xhj:
return 'https://pre.lock.star-lock.cn'; return 'https://lock.xhjcn.ltd';
// return 'https://lock.xhjcn.ltd';
// return 'https://pre.lock.star-lock.cn'; // return 'https://pre.lock.star-lock.cn';
default: default:
throw Exception('flavor[$name] apiPrefix not found'); throw Exception('flavor[$name] apiPrefix not found');

2
lib/main/lockDetail/lockDetail/lockDetail_main_page.dart
View File

@ -32,7 +32,7 @@ class _LockDetailMainPageState extends State<LockDetailMainPage> {
isOnlyOneData = obj["isOnlyOneData"]; isOnlyOneData = obj["isOnlyOneData"];
return F.sw( return F.sw(
defaultCall: () => Scaffold( skyCall: () => Scaffold(
backgroundColor: Colors.white, backgroundColor: Colors.white,
appBar: TitleAppBar( appBar: TitleAppBar(
barTitle: F.navTitle, barTitle: F.navTitle,

10
lib/main/lockDetail/lockDetail/lockDetail_page.dart
View File

@ -145,7 +145,7 @@ class _LockDetailPageState extends State<LockDetailPage>
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
loadData(); loadData();
return F.sw(defaultCall: skWidget, xhjCall: xhjWidget); return F.sw(skyCall: skWidget, xhjCall: xhjWidget);
} }
//鑫泓佳布局 //鑫泓佳布局
@ -490,7 +490,7 @@ class _LockDetailPageState extends State<LockDetailPage>
return Column( return Column(
children: <Widget>[ children: <Widget>[
F.sw( F.sw(
defaultCall: () => SizedBox(height: 50.h), skyCall: () => SizedBox(height: 50.h),
xhjCall: () => Padding( xhjCall: () => Padding(
padding: EdgeInsets.only( padding: EdgeInsets.only(
top: 12.h, top: 12.h,
@ -584,7 +584,7 @@ class _LockDetailPageState extends State<LockDetailPage>
], ],
), ),
F.sw( F.sw(
defaultCall: () => SizedBox(height: 30.h), skyCall: () => SizedBox(height: 30.h),
xhjCall: () => SizedBox(height: 15.h), xhjCall: () => SizedBox(height: 15.h),
), ),
Container( Container(
@ -699,7 +699,7 @@ class _LockDetailPageState extends State<LockDetailPage>
SizedBox( SizedBox(
height: 30.h, height: 30.h,
), ),
F.sw(defaultCall: adminInfoView, xhjCall: () => const SizedBox()), F.sw(skyCall: adminInfoView, xhjCall: () => const SizedBox()),
SizedBox( SizedBox(
height: 20.h, height: 20.h,
), ),
@ -1147,7 +1147,7 @@ class _LockDetailPageState extends State<LockDetailPage>
Widget bottomItem( Widget bottomItem(
String iconUrl, String name, bool bottomBtnisEable, Function() onClick) { String iconUrl, String name, bool bottomBtnisEable, Function() onClick) {
final Widget child = F.sw( final Widget child = F.sw(
defaultCall: () => Container( skyCall: () => Container(
color: Colors.white, color: Colors.white,
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,

6
lib/main/lockMian/lockMain/lockMain_page.dart
View File

@ -116,7 +116,7 @@ class _StarLockMainPageState extends State<StarLockMainPage> with BaseWidget {
); );
} }
child = F.sw( child = F.sw(
defaultCall: () => child, skyCall: () => child,
xhjCall: () => Container( xhjCall: () => Container(
decoration: const BoxDecoration( decoration: const BoxDecoration(
image: DecorationImage( image: DecorationImage(
@ -133,7 +133,7 @@ class _StarLockMainPageState extends State<StarLockMainPage> with BaseWidget {
Widget returnWidget; Widget returnWidget;
if (type == 1) { if (type == 1) {
type = F.sw(defaultCall: () => 1, xhjCall: () => 2); type = F.sw(skyCall: () => 1, xhjCall: () => 2);
} }
switch (type) { switch (type) {
case 0: case 0:
@ -152,7 +152,7 @@ class _StarLockMainPageState extends State<StarLockMainPage> with BaseWidget {
// 有多条数据 // 有多条数据
Storage.setBool(ifIsDemoModeOrNot, false); Storage.setBool(ifIsDemoModeOrNot, false);
returnWidget = F.sw( returnWidget = F.sw(
defaultCall: () => LockListPage( skyCall: () => LockListPage(
lockListInfoGroupEntity: state.lockListInfoGroupEntity.value), lockListInfoGroupEntity: state.lockListInfoGroupEntity.value),
xhjCall: () => LockListXHJPage( xhjCall: () => LockListXHJPage(
lockListInfoGroupEntity: state.lockListInfoGroupEntity.value)); lockListInfoGroupEntity: state.lockListInfoGroupEntity.value));

10
lib/mine/about/about_page.dart
View File

@ -50,7 +50,7 @@ class _AboutPageState extends State<AboutPage> {
return Scaffold( return Scaffold(
backgroundColor: AppColors.mainBackgroundColor, backgroundColor: AppColors.mainBackgroundColor,
appBar: F.sw( appBar: F.sw(
defaultCall: () => TitleAppBar( skyCall: () => TitleAppBar(
barTitle: TranslationLoader.lanKeys!.about!.tr, barTitle: TranslationLoader.lanKeys!.about!.tr,
haveBack: true, haveBack: true,
backgroundColor: AppColors.mainColor, backgroundColor: AppColors.mainColor,
@ -67,11 +67,11 @@ class _AboutPageState extends State<AboutPage> {
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
F.sw( F.sw(
defaultCall: () => logoView(), skyCall: () => logoView(),
xhjCall: () => const SizedBox()), xhjCall: () => const SizedBox()),
listView(), listView(),
F.sw( F.sw(
defaultCall: () => const SizedBox(), skyCall: () => const SizedBox(),
xhjCall: () => logoView()), xhjCall: () => logoView()),
], ],
), ),
@ -185,7 +185,7 @@ class _AboutPageState extends State<AboutPage> {
], ],
); );
view = F.sw( view = F.sw(
defaultCall: () => view, skyCall: () => view,
xhjCall: () => Container( xhjCall: () => Container(
margin: EdgeInsets.only(top: 20.h, left: 20.w, right: 20.w), margin: EdgeInsets.only(top: 20.h, left: 20.w, right: 20.w),
decoration: BoxDecoration( decoration: BoxDecoration(
@ -221,7 +221,7 @@ class _AboutPageState extends State<AboutPage> {
borderRadius: BorderRadius.circular(20.r), borderRadius: BorderRadius.circular(20.r),
child: Image.asset( child: Image.asset(
F.sw( F.sw(
defaultCall: () => "images/icon_main_1024.png", skyCall: () => "images/icon_main_1024.png",
xhjCall: () => "images/icon_main_xhj_1024.png"), xhjCall: () => "images/icon_main_xhj_1024.png"),
width: 160.w, width: 160.w,
height: 160.w), height: 160.w),

2
lib/mine/about/webviewShow_page.dart
View File

@ -26,7 +26,7 @@ class _WebviewShowPageState extends State<WebviewShowPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
state.webViewController.loadRequest(Uri.parse(state.webURL)); state.webViewController.loadRequest(Uri.parse(state.webURL));
return F.sw(defaultCall: () => defaultView(), xhjCall: () => xhjView()); return F.sw(skyCall: () => defaultView(), xhjCall: () => xhjView());
} }
Widget defaultView() { Widget defaultView() {

2
lib/mine/addLock/addLock/addLock_page.dart
View File

@ -32,7 +32,7 @@ class _AddLockPageState extends State<AddLockPage> with BaseWidget {
return Scaffold( return Scaffold(
backgroundColor: Colors.white, backgroundColor: Colors.white,
appBar: F.sw( appBar: F.sw(
defaultCall: () => TitleAppBar( skyCall: () => TitleAppBar(
barTitle: TranslationLoader.lanKeys!.addLock!.tr, barTitle: TranslationLoader.lanKeys!.addLock!.tr,
haveBack: true, haveBack: true,
backgroundColor: AppColors.mainColor, backgroundColor: AppColors.mainColor,

2
lib/mine/addLock/nearbyLock/nearbyLock_page.dart
View File

@ -28,7 +28,7 @@ class _NearbyLockPageState extends State<NearbyLockPage> with RouteAware {
return Scaffold( return Scaffold(
backgroundColor: AppColors.mainBackgroundColor, backgroundColor: AppColors.mainBackgroundColor,
appBar: F.sw( appBar: F.sw(
defaultCall: () => TitleAppBar( skyCall: () => TitleAppBar(
barTitle: TranslationLoader.lanKeys!.nearbyLock!.tr, barTitle: TranslationLoader.lanKeys!.nearbyLock!.tr,
haveBack: true, haveBack: true,
backgroundColor: AppColors.mainColor, backgroundColor: AppColors.mainColor,

8
lib/mine/addLock/selectLockType/selectLockType_page.dart
View File

@ -27,7 +27,7 @@ class _SelectLockTypePageState extends State<SelectLockTypePage>
return Scaffold( return Scaffold(
backgroundColor: AppColors.mainBackgroundColor, backgroundColor: AppColors.mainBackgroundColor,
appBar: F.sw( appBar: F.sw(
defaultCall: () => TitleAppBar( skyCall: () => TitleAppBar(
barTitle: TranslationLoader.lanKeys!.selectLockType!.tr, barTitle: TranslationLoader.lanKeys!.selectLockType!.tr,
haveBack: true, haveBack: true,
backgroundColor: AppColors.mainColor, backgroundColor: AppColors.mainColor,
@ -52,7 +52,7 @@ class _SelectLockTypePageState extends State<SelectLockTypePage>
//锁列表控件 //锁列表控件
Widget lockTypeList() { Widget lockTypeList() {
Widget view = F.sw( Widget view = F.sw(
defaultCall: () => GridView.count( skyCall: () => GridView.count(
crossAxisCount: 2, crossAxisCount: 2,
childAspectRatio: 2.83, childAspectRatio: 2.83,
crossAxisSpacing: 10, crossAxisSpacing: 10,
@ -162,7 +162,7 @@ class _SelectLockTypePageState extends State<SelectLockTypePage>
//风格区分 //风格区分
view = F.sw( view = F.sw(
defaultCall: () => Container( skyCall: () => Container(
height: 150.h, height: 150.h,
color: Colors.white, color: Colors.white,
margin: const EdgeInsets.all(10), margin: const EdgeInsets.all(10),
@ -195,7 +195,7 @@ class _SelectLockTypePageState extends State<SelectLockTypePage>
child: Container( child: Container(
height: 120.h, height: 120.h,
decoration: F.sw( decoration: F.sw(
defaultCall: () => const BoxDecoration( skyCall: () => const BoxDecoration(
color: Colors.white, color: Colors.white,
), ),
xhjCall: () => BoxDecoration( xhjCall: () => BoxDecoration(

6
lib/mine/mall/lockMall_page.dart
View File

@ -39,13 +39,13 @@ class _LockMallPageState extends State<LockMallPage> {
barTitle: getWebTitle(logic), barTitle: getWebTitle(logic),
haveBack: logic.state.canGoBack || logic.state.allowReturn, haveBack: logic.state.canGoBack || logic.state.allowReturn,
backgroundColor: F.sw( backgroundColor: F.sw(
defaultCall: () => AppColors.mainColor, skyCall: () => AppColors.mainColor,
xhjCall: () => Colors.white), xhjCall: () => Colors.white),
titleColor: F.sw( titleColor: F.sw(
defaultCall: () => null, skyCall: () => null,
xhjCall: () => AppColors.blackColor), xhjCall: () => AppColors.blackColor),
iconColor: F.sw( iconColor: F.sw(
defaultCall: () => null, skyCall: () => null,
xhjCall: () => AppColors.blackColor), xhjCall: () => AppColors.blackColor),
backAction: () => logic.canGoBack(false), backAction: () => logic.canGoBack(false),
) )

4
lib/mine/message/messageDetail/messageDetail_page.dart
View File

@ -24,7 +24,7 @@ class _MessageDetailPageState extends State<MessageDetailPage> {
return Scaffold( return Scaffold(
backgroundColor: AppColors.mainBackgroundColor, backgroundColor: AppColors.mainBackgroundColor,
appBar: F.sw( appBar: F.sw(
defaultCall: () => TitleAppBar( skyCall: () => TitleAppBar(
barTitle: "消息详情".tr, barTitle: "消息详情".tr,
haveBack: true, haveBack: true,
backgroundColor: AppColors.mainColor, backgroundColor: AppColors.mainColor,
@ -60,7 +60,7 @@ class _MessageDetailPageState extends State<MessageDetailPage> {
style: TextStyle(fontSize: 22.sp, color: AppColors.placeholderTextColor), style: TextStyle(fontSize: 22.sp, color: AppColors.placeholderTextColor),
); );
return F.sw( return F.sw(
defaultCall: () => view, skyCall: () => view,
xhjCall: () => Container( xhjCall: () => Container(
padding: EdgeInsets.only( padding: EdgeInsets.only(
top: 20.h, bottom: 20.h, left: 20.w, right: 20.w), top: 20.h, bottom: 20.h, left: 20.w, right: 20.w),

2
lib/mine/minePersonInfo/minePersonInfoEditAccount/minePersonInfoEditAccount/mineUnbindPhoneOrEmail_page.dart
View File

@ -28,7 +28,7 @@ class _MineUnbindPhoneOrEmailState extends State<MineUnbindPhoneOrEmailPage> {
return Scaffold( return Scaffold(
backgroundColor: AppColors.mainBackgroundColor, backgroundColor: AppColors.mainBackgroundColor,
appBar: F.sw( appBar: F.sw(
defaultCall: () => TitleAppBar( skyCall: () => TitleAppBar(
barTitle: TranslationLoader.lanKeys!.modifyAccount!.tr, barTitle: TranslationLoader.lanKeys!.modifyAccount!.tr,
haveBack: true, haveBack: true,
backgroundColor: AppColors.mainColor, backgroundColor: AppColors.mainColor,

2
lib/mine/minePersonInfo/minePersonInfoEditAccount/minePersonInfoEditAccountNext/minePersonInfoEditAccountNext_page.dart
View File

@ -27,7 +27,7 @@ class _MinePersonInfoEditAccountNextPageState
return Scaffold( return Scaffold(
backgroundColor: AppColors.mainBackgroundColor, backgroundColor: AppColors.mainBackgroundColor,
appBar: F.sw( appBar: F.sw(
defaultCall: () => TitleAppBar( skyCall: () => TitleAppBar(
barTitle: TranslationLoader.lanKeys!.modifyAccount!.tr, barTitle: TranslationLoader.lanKeys!.modifyAccount!.tr,
haveBack: true, haveBack: true,
backgroundColor: AppColors.mainColor, backgroundColor: AppColors.mainColor,

4
lib/mine/minePersonInfo/minePersonInfoEditName/minePersonInfoEditName_page.dart
View File

@ -28,7 +28,7 @@ class _MinePersonInfoEditNamePageState
return Scaffold( return Scaffold(
backgroundColor: AppColors.greyBackgroundColor, backgroundColor: AppColors.greyBackgroundColor,
appBar: F.sw( appBar: F.sw(
defaultCall: () => TitleAppBar( skyCall: () => TitleAppBar(
barTitle: TranslationLoader.lanKeys!.changeNickName!.tr, barTitle: TranslationLoader.lanKeys!.changeNickName!.tr,
haveBack: true, haveBack: true,
backgroundColor: AppColors.mainColor, backgroundColor: AppColors.mainColor,
@ -97,7 +97,7 @@ class _MinePersonInfoEditNamePageState
], ],
); );
view = F.sw( view = F.sw(
defaultCall: () => view, skyCall: () => view,
xhjCall: () => Container( xhjCall: () => Container(
margin: EdgeInsets.only(top: 20.h, left: 16.w, right: 16.w), margin: EdgeInsets.only(top: 20.h, left: 16.w, right: 16.w),
padding: EdgeInsets.symmetric(vertical: 16.h, horizontal: 16.w), padding: EdgeInsets.symmetric(vertical: 16.h, horizontal: 16.w),

2
lib/mine/minePersonInfo/minePersonInfoEmail/mineBindPhoneOrEmail_page.dart
View File

@ -30,7 +30,7 @@ class _MineBindPhoneOrEmailPageState extends State<MineBindPhoneOrEmailPage> {
return Scaffold( return Scaffold(
backgroundColor: AppColors.mainBackgroundColor, backgroundColor: AppColors.mainBackgroundColor,
appBar: F.sw( appBar: F.sw(
defaultCall: () => TitleAppBar( skyCall: () => TitleAppBar(
barTitle: state.channel.value == "1" barTitle: state.channel.value == "1"
? TranslationLoader.lanKeys!.mobileNumber!.tr ? TranslationLoader.lanKeys!.mobileNumber!.tr
: TranslationLoader.lanKeys!.email!.tr, : TranslationLoader.lanKeys!.email!.tr,

4
lib/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_page.dart
View File

@ -31,7 +31,7 @@ class _MinePersonInfoPageState extends State<MinePersonInfoPage> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
backgroundColor: F.sw( backgroundColor: F.sw(
defaultCall: () => AppColors.mainBackgroundColor, skyCall: () => AppColors.mainBackgroundColor,
xhjCall: () => AppColors.mainBackgroundColor), xhjCall: () => AppColors.mainBackgroundColor),
appBar: widget.showAppBar appBar: widget.showAppBar
? TitleAppBar( ? TitleAppBar(
@ -42,7 +42,7 @@ class _MinePersonInfoPageState extends State<MinePersonInfoPage> {
body: Column( body: Column(
children: [ children: [
F.sw( F.sw(
defaultCall: () => SizedBox(), skyCall: () => SizedBox(),
xhjCall: () => Container( xhjCall: () => Container(
width: 1.sw, width: 1.sw,
height: 0.2.sw, height: 0.2.sw,

4
lib/mine/minePersonInfo/minePersonInfoResetPassword/minePersonInfoResetPassword_page.dart
View File

@ -30,7 +30,7 @@ class _MinePersonInfoResetPasswordPageState
return Scaffold( return Scaffold(
backgroundColor: AppColors.mainBackgroundColor, backgroundColor: AppColors.mainBackgroundColor,
appBar: F.sw( appBar: F.sw(
defaultCall: () => TitleAppBar( skyCall: () => TitleAppBar(
barTitle: TranslationLoader.lanKeys!.resetPasswords!.tr, barTitle: TranslationLoader.lanKeys!.resetPasswords!.tr,
haveBack: true, haveBack: true,
backgroundColor: AppColors.mainColor, backgroundColor: AppColors.mainColor,
@ -140,7 +140,7 @@ class _MinePersonInfoResetPasswordPageState
], ],
); );
view = F.sw( view = F.sw(
defaultCall: () => view, skyCall: () => view,
xhjCall: () => Container( xhjCall: () => Container(
margin: EdgeInsets.only( margin: EdgeInsets.only(
top: 20.h, top: 20.h,

4
lib/mine/minePersonInfo/minePersonInfoSetSafetyProblem/minePersonInfoSetSafetyProblem_page.dart
View File

@ -37,7 +37,7 @@ class _MinePersonInfoSetSafetyProblemPageState
return Scaffold( return Scaffold(
backgroundColor: AppColors.mainBackgroundColor, backgroundColor: AppColors.mainBackgroundColor,
appBar: F.sw( appBar: F.sw(
defaultCall: () => TitleAppBar( skyCall: () => TitleAppBar(
barTitle: TranslationLoader.lanKeys!.safetyProblem!.tr, barTitle: TranslationLoader.lanKeys!.safetyProblem!.tr,
haveBack: true, haveBack: true,
backgroundColor: AppColors.mainColor, backgroundColor: AppColors.mainColor,
@ -137,7 +137,7 @@ class _MinePersonInfoSetSafetyProblemPageState
], ],
); );
view = F.sw( view = F.sw(
defaultCall: () => view, skyCall: () => view,
xhjCall: () => Container( xhjCall: () => Container(
margin: EdgeInsets.only(top: 20.h, left: 20.w, right: 20.w), margin: EdgeInsets.only(top: 20.h, left: 20.w, right: 20.w),
decoration: BoxDecoration( decoration: BoxDecoration(

4
lib/mine/mineSet/mineSet/mineSet_page.dart
View File

@ -54,7 +54,7 @@ class _MineSetPageState extends State<MineSetPage> with WidgetsBindingObserver {
return Scaffold( return Scaffold(
backgroundColor: AppColors.mainBackgroundColor, backgroundColor: AppColors.mainBackgroundColor,
appBar: F.sw( appBar: F.sw(
defaultCall: () => TitleAppBar( skyCall: () => TitleAppBar(
barTitle: TranslationLoader.lanKeys!.moreSet!.tr, barTitle: TranslationLoader.lanKeys!.moreSet!.tr,
haveBack: true, haveBack: true,
backgroundColor: AppColors.mainColor, backgroundColor: AppColors.mainColor,
@ -76,7 +76,7 @@ class _MineSetPageState extends State<MineSetPage> with WidgetsBindingObserver {
Widget styleHierarchy() { Widget styleHierarchy() {
Widget view = getListDataView(); Widget view = getListDataView();
view = F.sw( view = F.sw(
defaultCall: () => view, skyCall: () => view,
xhjCall: () => Container( xhjCall: () => Container(
margin: EdgeInsets.only( margin: EdgeInsets.only(
top: 20.h, left: 20.w, right: 20.w, bottom: 40.h), top: 20.h, left: 20.w, right: 20.w, bottom: 40.h),

6
lib/starLockApplication/starLockApplication.dart
View File

@ -42,20 +42,20 @@ class _StarLockApplicationState extends State<StarLockApplication> {
if (snapshot.data!) { if (snapshot.data!) {
// 如果用户已登录，返回主页面 // 如果用户已登录，返回主页面
return F.sw( return F.sw(
defaultCall: () => StarLockMainPage(), skyCall: () => StarLockMainPage(),
xhjCall: () => const StarLockMainXHJPage()); xhjCall: () => const StarLockMainXHJPage());
} else { } else {
// 如果用户未登录，返回登录页面 // 如果用户未登录，返回登录页面
AppFirstEnterHandle().getAppFirstEnter(isAgreePrivacy); AppFirstEnterHandle().getAppFirstEnter(isAgreePrivacy);
return F.sw( return F.sw(
defaultCall: () => const StarLockLoginPage(), skyCall: () => const StarLockLoginPage(),
xhjCall: () => const StarLockLoginXHJPage()); xhjCall: () => const StarLockLoginXHJPage());
} }
} else { } else {
// 如果没有数据，返回一个空白的小部件 // 如果没有数据，返回一个空白的小部件
return F.sw( return F.sw(
defaultCall: () => const StarLockLoginPage(), skyCall: () => const StarLockLoginPage(),
xhjCall: () => const StarLockLoginXHJPage()); xhjCall: () => const StarLockLoginXHJPage());
} }
}, },

2
lib/tools/appFirstEnterHandle.dart
View File

@ -51,7 +51,7 @@ class AppFirstEnterHandle {
return PopScope( return PopScope(
canPop: false, canPop: false,
child: F.sw( child: F.sw(
defaultCall: () => _defaultPrivacyAgreementAlert(context), skyCall: () => _defaultPrivacyAgreementAlert(context),
xhjCall: () => _xhjPrivacyAgreementAlert(context))); xhjCall: () => _xhjPrivacyAgreementAlert(context)));
}, },
); );

2
lib/tools/tf_loginInput.dart
View File

@ -123,7 +123,7 @@ class _LoginInputState extends State<LoginInput> {
Padding( Padding(
padding: EdgeInsets.only( padding: EdgeInsets.only(
top: top:
F.sw(defaultCall: () => 27.h, xhjCall: () => 39.h)), F.sw(skyCall: () => 27.h, xhjCall: () => 39.h)),
child: Text( child: Text(
pwd, pwd,
style: TextStyle( style: TextStyle(