From b8e0faebe90b07165a42653cc4473275e6bbe224 Mon Sep 17 00:00:00 2001
From: Weller <1812208341@qq.com>
Date: Wed, 14 Oct 2020 14:32:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .dart_tool/package_config.json                |  2 +-
 .../hot_ranking_page/hot_ranking_page.dart    | 22 +++++++++++------
 .../hot_ranking_appbar.dart                   | 24 ++++++++++++-------
 3 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/.dart_tool/package_config.json b/.dart_tool/package_config.json
index 82d94bc..37a01a6 100644
--- a/.dart_tool/package_config.json
+++ b/.dart_tool/package_config.json
@@ -614,7 +614,7 @@
       "languageVersion": "2.1"
     }
   ],
-  "generated": "2020-10-14T02:50:46.733318Z",
+  "generated": "2020-10-14T06:28:04.630762Z",
   "generator": "pub",
   "generatorVersion": "2.8.2"
 }
diff --git a/lib/pages/hot_ranking_page/hot_ranking_page.dart b/lib/pages/hot_ranking_page/hot_ranking_page.dart
index 910125c..8de5e25 100644
--- a/lib/pages/hot_ranking_page/hot_ranking_page.dart
+++ b/lib/pages/hot_ranking_page/hot_ranking_page.dart
@@ -9,6 +9,7 @@ import 'package:zhiying_base_widget/utils/contants.dart';
 import 'package:zhiying_comm/util/base_bloc.dart';
 import 'package:zhiying_comm/zhiying_comm.dart';
 import 'package:provider/provider.dart';
+import 'package:cached_network_image/cached_network_image.dart';
 
 import 'hot_ranking_page_bloc.dart';
 
@@ -80,14 +81,13 @@ class __HotRankingPageContainerState extends State<_HotRankingPageContainer> {
     return StreamBuilder(
       stream: _bloc.outData,
       builder: (context, asyncSnapshot) {
-
         var model = asyncSnapshot.data;
         if (model == null) {
           return HotRankingPageSkeleton();
         }
         for (var item in model) {
           WidgetModel widgetModel =
-              WidgetModel.fromJson(Map<String, dynamic>.from(item));
+          WidgetModel.fromJson(Map<String, dynamic>.from(item));
           if (item.containsKey("mod_name") &&
               item['mod_name'] == "hot_rank_bg_img") {
             _bloc.backgroundImage = json.decode(item['data'])['bg_img'];
@@ -124,7 +124,7 @@ class __HotRankingPageContainerState extends State<_HotRankingPageContainer> {
     } else {
       for (var item in model) {
         WidgetModel widgetModel =
-            WidgetModel.fromJson(Map<String, dynamic>.from(item));
+        WidgetModel.fromJson(Map<String, dynamic>.from(item));
         if (item.containsKey("mod_name") &&
             item['mod_name'] == "hot_rank_tab_view") {
           list.add(Expanded(
@@ -149,14 +149,22 @@ class _SilverAppBarDelegate extends SliverPersistentHeaderDelegate {
   final Widget child;
 
   @override
-  double get minExtent => MediaQuery.of(context).padding.top + 44;
+  double get minExtent =>
+      MediaQuery
+          .of(context)
+          .padding
+          .top + 44;
 
   @override
-  double get maxExtent => MediaQuery.of(context).padding.top + 44;
+  double get maxExtent =>
+      MediaQuery
+          .of(context)
+          .padding
+          .top + 44;
 
   @override
-  Widget build(
-      BuildContext context, double shrinkOffset, bool overlapsContent) {
+  Widget build(BuildContext context, double shrinkOffset,
+      bool overlapsContent) {
     return child;
   }
 
diff --git a/lib/widgets/hot_ranking/hot_ranking_appbar/hot_ranking_appbar.dart b/lib/widgets/hot_ranking/hot_ranking_appbar/hot_ranking_appbar.dart
index 0b40ba0..56c463b 100644
--- a/lib/widgets/hot_ranking/hot_ranking_appbar/hot_ranking_appbar.dart
+++ b/lib/widgets/hot_ranking/hot_ranking_appbar/hot_ranking_appbar.dart
@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:zhiying_base_widget/widgets/hot_ranking/hot_ranking_appbar/model/hot_ranking_appbaar_model.dart';
 import 'package:zhiying_comm/util/extension/color.dart';
 import 'package:zhiying_comm/zhiying_comm.dart';
+import 'package:cached_network_image/cached_network_image.dart';
 
 class HotRankingAppBar extends StatelessWidget {
   final Map<String, dynamic> data;
@@ -14,31 +15,36 @@ class HotRankingAppBar extends StatelessWidget {
   Widget build(BuildContext context) {
     var model = HotRankingAppbarModel.fromJson(json.decode(data['data']));
     return Container(
-      height: MediaQuery.of(context).padding.top + 56,
+      height: MediaQuery
+          .of(context)
+          .padding
+          .top + 56,
       child: AppBar(
           elevation: 0,
           leading: Navigator.canPop(context)
               ? IconButton(
-                  icon: Icon(Icons.arrow_back_ios),
-                  onPressed: () {
-                    Navigator.of(context).pop();
-                  })
+              icon: Icon(Icons.arrow_back_ios),
+              onPressed: () {
+                Navigator.of(context).pop();
+              })
               : Container(),
-          backgroundColor: HexColor.fromHex(model.appBarBgColor==""?"#00000000":model.appBarBgColor),
+          backgroundColor: HexColor.fromHex(
+              model.appBarBgColor == "" ? "#00000000" : model.appBarBgColor),
           centerTitle: true,
           title: Container(
             child: Stack(
               alignment: Alignment.center,
               children: <Widget>[
                 Text(
-                  model.appBarName??"",
+                  model.appBarName ?? "",
                   style:
-                      TextStyle(color: HexColor.fromHex(model.appBarNameColor??"")),
+                  TextStyle(
+                      color: HexColor.fromHex(model.appBarNameColor ?? "")),
                 ),
                 CachedNetworkImage(
                   height: 40.w,
                   width: 144.w,
-                  imageUrl: model.appBarNameImg??"",
+                  imageUrl: model.appBarNameImg ?? "",
                   fit: BoxFit.fill,
                 )
               ],