remove unused import

update count

lib/pages/live/live_stream/live_page.dart

@@ -1,7 +1,5 @@
 import 'dart:convert';
 import 'dart:io';
-import 'dart:math';
-import 'dart:ui';
 
 import 'package:flutter/material.dart';
 import 'package:oktoast/oktoast.dart';

lib/pages/live/live_stream/live_stream_view_page.dart

@@ -1,4 +1,3 @@
-import 'dart:math';
 import 'dart:convert';
 
 import 'package:flutter/material.dart';

lib/pages/live/num_tool/live_num_tool.dart

@@ -0,0 +1,9 @@
+///获取解析后的字符串
+String getParseNum(num number) {
+  if (number < 999)
+    return '$number';
+  else if (number < 9999)
+    return '${number ~/ 1000}千';
+  else
+    return '${number ~/ 10000}万';
+}

lib/pages/live/sub_page/live_stream_page.dart

@@ -9,6 +9,7 @@ import 'package:recook/pages/live/live_stream/live_playback_view_page.dart';
 import 'package:recook/pages/live/live_stream/live_stream_view_page.dart';
 import 'package:recook/pages/live/models/live_attention_list_model.dart';
 import 'package:recook/pages/live/models/live_list_model.dart';
+import 'package:recook/pages/live/num_tool/live_num_tool.dart';
 import 'package:recook/pages/live/sub_page/user_home_page.dart';
 import 'package:recook/utils/custom_route.dart';
 import 'package:recook/widgets/custom_image_button.dart';
@@ -328,7 +329,7 @@ class _LiveStreamPageState extends State<LiveStreamPage>
                           height: rSize(10),
                         ),
                         Text(
-                          model.praise.toString(),
+                          getParseNum(model.praise),
                           style: TextStyle(
                             color: Colors.white,
                             fontSize: rSP(10),

lib/pages/live/sub_page/topic_page.dart

@@ -157,7 +157,10 @@ class _TopicPageState extends State<TopicPage> {
                 _getTopicContentModels().then((getModels) {
                   models.addAll(getModels);
                   if (mounted) setState(() {});
-                  _controller.loadComplete();
+                  if (getModels.isEmpty)
+                    _controller.loadNoData();
+                  else
+                    _controller.loadComplete();
                 });
               },
               body: WaterfallFlow.builder(

lib/pages/live/sub_page/user_attention/topic_attention_view.dart

@@ -48,6 +48,14 @@ class _TopicAttentionViewState extends State<TopicAttentionView>
           _topicController.refreshCompleted();
         });
       },
+      onLoadMore: () {
+        _page++;
+        getTopicModel().then((models) {
+          topicModels = models;
+          if (mounted) setState(() {});
+          _topicController.refreshCompleted();
+        });
+      },
       body: ListView.builder(
         itemBuilder: (context, index) {
           final model = topicModels[index];
@@ -83,7 +91,8 @@ class _TopicAttentionViewState extends State<TopicAttentionView>
       subTitlePrefix: '共${model.substance}条内容',
       subTitleSuffix: '${model.partake}人参与',
       onTap: () {
-        CRoute.push(context, TopicPage(topicId: model.id, initAttention:model.isFollow==1));
+        CRoute.push(context,
+            TopicPage(topicId: model.id, initAttention: model.isFollow == 1));
       },
       initAttention: model.isFollow == 1,
       onAttention: (bool oldState) {

lib/pages/live/sub_page/user_home_page.dart

@@ -6,13 +6,13 @@ import 'package:recook/constants/styles.dart';
 import 'package:recook/manager/http_manager.dart';
 import 'package:recook/manager/user_manager.dart';
 import 'package:recook/pages/live/models/live_base_info_model.dart';
+import 'package:recook/pages/live/num_tool/live_num_tool.dart';
 import 'package:recook/pages/live/sub_page/live_host_center_page.dart';
 import 'package:recook/pages/live/sub_page/user_attention_page.dart';
 import 'package:recook/pages/live/sub_page/user_home/user_activity_view.dart';
 import 'package:recook/pages/live/sub_page/user_home/user_playback_view.dart';
 import 'package:recook/pages/live/widget/live_attention_button.dart';
 import 'package:recook/pages/live/widget/sliver_bottom_persistent_delegate.dart';
-import 'package:recook/pages/live/widget/user_live_playback_card.dart';
 import 'package:recook/utils/custom_route.dart';
 import 'package:recook/widgets/custom_image_button.dart';
 import 'package:recook/widgets/recook_back_button.dart';
@@ -211,13 +211,13 @@ class _UserHomePageState extends State<UserHomePage>
     );
   }
 
-  Widget _buildVerticalView(String title, int num, {VoidCallback onTap}) {
+  Widget _buildVerticalView(String title, int number, {VoidCallback onTap}) {
     return CustomImageButton(
       onPressed: onTap,
       child: Column(
         children: [
           Text(
-            num.toString(),
+            getParseNum(number),
             style: TextStyle(
               color: Color(0xFF333333),
               fontSize: rSP(18),

lib/pages/live/video/video_advance_page.dart

@@ -1,7 +1,6 @@
 import 'dart:io';
 
 import 'package:flutter/material.dart';
-import 'package:recook/const/resource.dart';
 import 'package:recook/constants/constants.dart';
 import 'package:recook/constants/header.dart';
 import 'package:recook/pages/live/video/upload_video_page.dart';

lib/pages/live/widget/live_fab_location.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:recook/constants/header.dart';
 
 class FabLocation {
   ///copy from material/floating_action_button_location.dart
@@ -22,13 +21,6 @@ mixin CustomDockedOffsetY on StandardFabLocation {
   double getOffsetY(
       ScaffoldPrelayoutGeometry scaffoldGeometry, double adjustment) {
     final double contentBottom = scaffoldGeometry.contentBottom;
-    final double contentMargin =
-        scaffoldGeometry.scaffoldSize.height - contentBottom;
-    final double bottomViewPadding = scaffoldGeometry.minViewPadding.bottom;
-    final double fabHeight = scaffoldGeometry.floatingActionButtonSize.height;
-    final double safeMargin =
-        bottomViewPadding > contentMargin ? bottomViewPadding : 0.0;
-
     double fabY = contentBottom;
     return fabY;
   }

lib/pages/live/widget/user_live_playback_card.dart

@@ -8,7 +8,6 @@ import 'package:recook/pages/live/models/activity_video_list_model.dart';
 import 'package:recook/pages/live/widget/user_base_card.dart';
 import 'package:recook/utils/custom_route.dart';
 import 'package:recook/utils/date/recook_date_util.dart';
-import 'package:recook/widgets/custom_image_button.dart';
 
 class UserPlaybackCard extends StatefulWidget {
   final ActivityVideoListModel model;