diff --git a/assets/header/diamond_header.png b/assets/header/diamond_header.png new file mode 100644 index 0000000..e039187 Binary files /dev/null and b/assets/header/diamond_header.png differ diff --git a/assets/header/gold_header.png b/assets/header/gold_header.png new file mode 100644 index 0000000..bfb912a Binary files /dev/null and b/assets/header/gold_header.png differ diff --git a/assets/header/master_header.png b/assets/header/master_header.png new file mode 100644 index 0000000..1533331 Binary files /dev/null and b/assets/header/master_header.png differ diff --git a/assets/header/silver_header.png b/assets/header/silver_header.png new file mode 100644 index 0000000..9cbf295 Binary files /dev/null and b/assets/header/silver_header.png differ diff --git a/assets/header/vip_header.png b/assets/header/vip_header.png new file mode 100644 index 0000000..cfc6729 Binary files /dev/null and b/assets/header/vip_header.png differ diff --git a/lib/const/resource.dart b/lib/const/resource.dart index e4abd67..04af993 100644 --- a/lib/const/resource.dart +++ b/lib/const/resource.dart @@ -164,6 +164,24 @@ class R { /// ![preview](file:///Users/akufe/Desktop/recook_temp/assets/goodsdetail_bottom_share_white.png) static const String ASSETS_GOODSDETAIL_BOTTOM_SHARE_WHITE_PNG = 'assets/goodsdetail_bottom_share_white.png'; + /// ![preview](file:///Users/akufe/Desktop/recook_temp/assets/header/.DS_Store) + static const String ASSETS_HEADER__DS_STORE = 'assets/header/.DS_Store'; + + /// ![preview](file:///Users/akufe/Desktop/recook_temp/assets/header/diamond_header.png) + static const String ASSETS_HEADER_DIAMOND_HEADER_PNG = 'assets/header/diamond_header.png'; + + /// ![preview](file:///Users/akufe/Desktop/recook_temp/assets/header/gold_header.png) + static const String ASSETS_HEADER_GOLD_HEADER_PNG = 'assets/header/gold_header.png'; + + /// ![preview](file:///Users/akufe/Desktop/recook_temp/assets/header/master_header.png) + static const String ASSETS_HEADER_MASTER_HEADER_PNG = 'assets/header/master_header.png'; + + /// ![preview](file:///Users/akufe/Desktop/recook_temp/assets/header/silver_header.png) + static const String ASSETS_HEADER_SILVER_HEADER_PNG = 'assets/header/silver_header.png'; + + /// ![preview](file:///Users/akufe/Desktop/recook_temp/assets/header/vip_header.png) + static const String ASSETS_HEADER_VIP_HEADER_PNG = 'assets/header/vip_header.png'; + /// ![preview](file:///Users/akufe/Desktop/recook_temp/assets/home_formal.png) static const String ASSETS_HOME_FORMAL_PNG = 'assets/home_formal.png'; diff --git a/lib/pages/shopping_cart/shopping_cart_page.dart b/lib/pages/shopping_cart/shopping_cart_page.dart index b2a8766..d9f0e50 100644 --- a/lib/pages/shopping_cart/shopping_cart_page.dart +++ b/lib/pages/shopping_cart/shopping_cart_page.dart @@ -117,34 +117,48 @@ class _ShoppingCartPageState extends BaseStoreState _context = context; return Scaffold( backgroundColor: AppColor.tableViewGrayColor, - appBar: CustomAppBar( - appBackground: getAppBarColor(), - title: "购物车($_totalNum)", - actions: [ - CustomImageButton( - padding: EdgeInsets.only(right: rSize(10), top: rSize(5)), - title: !_manageStatus ? "管理" : "完成", - color: Colors.white, - fontSize: ScreenAdapterUtils.setSp(15), - onPressed: () { - if (_editting) { - FocusScope.of(context).requestFocus(FocusNode()); - return; - } - // 切换管理状态 重置所以数据到原始数据 - // for (ShoppingCartBrandModel _brandModel in _controller.getData()) { - // _brandModel.selected = false; - // for (ShoppingCartGoodsModel _goodsModel in _brandModel.children) { - // _goodsModel.selected = false; - // } - // } - // _checkAll = false; - // _selectedGoods.clear(); - _manageStatus = !_manageStatus; - setState(() {}); - }, - ) - ], + appBar: PreferredSize( + child: Stack( + children: [ + Image.asset( + UserLevelTool.currentAppBarBGImagePath(), + fit: BoxFit.cover, + width: double.infinity, + ), + AppBar( + backgroundColor: Colors.transparent, + elevation: 0, + centerTitle: true, + title: Text("购物车($_totalNum)"), + actions: [ + CustomImageButton( + padding: EdgeInsets.only(right: rSize(10), top: rSize(5)), + title: !_manageStatus ? "管理" : "完成", + color: Colors.white, + fontSize: ScreenAdapterUtils.setSp(15), + onPressed: () { + if (_editting) { + FocusScope.of(context).requestFocus(FocusNode()); + return; + } + // 切换管理状态 重置所以数据到原始数据 + // for (ShoppingCartBrandModel _brandModel in _controller.getData()) { + // _brandModel.selected = false; + // for (ShoppingCartGoodsModel _goodsModel in _brandModel.children) { + // _goodsModel.selected = false; + // } + // } + // _checkAll = false; + // _selectedGoods.clear(); + _manageStatus = !_manageStatus; + setState(() {}); + }, + ) + ], + ), + ], + ), + preferredSize: Size.fromHeight(30 + MediaQuery.of(context).padding.top), ), body: _buildList(context), bottomNavigationBar: diff --git a/lib/pages/user/widget/user_app_bar.dart b/lib/pages/user/widget/user_app_bar.dart index 8509534..64d3a8b 100644 --- a/lib/pages/user/widget/user_app_bar.dart +++ b/lib/pages/user/widget/user_app_bar.dart @@ -46,7 +46,7 @@ class _UserAppBarState extends BaseStoreState { height: double.infinity, child: Image.asset( UserLevelTool.currentAppBarBGImagePath(), - fit: BoxFit.fill, + fit: BoxFit.cover, ), ), _buildAppBar(context), diff --git a/lib/pages/welcome/launch_widget.dart b/lib/pages/welcome/launch_widget.dart index 483d467..797cc15 100644 --- a/lib/pages/welcome/launch_widget.dart +++ b/lib/pages/welcome/launch_widget.dart @@ -43,7 +43,7 @@ class _LaunchWidgetState extends BaseStoreState } WidgetsBinding.instance.addPostFrameCallback((callback) { // _gifController.repeat(min: 0, max:59, period: Duration(milliseconds: 1500)); - Future.delayed(Duration(milliseconds: 3500), () { + Future.delayed(Duration(milliseconds: 2355), () { AppRouter.fadeAndReplaced(globalContext, RouteName.WELCOME_PAGE); }); }); @@ -60,8 +60,8 @@ class _LaunchWidgetState extends BaseStoreState child: ImagesAnimation( w: width, h: height, - milliseconds: 1750, - entry: ImagesAnimationEntry(0, 104, + milliseconds: 2355, + entry: ImagesAnimationEntry(0,70, "assets/recook_launch_image/recook_launch_image_%s.png")), ), ); diff --git a/lib/utils/user_level_tool.dart b/lib/utils/user_level_tool.dart index 54ccea9..ecb23e0 100644 --- a/lib/utils/user_level_tool.dart +++ b/lib/utils/user_level_tool.dart @@ -201,19 +201,19 @@ class UserLevelTool { static String appBarBGImagePath(UserRoleLevel roleLevel) { switch (roleLevel) { case UserRoleLevel.Master: - return "assets/user_page_appbar_master.png"; + return R.ASSETS_HEADER_MASTER_HEADER_PNG; break; case UserRoleLevel.Silver: - return "assets/user_page_appbar_silver.png"; + return R.ASSETS_HEADER_SILVER_HEADER_PNG; break; case UserRoleLevel.Gold: - return "assets/user_page_appbar_gold.png"; + return R.ASSETS_HEADER_GOLD_HEADER_PNG; break; case UserRoleLevel.Diamond: - return "assets/user_page_appbar_diamond.png"; + return R.ASSETS_HEADER_SILVER_HEADER_PNG; break; default: - return "assets/user_page_appbar_vip.png"; + return R.ASSETS_HEADER_VIP_HEADER_PNG; break; } } diff --git a/pubspec.yaml b/pubspec.yaml index 4287d9e..3a8503b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -2,7 +2,7 @@ name: recook description: Recook Market App. publish_to: "none" -version: 1.1.16+158 +version: 1.1.17+159 environment: sdk: ">=2.1.0 <3.0.0" @@ -201,6 +201,7 @@ flutter: - assets/static/ - assets/lottery_redeem/ - assets/shop/ + - assets/header/ fonts: - family: AppIcons fonts: