修改启动页时间,修改购物车和我的页面图标

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';
 

lib/pages/shopping_cart/shopping_cart_page.dart

@@ -117,34 +117,48 @@ class _ShoppingCartPageState extends BaseStoreState<ShoppingCartPage>
     _context = context;
     return Scaffold(
       backgroundColor: AppColor.tableViewGrayColor,
-      appBar: CustomAppBar(
-        appBackground: getAppBarColor(),
-        title: "购物车($_totalNum)",
-        actions: <Widget>[
-          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: <Widget>[
+                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:

lib/pages/user/widget/user_app_bar.dart

@@ -46,7 +46,7 @@ class _UserAppBarState extends BaseStoreState<UserAppBar> {
             height: double.infinity,
             child: Image.asset(
               UserLevelTool.currentAppBarBGImagePath(),
-              fit: BoxFit.fill,
+              fit: BoxFit.cover,
             ),
           ),
           _buildAppBar(context),

lib/pages/welcome/launch_widget.dart

@@ -43,7 +43,7 @@ class _LaunchWidgetState extends BaseStoreState<LaunchWidget>
     }
     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<LaunchWidget>
         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")),
       ),
     );

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;
     }
   }

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: