Merge branch 'fix' into alpha

lib/pages/bangumi/view.dart

@@ -113,6 +113,9 @@ class _BangumiPageState extends State<BangumiPage>
                         builder: (context, snapshot) {
                           if (snapshot.connectionState ==
                               ConnectionState.done) {
+                            if (snapshot.data == null) {
+                              return const SizedBox();
+                            }
                             Map data = snapshot.data as Map;
                             List list = _bangumidController.bangumiFollowList;
                             if (data['status']) {

lib/pages/dynamics/view.dart

@@ -212,6 +212,9 @@ class _DynamicsPageState extends State<DynamicsPage>
               future: _futureBuilderFutureUp,
               builder: (context, snapshot) {
                 if (snapshot.connectionState == ConnectionState.done) {
+                  if (snapshot.data == null) {
+                    return const SliverToBoxAdapter(child: SizedBox());
+                  }
                   Map data = snapshot.data;
                   if (data['status']) {
                     return Obx(() => UpPanel(_dynamicsController.upData.value));
@@ -232,6 +235,9 @@ class _DynamicsPageState extends State<DynamicsPage>
               future: _futureBuilderFuture,
               builder: (context, snapshot) {
                 if (snapshot.connectionState == ConnectionState.done) {
+                  if (snapshot.data == null) {
+                    return const SliverToBoxAdapter(child: SizedBox());
+                  }
                   Map data = snapshot.data;
                   if (data['status']) {
                     List<DynamicItemModel> list =

lib/pages/history/view.dart

@@ -99,6 +99,9 @@ class _HistoryPageState extends State<HistoryPage> {
               future: _futureBuilderFuture,
               builder: (context, snapshot) {
                 if (snapshot.connectionState == ConnectionState.done) {
+                  if (snapshot.data == null) {
+                    return const SliverToBoxAdapter(child: SizedBox());
+                  }
                   Map data = snapshot.data;
                   if (data['status']) {
                     return Obx(

lib/pages/live/view.dart

@@ -84,6 +84,9 @@ class _LivePageState extends State<LivePage> {
                 future: _futureBuilderFuture,
                 builder: (context, snapshot) {
                   if (snapshot.connectionState == ConnectionState.done) {
+                    if (snapshot.data == null) {
+                      return const SliverToBoxAdapter(child: SizedBox());
+                    }
                     Map data = snapshot.data as Map;
                     if (data['status']) {
                       return SliverLayoutBuilder(

lib/pages/media/view.dart

@@ -141,6 +141,9 @@ class _MediaPageState extends State<MediaPage>
               future: _futureBuilderFuture,
               builder: (context, snapshot) {
                 if (snapshot.connectionState == ConnectionState.done) {
+                  if (snapshot.data == null) {
+                    return const SizedBox();
+                  }
                   Map data = snapshot.data as Map;
                   if (data['status']) {
                     List favFolderList =

lib/pages/mine/view.dart

@@ -85,6 +85,9 @@ class _MinePageState extends State<MinePage> {
                     future: _futureBuilderFuture,
                     builder: (context, snapshot) {
                       if (snapshot.connectionState == ConnectionState.done) {
+                        if (snapshot.data == null) {
+                          return const SizedBox();
+                        }
                         if (snapshot.data['status']) {
                           return Obx(
                               () => userInfoBuild(mineController, context));

lib/pages/search/view.dart

@@ -227,6 +227,9 @@ class _SearchPageState extends State<SearchPage> with RouteAware {
                 future: _futureBuilderFuture,
                 builder: (context, snapshot) {
                   if (snapshot.connectionState == ConnectionState.done) {
+                    if (snapshot.data == null) {
+                      return const SizedBox();
+                    }
                     Map data = snapshot.data as Map;
                     if (data['status']) {
                       return Obx(

lib/pages/video/detail/related/view.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/skeleton/video_card_h.dart';
 import 'package:pilipala/common/widgets/animated_dialog.dart';
+import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/common/widgets/overlay_pop.dart';
 import 'package:pilipala/common/widgets/video_card_h.dart';
 import './controller.dart';
@@ -22,6 +23,9 @@ class _RelatedVideoPanelState extends State<RelatedVideoPanel> {
       future: _releatedController.queryRelatedVideo(),
       builder: (context, snapshot) {
         if (snapshot.connectionState == ConnectionState.done) {
+          if (snapshot.data == null) {
+            return const SliverToBoxAdapter(child: SizedBox());
+          }
           if (snapshot.data!['status']) {
             // 请求成功
             return SliverList(
@@ -51,9 +55,7 @@ class _RelatedVideoPanelState extends State<RelatedVideoPanel> {
             }, childCount: snapshot.data['data'].length + 1));
           } else {
             // 请求错误
-            return const Center(
+            return HttpError(errMsg: '出错了', fn: () {});
-              child: Text('出错了'),
-            );
           }
         } else {
           // 骨架屏