diff --git a/android/app/build.gradle b/android/app/build.gradle index ba317b90..4b34878c 100755 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -218,11 +218,9 @@ dependencies { implementation('com.amap.api:location:5.6.0') implementation('com.amap.api:3dmap:8.1.0') - implementation 'cn.jiguang.sdk:jpush:5.2.3' + implementation 'cn.jiguang.sdk:jpush:5.3.1' // 接入华为厂商 - implementation 'com.huawei.hms:push:6.12.0.300' - implementation 'cn.jiguang.sdk.plugin:huawei:5.2.3' - - - implementation 'cn.jiguang.sdk.plugin:xiaomi:5.2.3' + implementation 'com.huawei.hms:push:6.11.0.300' + implementation 'cn.jiguang.sdk.plugin:huawei:5.3.1' + implementation 'cn.jiguang.sdk.plugin:xiaomi:5.3.1' } diff --git a/android/build.gradle b/android/build.gradle index 2c4a5982..44ee774e 100755 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,10 +1,13 @@ buildscript { ext.kotlin_version = '1.8.20' repositories { + maven { url 'https://maven.aliyun.com/repository/public'} + maven { url 'https://maven.aliyun.com/repository/gradle-plugin'} google() mavenCentral() mavenLocal() // hms, 若不集成华为厂商通道,可直接跳过 +// maven { url 'https://maven.aliyun.com/repository/central'} maven { url 'https://developer.huawei.com/repo/'} // fcm, 若不集成 FCM 通道,可直接跳过 maven { url "https://maven.google.com" } @@ -25,6 +28,8 @@ buildscript { allprojects { repositories { + maven { url 'https://maven.aliyun.com/repository/public'} + maven { url 'https://maven.aliyun.com/repository/gradle-plugin'} google() mavenCentral() jcenter() diff --git a/lib/appRouters.dart b/lib/appRouters.dart index d2d4e3c3..858591c2 100755 --- a/lib/appRouters.dart +++ b/lib/appRouters.dart @@ -462,7 +462,7 @@ abstract class AppRouters { GetPage( name: Routers.starLockMain, page: () => F.sw( - defaultCall: () => StarLockMainPage(), + skyCall: () => StarLockMainPage(), xhjCall: () => const StarLockMainXHJPage()), ), GetPage( @@ -572,19 +572,19 @@ abstract class AppRouters { GetPage( name: Routers.starLockLoginPage, page: () => F.sw( - defaultCall: () => const StarLockLoginPage(), + skyCall: () => const StarLockLoginPage(), xhjCall: () => const StarLockLoginXHJPage()), ), GetPage( name: Routers.starLockRegisterPage, page: () => F.sw( - defaultCall: () => const StarLockRegisterPage(), + skyCall: () => const StarLockRegisterPage(), xhjCall: () => const StarLockRegisterXHJPage()), binding: StarLockRegisterBinding()), GetPage( name: Routers.starLockForgetPasswordPage, page: () => F.sw( - defaultCall: () => const StarLockForgetPasswordPage(), + skyCall: () => const StarLockForgetPasswordPage(), xhjCall: () => const StarLockForgetPasswordXHJPage()), ), GetPage( diff --git a/lib/app_settings/app_colors.dart b/lib/app_settings/app_colors.dart index a2def155..17be1c83 100755 --- a/lib/app_settings/app_colors.dart +++ b/lib/app_settings/app_colors.dart @@ -5,7 +5,7 @@ import 'package:star_lock/flavors.dart'; class AppColors { // static Color mainColor = const Color(0xFF385DEA); static Color get mainColor => F.sw( - defaultCall: () => const Color(0xFF4777EE), + skyCall: () => const Color(0xFF4777EE), xhjCall: () => const Color(0xFF68c1b9)); static Color mainBackgroundColor = const Color(0xFFF5F5F5); diff --git a/lib/flavors.dart b/lib/flavors.dart index 190f1a69..a429abef 100755 --- a/lib/flavors.dart +++ b/lib/flavors.dart @@ -32,19 +32,19 @@ class F { //便捷判断并返回值 static dynamic sw( - {required fCallFunction defaultCall, fCallFunction? xhjCall}) { + {required fCallFunction skyCall, required fCallFunction? xhjCall}) { if (xhjCall == null) { - return defaultCall(); + return skyCall(); } switch (appFlavor) { - case Flavor.xhj: - return xhjCall(); + case Flavor.sky: + return skyCall(); case Flavor.local: case Flavor.dev: case Flavor.pre: - case Flavor.sky: + case Flavor.xhj: default: - return defaultCall(); + return xhjCall(); } } @@ -72,7 +72,7 @@ class F { case Flavor.dev: return '${"starLock".tr}-dev'; case Flavor.pre: - return "starLock".tr; + return 'starLock'.tr; case Flavor.sky: return '锁通通'; case Flavor.xhj: @@ -94,8 +94,7 @@ class F { case Flavor.sky: return 'https://lock.skychip.top'; 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'; default: throw Exception('flavor[$name] apiPrefix not found'); diff --git a/lib/main/lockDetail/lockDetail/lockDetail_main_page.dart b/lib/main/lockDetail/lockDetail/lockDetail_main_page.dart index eb1d8703..57a5b20a 100755 --- a/lib/main/lockDetail/lockDetail/lockDetail_main_page.dart +++ b/lib/main/lockDetail/lockDetail/lockDetail_main_page.dart @@ -32,7 +32,7 @@ class _LockDetailMainPageState extends State { isOnlyOneData = obj["isOnlyOneData"]; return F.sw( - defaultCall: () => Scaffold( + skyCall: () => Scaffold( backgroundColor: Colors.white, appBar: TitleAppBar( barTitle: F.navTitle, diff --git a/lib/main/lockDetail/lockDetail/lockDetail_page.dart b/lib/main/lockDetail/lockDetail/lockDetail_page.dart index d9f2cb91..6faf4169 100755 --- a/lib/main/lockDetail/lockDetail/lockDetail_page.dart +++ b/lib/main/lockDetail/lockDetail/lockDetail_page.dart @@ -145,7 +145,7 @@ class _LockDetailPageState extends State @override Widget build(BuildContext context) { loadData(); - return F.sw(defaultCall: skWidget, xhjCall: xhjWidget); + return F.sw(skyCall: skWidget, xhjCall: xhjWidget); } //鑫泓佳布局 @@ -490,7 +490,7 @@ class _LockDetailPageState extends State return Column( children: [ F.sw( - defaultCall: () => SizedBox(height: 50.h), + skyCall: () => SizedBox(height: 50.h), xhjCall: () => Padding( padding: EdgeInsets.only( top: 12.h, @@ -584,7 +584,7 @@ class _LockDetailPageState extends State ], ), F.sw( - defaultCall: () => SizedBox(height: 30.h), + skyCall: () => SizedBox(height: 30.h), xhjCall: () => SizedBox(height: 15.h), ), Container( @@ -699,7 +699,7 @@ class _LockDetailPageState extends State SizedBox( height: 30.h, ), - F.sw(defaultCall: adminInfoView, xhjCall: () => const SizedBox()), + F.sw(skyCall: adminInfoView, xhjCall: () => const SizedBox()), SizedBox( height: 20.h, ), @@ -1147,7 +1147,7 @@ class _LockDetailPageState extends State Widget bottomItem( String iconUrl, String name, bool bottomBtnisEable, Function() onClick) { final Widget child = F.sw( - defaultCall: () => Container( + skyCall: () => Container( color: Colors.white, child: Column( crossAxisAlignment: CrossAxisAlignment.center, diff --git a/lib/main/lockMian/lockMain/lockMain_page.dart b/lib/main/lockMian/lockMain/lockMain_page.dart index 43ec0957..dea9f5db 100755 --- a/lib/main/lockMian/lockMain/lockMain_page.dart +++ b/lib/main/lockMian/lockMain/lockMain_page.dart @@ -116,7 +116,7 @@ class _StarLockMainPageState extends State with BaseWidget { ); } child = F.sw( - defaultCall: () => child, + skyCall: () => child, xhjCall: () => Container( decoration: const BoxDecoration( image: DecorationImage( @@ -133,7 +133,7 @@ class _StarLockMainPageState extends State with BaseWidget { Widget returnWidget; if (type == 1) { - type = F.sw(defaultCall: () => 1, xhjCall: () => 2); + type = F.sw(skyCall: () => 1, xhjCall: () => 2); } switch (type) { case 0: @@ -152,7 +152,7 @@ class _StarLockMainPageState extends State with BaseWidget { // 有多条数据 Storage.setBool(ifIsDemoModeOrNot, false); returnWidget = F.sw( - defaultCall: () => LockListPage( + skyCall: () => LockListPage( lockListInfoGroupEntity: state.lockListInfoGroupEntity.value), xhjCall: () => LockListXHJPage( lockListInfoGroupEntity: state.lockListInfoGroupEntity.value)); diff --git a/lib/mine/about/about_page.dart b/lib/mine/about/about_page.dart index 221a6c09..b688ccd4 100755 --- a/lib/mine/about/about_page.dart +++ b/lib/mine/about/about_page.dart @@ -50,7 +50,7 @@ class _AboutPageState extends State { return Scaffold( backgroundColor: AppColors.mainBackgroundColor, appBar: F.sw( - defaultCall: () => TitleAppBar( + skyCall: () => TitleAppBar( barTitle: TranslationLoader.lanKeys!.about!.tr, haveBack: true, backgroundColor: AppColors.mainColor, @@ -67,11 +67,11 @@ class _AboutPageState extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ F.sw( - defaultCall: () => logoView(), + skyCall: () => logoView(), xhjCall: () => const SizedBox()), listView(), F.sw( - defaultCall: () => const SizedBox(), + skyCall: () => const SizedBox(), xhjCall: () => logoView()), ], ), @@ -185,7 +185,7 @@ class _AboutPageState extends State { ], ); view = F.sw( - defaultCall: () => view, + skyCall: () => view, xhjCall: () => Container( margin: EdgeInsets.only(top: 20.h, left: 20.w, right: 20.w), decoration: BoxDecoration( @@ -221,7 +221,7 @@ class _AboutPageState extends State { borderRadius: BorderRadius.circular(20.r), child: Image.asset( F.sw( - defaultCall: () => "images/icon_main_1024.png", + skyCall: () => "images/icon_main_1024.png", xhjCall: () => "images/icon_main_xhj_1024.png"), width: 160.w, height: 160.w), diff --git a/lib/mine/about/webviewShow_page.dart b/lib/mine/about/webviewShow_page.dart index 425bd675..474ec986 100755 --- a/lib/mine/about/webviewShow_page.dart +++ b/lib/mine/about/webviewShow_page.dart @@ -26,7 +26,7 @@ class _WebviewShowPageState extends State { @override Widget build(BuildContext context) { state.webViewController.loadRequest(Uri.parse(state.webURL)); - return F.sw(defaultCall: () => defaultView(), xhjCall: () => xhjView()); + return F.sw(skyCall: () => defaultView(), xhjCall: () => xhjView()); } Widget defaultView() { diff --git a/lib/mine/addLock/addLock/addLock_page.dart b/lib/mine/addLock/addLock/addLock_page.dart index 55dd9fc4..7c9e2660 100755 --- a/lib/mine/addLock/addLock/addLock_page.dart +++ b/lib/mine/addLock/addLock/addLock_page.dart @@ -32,7 +32,7 @@ class _AddLockPageState extends State with BaseWidget { return Scaffold( backgroundColor: Colors.white, appBar: F.sw( - defaultCall: () => TitleAppBar( + skyCall: () => TitleAppBar( barTitle: TranslationLoader.lanKeys!.addLock!.tr, haveBack: true, backgroundColor: AppColors.mainColor, diff --git a/lib/mine/addLock/nearbyLock/nearbyLock_page.dart b/lib/mine/addLock/nearbyLock/nearbyLock_page.dart index cdf99f97..08000e35 100755 --- a/lib/mine/addLock/nearbyLock/nearbyLock_page.dart +++ b/lib/mine/addLock/nearbyLock/nearbyLock_page.dart @@ -28,7 +28,7 @@ class _NearbyLockPageState extends State with RouteAware { return Scaffold( backgroundColor: AppColors.mainBackgroundColor, appBar: F.sw( - defaultCall: () => TitleAppBar( + skyCall: () => TitleAppBar( barTitle: TranslationLoader.lanKeys!.nearbyLock!.tr, haveBack: true, backgroundColor: AppColors.mainColor, diff --git a/lib/mine/addLock/selectLockType/selectLockType_page.dart b/lib/mine/addLock/selectLockType/selectLockType_page.dart index 56e8b862..4b50c400 100755 --- a/lib/mine/addLock/selectLockType/selectLockType_page.dart +++ b/lib/mine/addLock/selectLockType/selectLockType_page.dart @@ -27,7 +27,7 @@ class _SelectLockTypePageState extends State return Scaffold( backgroundColor: AppColors.mainBackgroundColor, appBar: F.sw( - defaultCall: () => TitleAppBar( + skyCall: () => TitleAppBar( barTitle: TranslationLoader.lanKeys!.selectLockType!.tr, haveBack: true, backgroundColor: AppColors.mainColor, @@ -52,7 +52,7 @@ class _SelectLockTypePageState extends State //锁列表控件 Widget lockTypeList() { Widget view = F.sw( - defaultCall: () => GridView.count( + skyCall: () => GridView.count( crossAxisCount: 2, childAspectRatio: 2.83, crossAxisSpacing: 10, @@ -162,7 +162,7 @@ class _SelectLockTypePageState extends State //风格区分 view = F.sw( - defaultCall: () => Container( + skyCall: () => Container( height: 150.h, color: Colors.white, margin: const EdgeInsets.all(10), @@ -195,7 +195,7 @@ class _SelectLockTypePageState extends State child: Container( height: 120.h, decoration: F.sw( - defaultCall: () => const BoxDecoration( + skyCall: () => const BoxDecoration( color: Colors.white, ), xhjCall: () => BoxDecoration( diff --git a/lib/mine/mall/lockMall_page.dart b/lib/mine/mall/lockMall_page.dart index 0a123dbb..ef7614c6 100755 --- a/lib/mine/mall/lockMall_page.dart +++ b/lib/mine/mall/lockMall_page.dart @@ -39,13 +39,13 @@ class _LockMallPageState extends State { barTitle: getWebTitle(logic), haveBack: logic.state.canGoBack || logic.state.allowReturn, backgroundColor: F.sw( - defaultCall: () => AppColors.mainColor, + skyCall: () => AppColors.mainColor, xhjCall: () => Colors.white), titleColor: F.sw( - defaultCall: () => null, + skyCall: () => null, xhjCall: () => AppColors.blackColor), iconColor: F.sw( - defaultCall: () => null, + skyCall: () => null, xhjCall: () => AppColors.blackColor), backAction: () => logic.canGoBack(false), ) diff --git a/lib/mine/message/messageDetail/messageDetail_page.dart b/lib/mine/message/messageDetail/messageDetail_page.dart index 07fd571a..24d6b720 100755 --- a/lib/mine/message/messageDetail/messageDetail_page.dart +++ b/lib/mine/message/messageDetail/messageDetail_page.dart @@ -24,7 +24,7 @@ class _MessageDetailPageState extends State { return Scaffold( backgroundColor: AppColors.mainBackgroundColor, appBar: F.sw( - defaultCall: () => TitleAppBar( + skyCall: () => TitleAppBar( barTitle: "消息详情".tr, haveBack: true, backgroundColor: AppColors.mainColor, @@ -60,7 +60,7 @@ class _MessageDetailPageState extends State { style: TextStyle(fontSize: 22.sp, color: AppColors.placeholderTextColor), ); return F.sw( - defaultCall: () => view, + skyCall: () => view, xhjCall: () => Container( padding: EdgeInsets.only( top: 20.h, bottom: 20.h, left: 20.w, right: 20.w), diff --git a/lib/mine/minePersonInfo/minePersonInfoEditAccount/minePersonInfoEditAccount/mineUnbindPhoneOrEmail_page.dart b/lib/mine/minePersonInfo/minePersonInfoEditAccount/minePersonInfoEditAccount/mineUnbindPhoneOrEmail_page.dart index 25bbe8ae..1b6dcd70 100755 --- a/lib/mine/minePersonInfo/minePersonInfoEditAccount/minePersonInfoEditAccount/mineUnbindPhoneOrEmail_page.dart +++ b/lib/mine/minePersonInfo/minePersonInfoEditAccount/minePersonInfoEditAccount/mineUnbindPhoneOrEmail_page.dart @@ -28,7 +28,7 @@ class _MineUnbindPhoneOrEmailState extends State { return Scaffold( backgroundColor: AppColors.mainBackgroundColor, appBar: F.sw( - defaultCall: () => TitleAppBar( + skyCall: () => TitleAppBar( barTitle: TranslationLoader.lanKeys!.modifyAccount!.tr, haveBack: true, backgroundColor: AppColors.mainColor, diff --git a/lib/mine/minePersonInfo/minePersonInfoEditAccount/minePersonInfoEditAccountNext/minePersonInfoEditAccountNext_page.dart b/lib/mine/minePersonInfo/minePersonInfoEditAccount/minePersonInfoEditAccountNext/minePersonInfoEditAccountNext_page.dart index b3362b9a..ff8bb9d7 100755 --- a/lib/mine/minePersonInfo/minePersonInfoEditAccount/minePersonInfoEditAccountNext/minePersonInfoEditAccountNext_page.dart +++ b/lib/mine/minePersonInfo/minePersonInfoEditAccount/minePersonInfoEditAccountNext/minePersonInfoEditAccountNext_page.dart @@ -27,7 +27,7 @@ class _MinePersonInfoEditAccountNextPageState return Scaffold( backgroundColor: AppColors.mainBackgroundColor, appBar: F.sw( - defaultCall: () => TitleAppBar( + skyCall: () => TitleAppBar( barTitle: TranslationLoader.lanKeys!.modifyAccount!.tr, haveBack: true, backgroundColor: AppColors.mainColor, diff --git a/lib/mine/minePersonInfo/minePersonInfoEditName/minePersonInfoEditName_page.dart b/lib/mine/minePersonInfo/minePersonInfoEditName/minePersonInfoEditName_page.dart index f60d3493..ab1f17c7 100755 --- a/lib/mine/minePersonInfo/minePersonInfoEditName/minePersonInfoEditName_page.dart +++ b/lib/mine/minePersonInfo/minePersonInfoEditName/minePersonInfoEditName_page.dart @@ -28,7 +28,7 @@ class _MinePersonInfoEditNamePageState return Scaffold( backgroundColor: AppColors.greyBackgroundColor, appBar: F.sw( - defaultCall: () => TitleAppBar( + skyCall: () => TitleAppBar( barTitle: TranslationLoader.lanKeys!.changeNickName!.tr, haveBack: true, backgroundColor: AppColors.mainColor, @@ -97,7 +97,7 @@ class _MinePersonInfoEditNamePageState ], ); view = F.sw( - defaultCall: () => view, + skyCall: () => view, xhjCall: () => Container( margin: EdgeInsets.only(top: 20.h, left: 16.w, right: 16.w), padding: EdgeInsets.symmetric(vertical: 16.h, horizontal: 16.w), diff --git a/lib/mine/minePersonInfo/minePersonInfoEmail/mineBindPhoneOrEmail_page.dart b/lib/mine/minePersonInfo/minePersonInfoEmail/mineBindPhoneOrEmail_page.dart index b1b89894..7da0e4cf 100755 --- a/lib/mine/minePersonInfo/minePersonInfoEmail/mineBindPhoneOrEmail_page.dart +++ b/lib/mine/minePersonInfo/minePersonInfoEmail/mineBindPhoneOrEmail_page.dart @@ -30,7 +30,7 @@ class _MineBindPhoneOrEmailPageState extends State { return Scaffold( backgroundColor: AppColors.mainBackgroundColor, appBar: F.sw( - defaultCall: () => TitleAppBar( + skyCall: () => TitleAppBar( barTitle: state.channel.value == "1" ? TranslationLoader.lanKeys!.mobileNumber!.tr : TranslationLoader.lanKeys!.email!.tr, diff --git a/lib/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_page.dart b/lib/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_page.dart index 31fa127c..29716145 100755 --- a/lib/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_page.dart +++ b/lib/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_page.dart @@ -31,7 +31,7 @@ class _MinePersonInfoPageState extends State { Widget build(BuildContext context) { return Scaffold( backgroundColor: F.sw( - defaultCall: () => AppColors.mainBackgroundColor, + skyCall: () => AppColors.mainBackgroundColor, xhjCall: () => AppColors.mainBackgroundColor), appBar: widget.showAppBar ? TitleAppBar( @@ -42,7 +42,7 @@ class _MinePersonInfoPageState extends State { body: Column( children: [ F.sw( - defaultCall: () => SizedBox(), + skyCall: () => SizedBox(), xhjCall: () => Container( width: 1.sw, height: 0.2.sw, diff --git a/lib/mine/minePersonInfo/minePersonInfoResetPassword/minePersonInfoResetPassword_page.dart b/lib/mine/minePersonInfo/minePersonInfoResetPassword/minePersonInfoResetPassword_page.dart index 15fe701b..feb5d399 100755 --- a/lib/mine/minePersonInfo/minePersonInfoResetPassword/minePersonInfoResetPassword_page.dart +++ b/lib/mine/minePersonInfo/minePersonInfoResetPassword/minePersonInfoResetPassword_page.dart @@ -30,7 +30,7 @@ class _MinePersonInfoResetPasswordPageState return Scaffold( backgroundColor: AppColors.mainBackgroundColor, appBar: F.sw( - defaultCall: () => TitleAppBar( + skyCall: () => TitleAppBar( barTitle: TranslationLoader.lanKeys!.resetPasswords!.tr, haveBack: true, backgroundColor: AppColors.mainColor, @@ -140,7 +140,7 @@ class _MinePersonInfoResetPasswordPageState ], ); view = F.sw( - defaultCall: () => view, + skyCall: () => view, xhjCall: () => Container( margin: EdgeInsets.only( top: 20.h, diff --git a/lib/mine/minePersonInfo/minePersonInfoSetSafetyProblem/minePersonInfoSetSafetyProblem_page.dart b/lib/mine/minePersonInfo/minePersonInfoSetSafetyProblem/minePersonInfoSetSafetyProblem_page.dart index 6ff6bdb0..eaae73e9 100755 --- a/lib/mine/minePersonInfo/minePersonInfoSetSafetyProblem/minePersonInfoSetSafetyProblem_page.dart +++ b/lib/mine/minePersonInfo/minePersonInfoSetSafetyProblem/minePersonInfoSetSafetyProblem_page.dart @@ -37,7 +37,7 @@ class _MinePersonInfoSetSafetyProblemPageState return Scaffold( backgroundColor: AppColors.mainBackgroundColor, appBar: F.sw( - defaultCall: () => TitleAppBar( + skyCall: () => TitleAppBar( barTitle: TranslationLoader.lanKeys!.safetyProblem!.tr, haveBack: true, backgroundColor: AppColors.mainColor, @@ -137,7 +137,7 @@ class _MinePersonInfoSetSafetyProblemPageState ], ); view = F.sw( - defaultCall: () => view, + skyCall: () => view, xhjCall: () => Container( margin: EdgeInsets.only(top: 20.h, left: 20.w, right: 20.w), decoration: BoxDecoration( diff --git a/lib/mine/mineSet/mineSet/mineSet_page.dart b/lib/mine/mineSet/mineSet/mineSet_page.dart index ff9fb7c4..78bbcf3d 100755 --- a/lib/mine/mineSet/mineSet/mineSet_page.dart +++ b/lib/mine/mineSet/mineSet/mineSet_page.dart @@ -54,7 +54,7 @@ class _MineSetPageState extends State with WidgetsBindingObserver { return Scaffold( backgroundColor: AppColors.mainBackgroundColor, appBar: F.sw( - defaultCall: () => TitleAppBar( + skyCall: () => TitleAppBar( barTitle: TranslationLoader.lanKeys!.moreSet!.tr, haveBack: true, backgroundColor: AppColors.mainColor, @@ -76,7 +76,7 @@ class _MineSetPageState extends State with WidgetsBindingObserver { Widget styleHierarchy() { Widget view = getListDataView(); view = F.sw( - defaultCall: () => view, + skyCall: () => view, xhjCall: () => Container( margin: EdgeInsets.only( top: 20.h, left: 20.w, right: 20.w, bottom: 40.h), diff --git a/lib/starLockApplication/starLockApplication.dart b/lib/starLockApplication/starLockApplication.dart index 9892fc65..a1757e8a 100755 --- a/lib/starLockApplication/starLockApplication.dart +++ b/lib/starLockApplication/starLockApplication.dart @@ -42,20 +42,20 @@ class _StarLockApplicationState extends State { if (snapshot.data!) { // 如果用户已登录,返回主页面 return F.sw( - defaultCall: () => StarLockMainPage(), + skyCall: () => StarLockMainPage(), xhjCall: () => const StarLockMainXHJPage()); } else { // 如果用户未登录,返回登录页面 AppFirstEnterHandle().getAppFirstEnter(isAgreePrivacy); return F.sw( - defaultCall: () => const StarLockLoginPage(), + skyCall: () => const StarLockLoginPage(), xhjCall: () => const StarLockLoginXHJPage()); } } else { // 如果没有数据,返回一个空白的小部件 return F.sw( - defaultCall: () => const StarLockLoginPage(), + skyCall: () => const StarLockLoginPage(), xhjCall: () => const StarLockLoginXHJPage()); } }, diff --git a/lib/tools/appFirstEnterHandle.dart b/lib/tools/appFirstEnterHandle.dart index 7df8acf6..4e8d2ba8 100755 --- a/lib/tools/appFirstEnterHandle.dart +++ b/lib/tools/appFirstEnterHandle.dart @@ -51,7 +51,7 @@ class AppFirstEnterHandle { return PopScope( canPop: false, child: F.sw( - defaultCall: () => _defaultPrivacyAgreementAlert(context), + skyCall: () => _defaultPrivacyAgreementAlert(context), xhjCall: () => _xhjPrivacyAgreementAlert(context))); }, ); diff --git a/lib/tools/tf_loginInput.dart b/lib/tools/tf_loginInput.dart index d5df86e1..b98da00f 100755 --- a/lib/tools/tf_loginInput.dart +++ b/lib/tools/tf_loginInput.dart @@ -123,7 +123,7 @@ class _LoginInputState extends State { Padding( padding: EdgeInsets.only( top: - F.sw(defaultCall: () => 27.h, xhjCall: () => 39.h)), + F.sw(skyCall: () => 27.h, xhjCall: () => 39.h)), child: Text( pwd, style: TextStyle(