feat：View All 点击区域过小，和下拉刷新事件冲突

lib/kt_model/kt_short_video_bean.dart

@@ -359,6 +359,7 @@ class VideoInfo {
     num? isVip,
     Revolution? revolution,
     String? imageUrl,
+    String? playSeconds,
   }) {
     _id = id;
     _shortPlayVideoId = shortPlayVideoId;
@@ -372,6 +373,7 @@ class VideoInfo {
     _isVip = isVip;
     _revolution = revolution;
     _imageUrl = imageUrl;
+    _playSeconds = playSeconds;
   }
 
   VideoInfo.fromJson(dynamic json) {
@@ -389,6 +391,7 @@ class VideoInfo {
         ? Revolution.fromJson(json['revolution'])
         : null;
     _imageUrl = json['image_url'];
+    _playSeconds = json['play_seconds'];
   }
 
   num? _id;
@@ -403,7 +406,7 @@ class VideoInfo {
   num? _isVip;
   Revolution? _revolution;
   String? _imageUrl;
-
+  String? _playSeconds;
   VideoInfo copyWith({
     num? id,
     num? shortPlayVideoId,
@@ -417,6 +420,7 @@ class VideoInfo {
     num? isVip,
     Revolution? revolution,
     String? imageUrl,
+    String? playSeconds,
   }) => VideoInfo(
     id: id ?? _id,
     shortPlayVideoId: shortPlayVideoId ?? _shortPlayVideoId,
@@ -430,6 +434,7 @@ class VideoInfo {
     isVip: isVip ?? _isVip,
     revolution: revolution ?? _revolution,
     imageUrl: imageUrl ?? _imageUrl,
+    playSeconds: playSeconds ?? _playSeconds,
   );
 
   num? get id => _id;
@@ -456,6 +461,8 @@ class VideoInfo {
 
   String? get imageUrl => _imageUrl;
 
+  String? get playSeconds => _playSeconds;
+
   set id(num? value) => _id = value;
 
   set shortPlayVideoId(num? value) => _shortPlayVideoId = value;
@@ -480,6 +487,8 @@ class VideoInfo {
 
   set imageUrl(String? value) => _imageUrl = value;
 
+  set playSeconds(String? value) => _playSeconds = value;
+
   Map<String, dynamic> toJson() {
     final map = <String, dynamic>{};
     map['id'] = _id;
@@ -496,6 +505,7 @@ class VideoInfo {
       map['revolution'] = _revolution?.toJson();
     }
     map['image_url'] = _imageUrl;
+    map['play_seconds'] = _playSeconds;
     return map;
   }
 }

lib/kt_pages/kt_home/view.dart

@@ -66,6 +66,87 @@ class _KtHomePageState extends State<KtHomePage>
                 ),
               ),
             ),
+            // 悬浮小视频卡片
+            if (state.showVideo && state.curVideo != null)
+              Positioned(
+                bottom: 2.w,
+                right: 15.w,
+                child: GestureDetector(
+                  onTap: () => Get.toNamed(
+                    KtRoutes.shortVideo,
+                    arguments: {
+                      'shortPlayId': state.curVideo?.shortPlayId,
+                      'imageUrl': state.curVideo?.imageUrl ?? '',
+                    },
+                  ),
+                  child: Container(
+                    width: 345.w,
+                    height: 40.w,
+                    padding: EdgeInsets.only(right: 10.w),
+                    decoration: BoxDecoration(
+                      color: Colors.white,
+                      borderRadius: BorderRadius.circular(20.w),
+                    ),
+                    child: Row(
+                      children: [
+                        Container(
+                          width: 40.w,
+                          height: 40.w,
+                          decoration: BoxDecoration(
+                            image: DecorationImage(
+                              image: AssetImage('home_bottom_video.png'.ktIcon),
+                              fit: BoxFit.fill,
+                            ),
+                          ),
+                          child: Center(
+                            child: KtNetworkImage(
+                              imageUrl: state.curVideo?.imageUrl ?? '',
+                              width: 30.w,
+                              height: 30.w,
+                              borderRadius: BorderRadius.circular(15.w),
+                            ),
+                          ),
+                        ),
+                        SizedBox(width: 8.w),
+                        Container(
+                          constraints: BoxConstraints(maxWidth: 160.w),
+                          child: Text(
+                            state.curVideo?.name ?? '',
+                            maxLines: 1,
+                            overflow: TextOverflow.ellipsis,
+                            style: TextStyle(
+                              fontSize: 14.sp,
+                              fontWeight: FontWeight.w400,
+                              color: Color(0xFF1E1E20),
+                            ),
+                          ),
+                        ),
+                        SizedBox(width: 20.w),
+                        Text(
+                          'Ep.${state.curVideo?.process}',
+                          style: TextStyle(
+                            fontSize: 12.sp,
+                            fontWeight: FontWeight.w400,
+                            color: Color(0xFF94949B),
+                          ),
+                        ),
+                        const Spacer(),
+                        Image.asset(
+                          'ic_home_play.png'.ktIcon,
+                          width: 24.w,
+                          height: 24.w,
+                        ),
+                        SizedBox(width: 14.w),
+                        Image.asset(
+                          'ic_home_eposide.png'.ktIcon,
+                          width: 24.w,
+                          height: 24.w,
+                        ),
+                      ],
+                    ),
+                  ),
+                ),
+              ),
           ],
         );
       },
@@ -1098,8 +1179,7 @@ class _KtHomePageState extends State<KtHomePage>
                             height: 127.w,
                             child: Column(
                               crossAxisAlignment: CrossAxisAlignment.start,
-                              mainAxisAlignment:
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                                  MainAxisAlignment.spaceBetween,
                               children: [
                                 Text(
                                   video.name ?? '',

lib/kt_pages/kt_main_page/view.dart

@@ -95,6 +95,7 @@ class _KtMainPageState extends State<KtMainPage>
               itemCount: _tabsTitle.length,
             ),
             bottomNavigationBar: BottomNavigationBar(
+              backgroundColor: Colors.white,
               selectedItemColor: Color(0xFF1E1E20),
               selectedLabelStyle: TextStyle(
                 fontSize: 10.sp,
@@ -102,7 +103,7 @@ class _KtMainPageState extends State<KtMainPage>
               ),
               unselectedLabelStyle: TextStyle(
                 fontSize: 10.sp,
-                color: Color(0xFF95959C),
+                color: Color(0xFF94949B),
                 fontWeight: FontWeight.w400,
               ),
               type: BottomNavigationBarType.fixed,

lib/kt_pages/kt_my_list/logic.dart

@@ -38,8 +38,8 @@ class MyListLogic extends GetxController {
     state.loadStatus = KtLoadStatusType.loading;
     if (refresh) {
       state.curFavoriteIndex = 1;
-      state.favoriteList.clear();
+    //   state.favoriteList.clear();
-      state.chestList.clear();
+    //   state.chestList.clear();
     }
     if (loadMore) {
       state.curFavoriteIndex++;
@@ -64,6 +64,10 @@ class MyListLogic extends GetxController {
           refreshCtrl.loadNoData();
           chestRefreshCtrl.loadNoData();
         }
+        if (refresh) {
+          state.favoriteList.clear();
+          state.chestList.clear();
+        }
         state.favoriteList.addAll(list);
         if (state.favoriteList.length > 3) {
           state.chestList = state.favoriteList.sublist(0, 3);
@@ -86,7 +90,7 @@ class MyListLogic extends GetxController {
   getHistoryList({bool refresh = false, bool loadMore = false}) async {
     if (refresh) {
       state.curHistoryIndex = 1;
-      state.historyList.clear();
+      // state.historyList.clear();
     }
     if (loadMore) {
       state.curHistoryIndex++;
@@ -107,7 +111,9 @@ class MyListLogic extends GetxController {
           ...res.data['list'].map((item) => KtHistoryVideoBean.fromJson(item)),
         ];
         if (list.length < 20) refreshCtrl.loadNoData();
-
+         if (refresh) {
+          state.historyList.clear();
+        }
         state.historyList.addAll(list);
         update();
       } else {

lib/kt_pages/kt_my_list/view.dart

@@ -39,286 +39,288 @@ class _KtMyListPageState extends State<KtMyListPage> {
           ),
           child: state.chestList.isEmpty && state.historyList.isEmpty
               ? KtStatusWidget(
-            type: KtErrorStatusType.nothingYet,
+                  type: KtErrorStatusType.nothingYet,
-            onPressed: logic.initData,
+                  onPressed: logic.initData,
-          )
+                )
               : SmartRefresher(
-            controller: logic.refreshCtrl,
+                  controller: logic.refreshCtrl,
-            enablePullUp: true,
+                  enablePullUp: true,
-            enablePullDown: true,
+                  enablePullDown: true,
-            onRefresh: () => logic.initData(),
+                  onRefresh: () => logic.initData(),
-            onLoading: () => logic.getHistoryList(loadMore: true),
+                  onLoading: () => logic.getHistoryList(loadMore: true),
-            child: Column(
+                  child: Column(
-              children: [
+                    children: [
-                if (state.chestList.isNotEmpty)
+                      if (state.chestList.isNotEmpty)
-                  Container(
+                        Container(
-                    width: ScreenUtil().screenWidth - 30.w,
+                          width: ScreenUtil().screenWidth - 30.w,
-                    padding: EdgeInsets.fromLTRB(6.w, 53.w, 6.w, 6.w),
+                          padding: EdgeInsets.fromLTRB(6.w, 46.w, 6.w, 6.w),
-                    decoration: BoxDecoration(
+                          decoration: BoxDecoration(
-                      image: DecorationImage(
+                            image: DecorationImage(
-                        image: AssetImage('collect_bg.png'.ktIcon),
+                              image: AssetImage('collect_bg.png'.ktIcon),
-                        fit: BoxFit.fill,
+                              fit: BoxFit.fill,
-                      ),
-                    ),
-                    child: Column(
-                      children: [
-                        Row(
-                          children: [
-                            SizedBox(width: 6.w),
-                            Text(
-                              'My Treasure Chest',
-                              style: TextStyle(
-                                fontSize: 18.sp,
-                                color: Colors.white,
-                                fontWeight: FontWeight.w800,
-                                fontStyle: FontStyle.italic,
-                              ),
                             ),
-                            const Spacer(),
+                          ),
-                            GestureDetector(
+                          child: Column(
-                              onTap: () => Get.to(KtMyChestPage()),
+                            children: [
-                              child: Row(
+                              Row(
                                 children: [
+                                  SizedBox(width: 6.w),
                                   Text(
-                                    'View All',
+                                    'My Treasure Chest',
                                     style: TextStyle(
-                                      fontSize: 12.sp,
+                                      fontSize: 18.sp,
-                                      color: Color(0xFFD6D6D6),
+                                      color: Colors.white,
+                                      fontWeight: FontWeight.w800,
+                                      fontStyle: FontStyle.italic,
                                     ),
                                   ),
-                                  Image.asset(
+                                  const Spacer(),
-                                    'ic_right_white.png'.ktIcon,
+                                  GestureDetector(
-                                    width: 10.w,
+                                    onTap: () => Get.to(KtMyChestPage()),
+                                    child: Container(
+                                      padding: EdgeInsets.all(8.w),
+                                      child: Row(
+                                        children: [
+                                          Text(
+                                            'View All',
+                                            style: TextStyle(
+                                              fontSize: 12.sp,
+                                              color: Color(0xFFD6D6D6),
+                                            ),
+                                          ),
+                                          Image.asset(
+                                            'ic_right_white.png'.ktIcon,
+                                            width: 10.w,
+                                          ),
+                                        ],
+                                      ),
+                                    ),
                                   ),
-                                  SizedBox(width: 6.w),
                                 ],
                               ),
-                            ),
+                              SizedBox(height: 8.w),
-                          ],
+                              Container(
-                        ),
+                                height: 145.w,
-                        SizedBox(height: 15.w),
+                                decoration: BoxDecoration(
-                        Container(
+                                  color: Colors.white,
-                          height: 145.w,
+                                  borderRadius: BorderRadius.circular(14.w),
-                          decoration: BoxDecoration(
+                                ),
-                            color: Colors.white,
+                                child: Row(
-                            borderRadius: BorderRadius.circular(14.w),
+                                  mainAxisAlignment: MainAxisAlignment.start,
-                          ),
+                                  children: [
-                          child: Row(
+                                    ...state.chestList.map(
-                            mainAxisAlignment: MainAxisAlignment.start,
+                                      (video) => Container(
-                            children: [
+                                        margin: EdgeInsets.symmetric(
-                              ...state.chestList.map(
+                                          horizontal: 5.w,
-                                    (video) => Container(
-                                  margin: EdgeInsets.symmetric(
-                                    horizontal: 5.w,
-                                  ),
-                                  child: Stack(
-                                    children: [
-                                      GestureDetector(
-                                        onTap: () => Get.toNamed(
-                                          KtRoutes.shortVideo,
-                                          arguments: {
-                                            'shortPlayId':
-                                            video.shortPlayId,
-                                            'imageUrl':
-                                            video.imageUrl ?? '',
-                                          },
                                         ),
-                                        child: KtNetworkImage(
+                                        child: Stack(
-                                          imageUrl: video.imageUrl ?? '',
+                                          children: [
-                                          width: 100.w,
+                                            GestureDetector(
-                                          height: 133.w,
+                                              onTap: () => Get.toNamed(
-                                          borderRadius:
+                                                KtRoutes.shortVideo,
-                                          BorderRadius.circular(6.w),
+                                                arguments: {
-                                        ),
+                                                  'shortPlayId':
-                                      ),
+                                                      video.shortPlayId,
-                                      Positioned(
+                                                  'imageUrl':
-                                        right: 4.w,
+                                                      video.imageUrl ?? '',
-                                        top: 4.w,
+                                                },
-                                        child: GestureDetector(
-                                          onTap: () =>
-                                              logic.cancelCollect(
-                                                video.shortPlayId!,
                                               ),
-                                          child: Image.asset(
+                                              child: KtNetworkImage(
-                                            'ic_collect_sel.png'.ktIcon,
+                                                imageUrl: video.imageUrl ?? '',
-                                            width: 28.w,
+                                                width: 100.w,
-                                          ),
+                                                height: 133.w,
+                                                borderRadius:
+                                                    BorderRadius.circular(6.w),
+                                              ),
+                                            ),
+                                            Positioned(
+                                              right: 4.w,
+                                              top: 4.w,
+                                              child: GestureDetector(
+                                                onTap: () =>
+                                                    logic.cancelCollect(
+                                                      video.shortPlayId!,
+                                                    ),
+                                                child: Image.asset(
+                                                  'ic_collect_sel.png'.ktIcon,
+                                                  width: 28.w,
+                                                ),
+                                              ),
+                                            ),
+                                          ],
                                         ),
                                       ),
-                                    ],
+                                    ),
-                                  ),
+                                  ],
                                 ),
                               ),
                             ],
                           ),
                         ),
-                      ],
+                      SizedBox(height: 15.w),
-                    ),
+                      Expanded(
-                  ),
+                        child: Container(
-                SizedBox(height: 15.w),
+                          width: ScreenUtil().screenWidth,
-                Expanded(
+                          padding: EdgeInsets.all(15.w),
-                  child: Container(
+                          decoration: BoxDecoration(
-                    width: ScreenUtil().screenWidth,
+                            color: Colors.white,
-                    padding: EdgeInsets.all(15.w),
+                            borderRadius: BorderRadius.vertical(
-                    decoration: BoxDecoration(
+                              top: Radius.circular(20.w),
-                      color: Colors.white,
+                            ),
-                      borderRadius: BorderRadius.vertical(
-                        top: Radius.circular(20.w),
-                      ),
-                    ),
-                    child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        Text(
-                          'Continue Watching',
-                          style: TextStyle(
-                            fontSize: 18.sp,
-                            color: Color(0xFF1E1E20),
-                            fontWeight: FontWeight.w800,
-                            fontStyle: FontStyle.italic,
                           ),
-                        ),
+                          child: Column(
-                        Expanded(
+                            crossAxisAlignment: CrossAxisAlignment.start,
-                          child: ListView.separated(
+                            children: [
-                            padding: EdgeInsets.only(top: 10.w),
+                              Text(
-                            // shrinkWrap: true,
+                                'Continue Watching',
-                            // physics: NeverScrollableScrollPhysics(),
+                                style: TextStyle(
-                            itemBuilder: (context, index) {
+                                  fontSize: 18.sp,
-                              KtHistoryVideoBean video =
+                                  color: Color(0xFF1E1E20),
-                              state.historyList[index];
+                                  fontWeight: FontWeight.w800,
-                              return GestureDetector(
+                                  fontStyle: FontStyle.italic,
-                                onTap: () => Get.toNamed(
-                                  KtRoutes.shortVideo,
-                                  arguments: {
-                                    'shortPlayId': video.shortPlayId,
-                                    'imageUrl': video.imageUrl ?? '',
-                                  },
                                 ),
-                                child: Container(
+                              ),
-                                  color: Colors.transparent,
+                              Expanded(
-                                  child: Row(
+                                child: ListView.separated(
-                                    children: [
+                                  padding: EdgeInsets.only(top: 10.w),
-                                      KtNetworkImage(
+                                  // shrinkWrap: true,
-                                        imageUrl: video.imageUrl ?? '',
+                                  // physics: NeverScrollableScrollPhysics(),
-                                        width: 74.w,
+                                  itemBuilder: (context, index) {
-                                        height: 98.w,
+                                    KtHistoryVideoBean video =
-                                        borderRadius:
+                                        state.historyList[index];
-                                        BorderRadius.circular(8.w),
+                                    return GestureDetector(
+                                      onTap: () => Get.toNamed(
+                                        KtRoutes.shortVideo,
+                                        arguments: {
+                                          'shortPlayId': video.shortPlayId,
+                                          'imageUrl': video.imageUrl ?? '',
+                                        },
                                       ),
-                                      SizedBox(width: 13.w),
+                                      child: Container(
-                                      SizedBox(
+                                        color: Colors.transparent,
-                                        width: 200.w,
+                                        child: Row(
-                                        height: 98.w,
-                                        child: Column(
-                                          crossAxisAlignment:
-                                          CrossAxisAlignment.start,
-                                          mainAxisAlignment:
-                                          MainAxisAlignment.start,
                                           children: [
-                                            Text(
+                                            KtNetworkImage(
-                                              video.name ?? '',
+                                              imageUrl: video.imageUrl ?? '',
-                                              maxLines: 1,
+                                              width: 74.w,
-                                              overflow:
+                                              height: 98.w,
-                                              TextOverflow.ellipsis,
+                                              borderRadius:
-                                              style: TextStyle(
+                                                  BorderRadius.circular(8.w),
-                                                fontSize: 13.sp,
-                                                color: Color(0xFF1E1E20),
-                                                fontWeight:
-                                                FontWeight.w500,
-                                              ),
                                             ),
-                                            SizedBox(height: 6.w),
+                                            SizedBox(width: 13.w),
-                                            Text(
+                                            SizedBox(
-                                              video.category?.first ?? '',
+                                              width: 200.w,
-                                              maxLines: 1,
+                                              height: 98.w,
-                                              overflow:
+                                              child: Column(
-                                              TextOverflow.ellipsis,
+                                                crossAxisAlignment:
-                                              style: TextStyle(
+                                                    CrossAxisAlignment.start,
-                                                fontSize: 10.sp,
+                                                mainAxisAlignment:
-                                                color: Color(0xFF79C900),
+                                                    MainAxisAlignment.start,
-                                                fontWeight:
+                                                children: [
-                                                FontWeight.w400,
+                                                  Text(
-                                              ),
+                                                    video.name ?? '',
-                                            ),
+                                                    maxLines: 1,
-                                            SizedBox(height: 20.w),
+                                                    overflow:
-                                            Row(
+                                                        TextOverflow.ellipsis,
-                                              children: [
+                                                    style: TextStyle(
-                                                SizedBox(
+                                                      fontSize: 13.sp,
-                                                  width: 26.w,
+                                                      color: Color(0xFF1E1E20),
-                                                  height: 26.w,
+                                                      fontWeight:
-                                                  child: CircularProgressIndicator(
+                                                          FontWeight.w500,
-                                                    value:
+                                                    ),
-                                                    (video.currentEpisode ??
+                                                  ),
-                                                        0) /
+                                                  SizedBox(height: 6.w),
-                                                        (video.episodeTotal! >
+                                                  Text(
-                                                            0
+                                                    video.category?.first ?? '',
-                                                            ? video
+                                                    maxLines: 1,
-                                                            .episodeTotal!
+                                                    overflow:
-                                                            : 1),
+                                                        TextOverflow.ellipsis,
-                                                    backgroundColor:
+                                                    style: TextStyle(
-                                                    Color(0xFFD9D9D9),
+                                                      fontSize: 10.sp,
-                                                    valueColor:
+                                                      color: Color(0xFF79C900),
-                                                    AlwaysStoppedAnimation<
+                                                      fontWeight:
-                                                        Color
+                                                          FontWeight.w400,
-                                                    >(
+                                                    ),
-                                                      Color(
+                                                  ),
-                                                        0xFFA7F62F,
+                                                  SizedBox(height: 20.w),
+                                                  Row(
+                                                    children: [
+                                                      SizedBox(
+                                                        width: 26.w,
+                                                        height: 26.w,
+                                                        child: CircularProgressIndicator(
+                                                          value:
+                                                              (video.currentEpisode ??
+                                                                  0) /
+                                                              (video.episodeTotal! >
+                                                                      0
+                                                                  ? video
+                                                                        .episodeTotal!
+                                                                  : 1),
+                                                          backgroundColor:
+                                                              Color(0xFFD9D9D9),
+                                                          valueColor:
+                                                              AlwaysStoppedAnimation<
+                                                                Color
+                                                              >(
+                                                                Color(
+                                                                  0xFFA7F62F,
+                                                                ),
+                                                              ),
+                                                          strokeWidth: 3.w,
+                                                        ),
                                                       ),
-                                                    ),
+                                                      SizedBox(width: 5.w),
-                                                    strokeWidth: 3.w,
+                                                      Text(
+                                                        "${((video.currentEpisode ?? 0) / (video.episodeTotal! > 0 ? video.episodeTotal! : 1) * 100).toStringAsFixed(0)}%",
+                                                        style: TextStyle(
+                                                          fontSize: 12.sp,
+                                                          color: Color(
+                                                            0xFF1E1E20,
+                                                          ),
+                                                          fontWeight:
+                                                              FontWeight.w400,
+                                                        ),
+                                                      ),
+                                                    ],
                                                   ),
-                                                ),
+                                                ],
-                                                SizedBox(width: 5.w),
+                                              ),
-                                                Text(
+                                            ),
-                                                  "${((video.currentEpisode ?? 0) / (video.episodeTotal! > 0 ? video.episodeTotal! : 1) * 100).toStringAsFixed(0)}%",
+                                            const Spacer(),
-                                                  style: TextStyle(
+                                            GestureDetector(
-                                                    fontSize: 12.sp,
+                                              onTap: () =>
-                                                    color: Color(
+                                                  logic.likeVideo(video),
-                                                      0xFF1E1E20,
+                                              child: Column(
-                                                    ),
+                                                children: [
-                                                    fontWeight:
+                                                  Image.asset(
-                                                    FontWeight.w400,
+                                                    video.isCollect == 1
+                                                        ? 'ic_collect_sel.png'
+                                                              .ktIcon
+                                                        : 'ic_collect_unsel.png'
+                                                              .ktIcon,
+                                                    width: 32.w,
                                                   ),
-                                                ),
+                                                ],
-                                              ],
+                                              ),
                                             ),
                                           ],
                                         ),
                                       ),
-                                      const Spacer(),
+                                    );
-                                      GestureDetector(
+                                  },
-                                        onTap: () =>
+                                  separatorBuilder: (_, __) =>
-                                            logic.likeVideo(video),
+                                      SizedBox(height: 12.w),
-                                        child: Column(
+                                  itemCount: state.historyList.length,
-                                          children: [
-                                            Image.asset(
-                                              video.isCollect == 1
-                                                  ? 'ic_collect_sel.png'
-                                                  .ktIcon
-                                                  : 'ic_collect_unsel.png'
-                                                  .ktIcon,
-                                              width: 32.w,
-                                            ),
-                                          ],
-                                        ),
-                                      ),
-                                    ],
-                                  ),
                                 ),
-                              );
+                              ),
-                            },
+                            ],
-                            separatorBuilder: (_, __) =>
-                                SizedBox(height: 12.w),
-                            itemCount: state.historyList.length,
                           ),
                         ),
-                      ],
+                      ),
-                    ),
+                    ],
                   ),
                 ),
-              ],
-            ),
-          ),
         );
       },
     );

lib/kt_pages/kt_short_video/logic.dart

@@ -1,12 +1,15 @@
 import 'package:easy_debounce/easy_throttle.dart';
 import 'dart:io';
-
+import 'dart:async';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:card_swiper/card_swiper.dart';
 import 'package:flutter_kinetra/kt_pages/kt_mine/logic.dart';
 import 'package:flutter_kinetra/kt_pages/kt_short_video/state.dart';
 import 'package:flutter_kinetra/kt_utils/kt_string_extend.dart';
 import 'package:flutter_kinetra/kt_utils/kt_toast_utils.dart';
+import 'package:flutter_kinetra/kt_pages/kt_home/logic.dart';
+import 'package:flutter_kinetra/kt_pages/kt_my_list/logic.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:video_player/video_player.dart';
@@ -14,10 +17,13 @@ import 'package:video_player/video_player.dart';
 import '../../dio_cilent/kt_apis.dart';
 import '../../dio_cilent/kt_request.dart';
 import '../../kt_model/kt_video_detail_bean.dart';
+import '../../kt_model/kt_short_video_bean.dart';
 import '../../kt_utils/kt_device_info_utils.dart';
 import '../../kt_widgets/kt_status_widget.dart';
 import '../../kt_widgets/kt_store_widget.dart';
+import '../../kt_widgets/kt_dialog.dart';
 import '../kt_mine/kt_store/logic.dart';
+import '../../kt_widgets/kt_network_image.dart';
 
 class VideoPlayLogic extends GetxController {
   final state = VideoPlayState();
@@ -30,6 +36,9 @@ class VideoPlayLogic extends GetxController {
   bool _disposed = false;
   final userLogic = Get.put(KtMineLogic());
 
+  final mylistLogic = Get.put(MyListLogic());
+  final mylistState = Get.find<MyListLogic>().state;
+
   @override
   void onInit() {
     super.onInit();
@@ -45,16 +54,44 @@ class VideoPlayLogic extends GetxController {
     state.imageUrl = Get.arguments['imageUrl'] ?? '';
     state.activityId = Get.arguments['activityId'];
     state.isFromDiscover = Get.arguments['isFromDiscover'] ?? false;
+    startTimer();
     fetchData();
+    getRecommend();
+    startVideoTimer();
   }
 
   @override
   void onClose() {
     _disposed = true;
     clearCacheCtrl();
+    state.timer?.cancel();
+    state.videotimer?.cancel();
     super.onClose();
   }
 
+  // 推荐点击
+  initData(shortPlayId, imageUrl) {
+    uploadHistorySeconds(
+      controllers[currentIndex]?.value.position.inMilliseconds ?? 0,
+    );
+    Get.back();
+    state.shortPlayId = shortPlayId;
+    state.videoId = 0;
+    state.imageUrl = imageUrl;
+    state.isRecommend = false;
+
+    // pageController.dispose();
+    currentIndex = 0;
+    pageController.jumpToPage(currentIndex);
+    // pageController = PageController(initialPage: currentIndex);
+    clearCacheCtrl();
+    fetchData();
+    state.recommendList.clear();
+    getRecommend();
+    startTimer();
+    startVideoTimer();
+  }
+
   clearCacheCtrl() {
     for (var controller in controllers) {
       controller?.pause();
@@ -88,6 +125,8 @@ class VideoPlayLogic extends GetxController {
           state.videoId = state.video?.videoInfo?.shortPlayVideoId ?? 0;
         }
         state.episodeList = state.video?.episodeList ?? [];
+        state.videoFirstTime =
+            int.tryParse(state.video?.videoInfo?.playSeconds ?? '0') ?? 0;
         if (toPage) currentIndex = (state.video?.videoInfo?.episode ?? 1) - 1;
         for (var video in state.episodeList) {
           if (video.isLock == true) {
@@ -105,6 +144,7 @@ class VideoPlayLogic extends GetxController {
             currentIndex,
             isToggle: true,
             isUploadHistorySeconds: false,
+            type: 1,
           );
         } else {
           _initializeController(currentIndex);
@@ -123,6 +163,37 @@ class VideoPlayLogic extends GetxController {
     }
   }
 
+  // 5s之后返回推荐
+  void startTimer() {
+    state.timer = Timer(const Duration(seconds: 5), () {
+      state.isRecommend = true;
+      update();
+    });
+  }
+
+  // 5s 之后隐藏控制器
+  void startVideoTimer() {
+    state.videotimer?.cancel();
+    state.videotimer = Timer(const Duration(seconds: 5), () {
+      state.isVideoctrHide = true;
+      update();
+    });
+  }
+
+  // 获取推荐列表
+  getRecommend() async {
+    ApiResponse res = await KtHttpClient().request(
+      KtApis.getDetailsRecommand,
+      method: HttpMethod.get,
+    );
+    if (res.success) {
+      state.recommendList = [
+        ...res.data['list'].map((item) => KtShortVideoBean.fromJson(item)),
+      ];
+      update();
+    }
+  }
+
   void reportHistory() {
     if (currentIndex < 0 || currentIndex >= state.episodeList.length) return;
     Map<String, dynamic> params = {
@@ -141,6 +212,19 @@ class VideoPlayLogic extends GetxController {
     KtHttpClient().request(KtApis.activeAfterWatchingVideo, data: params);
   }
 
+  void updateHomeVideo() {
+    final homeLogic = Get.put(KtHomeLogic());
+    final homeState = Get.find<KtHomeLogic>().state;
+    int playTime = controllers[currentIndex]?.value.position.inSeconds ?? 0;
+    homeState.curVideo = KtShortVideoBean()
+      ..shortPlayId = state.shortPlayId
+      ..imageUrl = state.video?.shortPlayInfo?.imageUrl
+      ..name = state.video?.shortPlayInfo?.name
+      ..playTime = playTime
+      ..process = currentIndex + 1;
+    homeLogic.update();
+  }
+
   // 切换剧集时处理视频状态
   Future<void> onPageChanged(
     int index, {
@@ -177,6 +261,9 @@ class VideoPlayLogic extends GetxController {
       });
     }
     currentIndex = index;
+    if (type == 1) {
+      controllers[index]?.seekTo(Duration(milliseconds: state.videoFirstTime));
+    }
     if (state.episodeList[index].isLock == true) {
       controllers[index]?.seekTo(Duration(seconds: 0));
       controllers[index]?.pause();
@@ -199,8 +286,9 @@ class VideoPlayLogic extends GetxController {
         controllers[index]?.play();
       }
     }
+
     controllers[index]?.setPlaybackSpeed(state.currentSpeed);
-    // updateHomeVideo();
+    updateHomeVideo();
     // print('----curIndex:$currentIndex');
     // 预加载新的相邻视频，并释放多余控制器
     _preloadAdjacentVideos();
@@ -241,7 +329,8 @@ class VideoPlayLogic extends GetxController {
 
     try {
       await controller.initialize();
-      if (index == currentIndex && (episode.isLock == false || userLogic.state.userInfo.isVip == true)) {
+      if (index == currentIndex &&
+          (episode.isLock == false || userLogic.state.userInfo.isVip == true)) {
         controller.play();
         update();
       }
@@ -251,7 +340,7 @@ class VideoPlayLogic extends GetxController {
         if (currentIndex == index && !_disposed) update();
         if (currentIndex == state.episodeList.length - 1 &&
             (controllers.last?.value.isCompleted ?? false)) {
-          // showRecommendDialog();
+          showRecommendDialog();
         }
         if (controller.value.isCompleted && !controller.value.isBuffering) {
           onPageChanged(index + 1, isToggle: true);
@@ -291,20 +380,21 @@ class VideoPlayLogic extends GetxController {
 
   Future<void> likeVideo() async {
     if (state.video == null) return;
-
     Map<String, dynamic> params = {
       "short_play_id": state.video?.shortPlayInfo?.shortPlayId,
       "video_id": state.episodeList[currentIndex].id,
     };
     if (state.video?.shortPlayInfo?.isCollect ?? false) {
-      await KtHttpClient().request(KtApis.deleteFavoriteVideo, data: params);
+      // await KtHttpClient().request(KtApis.deleteFavoriteVideo, data: params);
+      cancelCollect(state.video!.shortPlayInfo!.shortPlayId!);
     } else {
       await KtHttpClient().request(KtApis.collectVideo, data: params);
+      state.video?.shortPlayInfo?.isCollect =
+          !(state.video?.shortPlayInfo?.isCollect ?? false);
+      update();
+      mylistLogic.getCollectList(refresh: true);
+      mylistLogic.getHistoryList(refresh: true);
     }
-
-    state.video?.shortPlayInfo?.isCollect =
-        !(state.video?.shortPlayInfo?.isCollect ?? false);
-    update();
   }
 
   // 购买剧集
@@ -428,4 +518,202 @@ class VideoPlayLogic extends GetxController {
       ),
     );
   }
+
+  cancelCollect(num id) async {
+    Get.dialog(
+      KtDialog(
+        title: 'Remove from your list?',
+        subTitle: 'This drama will be removed from your saved list.',
+        rightBtnText: 'Remove',
+        rightBtnIcon: 'ic_dialog_delete.png',
+        rightBtnFunc: () async {
+          ApiResponse res = await KtHttpClient().request(
+            KtApis.deleteFavoriteVideo,
+            queryParameters: {'short_play_id': id},
+          );
+          if (res.success) {
+            state.video?.shortPlayInfo?.isCollect =
+                !(state.video?.shortPlayInfo?.isCollect ?? false);
+            update();
+            // state.favoriteList.removeWhere((item) => id == item.shortPlayId);
+            mylistState.chestList.removeWhere((item) => id == item.shortPlayId);
+            mylistState.historyList
+                    .firstWhereOrNull((item) => id == item.shortPlayId)
+                    ?.isCollect =
+                0;
+            mylistLogic.update();
+          }
+        },
+      ),
+    );
+  }
+
+  showRecommendDialog() {
+    EasyThrottle.throttle('show-recommend', Duration(seconds: 3), () async {
+      controllers[currentIndex]?.pause();
+      Get.bottomSheet(
+        isScrollControlled: true,
+        isDismissible: false,
+        enableDrag: false,
+        Stack(
+          children: [
+            Positioned(
+              top: ScreenUtil().statusBarHeight + 10.w,
+              left: 16.w,
+              child: GestureDetector(
+                onTap: () {
+                  EasyThrottle.throttle(
+                    'back-recommend',
+                    Duration(seconds: 3),
+                    () async {
+                      Get.back();
+                      Get.back();
+                    },
+                  );
+                },
+                child: Image.asset('ic_back_white.png'.ktIcon, width: 24.w),
+              ),
+            ),
+            Positioned(
+              bottom: 0,
+              left: 0,
+              child: Container(
+                height: 503.w,
+                width: ScreenUtil().screenWidth,
+                padding: EdgeInsets.fromLTRB(0.w, 75.w, 0.w, 20.w),
+                decoration: BoxDecoration(
+                  image: DecorationImage(
+                    image: AssetImage('video_recommend_bg.png'.ktIcon),
+                    fit: BoxFit.fill,
+                  ),
+                ),
+                child: Column(
+                  children: [
+                    Row(
+                      children: [
+                        SizedBox(width: 15.w),
+                        Image.asset('ip.png'.ktIcon, width: 38.w, height: 40.w),
+                        SizedBox(width: 6.w),
+                        Container(
+                          height: 30.w,
+                          padding: EdgeInsets.symmetric(horizontal: 14.w),
+                          decoration: BoxDecoration(
+                            color: Color(0xFF1E1E20),
+                            borderRadius: BorderRadius.circular(15.w),
+                          ),
+                          child: Center(
+                            child: Text(
+                              'More Drama Gold Below!',
+                              style: TextStyle(
+                                color: Color(0xFFA7F62F),
+                                fontSize: 16.sp,
+                                fontWeight: FontWeight.w500,
+                              ),
+                            ),
+                          ),
+                        ),
+                      ],
+                    ),
+                    SizedBox(
+                      height: 290.w,
+                      child: Swiper(
+                        layout: SwiperLayout.CUSTOM,
+                        customLayoutOption:
+                            CustomLayoutOption(startIndex: -1, stateCount: 3)
+                              ..addRotate([-20.0 / 180, 0.0, 20.0 / 180])
+                              ..addTranslate([
+                                Offset(-220.w, 0),
+                                Offset(0, 0),
+                                Offset(220.w, 0),
+                              ]),
+                        itemWidth: 190.w,
+                        itemHeight: 226.w,
+                        itemBuilder: (context, index) {
+                          final item =
+                              state.recommendList[index %
+                                  state.recommendList.length];
+                          return GestureDetector(
+                            onTap: () {
+                              initData(
+                                state.recommendList[index].shortPlayId ?? -1,
+                                state.recommendList[index].imageUrl ?? '',
+                              );
+                            },
+                            child: KtNetworkImage(
+                              imageUrl: item.imageUrl ?? '',
+                              width: 190.w,
+                              height: 226.w,
+                              borderRadius: BorderRadius.circular(20.w),
+                            ),
+                          );
+                        },
+                        itemCount: state.recommendList.length,
+                        loop: true,
+                        autoplay: true,
+                        onIndexChanged: (index) => state.recommendIndex = index,
+                      ),
+                    ),
+                    Row(
+                      mainAxisAlignment: MainAxisAlignment.center,
+                      children: [
+                        GestureDetector(
+                          onTap: () {
+                            initData(
+                              state
+                                      .recommendList[state.recommendIndex]
+                                      .shortPlayId ??
+                                  -1,
+                              state
+                                      .recommendList[state.recommendIndex]
+                                      .imageUrl ??
+                                  '',
+                            );
+                          },
+                          child: Container(
+                            width: 280.w,
+                            height: 64.w,
+                            padding: EdgeInsets.only(bottom: 16.w),
+                            decoration: BoxDecoration(
+                              image: DecorationImage(
+                                image: AssetImage(
+                                  'video_recommend_btn.png'.ktIcon,
+                                ),
+                                fit: BoxFit.cover,
+                              ),
+                            ),
+                            child: Container(
+                              height: 48.w,
+                              child: Row(
+                                mainAxisAlignment: MainAxisAlignment.center,
+                                children: [
+                                  Image.asset(
+                                    'video_recommend_play.png'.ktIcon,
+                                    width: 18.w,
+                                    height: 18.w,
+                                  ),
+                                  SizedBox(width: 4.w),
+                                  Text(
+                                    'watch now',
+                                    style: TextStyle(
+                                      color: Colors.black,
+                                      fontSize: 14.sp,
+                                      fontWeight: FontWeight.w500,
+                                    ),
+                                  ),
+                                ],
+                              ),
+                            ),
+                          ),
+                        ),
+                      ],
+                    ),
+                  ],
+                ),
+              ),
+            ),
+          ],
+        ),
+      );
+    });
+  }
 }

lib/kt_pages/kt_short_video/state.dart

@@ -1,10 +1,14 @@
+import 'dart:async';
+import 'package:flutter/material.dart';
 import '../../kt_model/kt_video_detail_bean.dart';
 import '../../kt_widgets/kt_status_widget.dart';
+import '../../kt_model/kt_short_video_bean.dart';
 
 class VideoPlayState {
   String imageUrl = '';
-  int shortPlayId = -1;
+  num shortPlayId = -1;
   num videoId = -1;
+  int videoFirstTime = 0;
   int curUnlock = 999;
   int? activityId;
   bool isFromDiscover = false;
@@ -15,4 +19,12 @@ class VideoPlayState {
   int currentVideoIndex = 0;
   double currentSpeed = 1.0;
   final List<double> speedList = [0.75, 1.0, 1.25, 1.5, 2.0, 3.0];
+  List<KtShortVideoBean> recommendList = [];
+  int recommendIndex = 0;
+
+  bool isRecommend = false;
+  Timer? timer;
+
+  bool isVideoctrHide = false;
+  Timer? videotimer;
 }

lib/kt_pages/kt_short_video/view.dart

@@ -32,6 +32,7 @@ class _VideoPlayPageState extends State<VideoPlayPage>
   @override
   void initState() {
     state.imageUrl = Get.arguments['imageUrl'] ?? '';
+    // state.isFromRecommend = Get.arguments['isFromRecommend'] ?? false;
     super.initState();
   }
 
@@ -54,9 +55,16 @@ class _VideoPlayPageState extends State<VideoPlayPage>
     return PopScope(
       canPop: true,
       onPopInvokedWithResult: (didPop, result) async {
-        // if (logic.controllers.isNotEmpty) {
+        if (logic.controllers.isNotEmpty) {
-        // logic.uploadHistorySeconds(logic.controllers[logic.currentIndex]?.value.position.inMilliseconds ?? 0);
+          logic.uploadHistorySeconds(
-        // }
+            logic
+                    .controllers[logic.currentIndex]
+                    ?.value
+                    .position
+                    .inMilliseconds ??
+                0,
+          );
+        }
         if (didPop) return;
       },
       child: Scaffold(
@@ -206,9 +214,22 @@ class _VideoPlayPageState extends State<VideoPlayPage>
         GestureDetector(
           onTap: () {
             if (episode.isLock == true) return;
-            (controller?.value.isPlaying ?? true)
+
-                ? controller?.pause()
+            if (controller?.value.isPlaying ?? true) {
-                : controller?.play();
+              if (state.isVideoctrHide) {
+                state.isVideoctrHide = false;
+                logic.startVideoTimer();
+              } else {
+                controller?.pause();
+                state.videotimer?.cancel();
+              }
+            } else {
+              logic.startVideoTimer();
+              controller?.play();
+            }
+            // (controller?.value.isPlaying ?? true)
+            //     ? controller?.pause()
+            //     : controller?.play();
             setState(() {});
           },
           child: Container(
@@ -298,123 +319,126 @@ class _VideoPlayPageState extends State<VideoPlayPage>
               ),
             ],
           ),
-        // 顶部返回
+
-        Positioned(
+        if (!state.isVideoctrHide) ...[
-          top: ScreenUtil().statusBarHeight + 10.w,
+          // 顶部返回
-          left: 16.w,
+          Positioned(
-          child: GestureDetector(
+            top: ScreenUtil().statusBarHeight + 10.w,
-            onTap: () {
+            left: 16.w,
-              // if (state.isFromRecommend || state.recommendList.isEmpty) {
+            child: GestureDetector(
-              Get.back();
+              onTap: () {
-              // } else {
+                if (!state.isRecommend || state.recommendList.isEmpty) {
-              //   logic.showRecommendDialog();
+                  Get.back();
-              // }
+                } else {
-            },
+                  logic.showRecommendDialog();
-            child: Image.asset('ic_back_white.png'.ktIcon, width: 24.w),
+                }
-          ),
+              },
-        ),
+              child: Image.asset('ic_back_white.png'.ktIcon, width: 24.w),
-        // 底部控制器
-        Positioned(
-          bottom: 0,
-          left: 0.w,
-          child: Container(
-            width: ScreenUtil().screenWidth,
-            padding: EdgeInsets.fromLTRB(15.w, 40.w, 15.w, 40.w),
-            alignment: Alignment.bottomCenter,
-            decoration: BoxDecoration(
-              gradient: LinearGradient(
-                begin: Alignment.topCenter,
-                end: Alignment.bottomCenter,
-                colors: [
-                  Color(0xFF001D1F).withValues(alpha: 0),
-                  Color(0xFF001D1F),
-                ],
-              ),
             ),
-            child: Column(
+          ),
-              crossAxisAlignment: CrossAxisAlignment.start,
+          // 底部控制器
-              children: [
+          Positioned(
-                SizedBox(
+            bottom: 0,
-                  width: ScreenUtil().screenWidth - 100.w,
+            left: 0.w,
-                  child: Text(
+            child: Container(
-                    state.video?.shortPlayInfo?.name ?? '',
+              width: ScreenUtil().screenWidth,
-                    maxLines: 1,
+              padding: EdgeInsets.fromLTRB(15.w, 40.w, 15.w, 40.w),
-                    overflow: TextOverflow.ellipsis,
+              alignment: Alignment.bottomCenter,
-                    style: TextStyle(
+              decoration: BoxDecoration(
-                      fontSize: 16.sp,
+                gradient: LinearGradient(
-                      color: Colors.white,
+                  begin: Alignment.topCenter,
-                      fontWeight: FontWeight.w500,
+                  end: Alignment.bottomCenter,
-                    ),
+                  colors: [
-                  ),
+                    Color(0xFF001D1F).withValues(alpha: 0),
+                    Color(0xFF001D1F),
+                  ],
                 ),
-                if (logic.controllers[index] != null)
+              ),
-                  CustomVideoProgressBar(
+              child: Column(
-                    controller: logic.controllers[index]!,
+                crossAxisAlignment: CrossAxisAlignment.start,
-                    width: ScreenUtil().screenWidth,
+                children: [
-                  ),
+                  SizedBox(
-                SizedBox(height: 16.w),
+                    width: ScreenUtil().screenWidth - 100.w,
-                Row(
+                    child: Text(
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      state.video?.shortPlayInfo?.name ?? '',
-                  children: [
+                      maxLines: 1,
-                    GestureDetector(
+                      overflow: TextOverflow.ellipsis,
-                      onTap: showEpSelDialog,
+                      style: TextStyle(
-                      child: Container(
+                        fontSize: 16.sp,
-                        width: 300.w,
+                        color: Colors.white,
-                        padding: EdgeInsets.symmetric(
+                        fontWeight: FontWeight.w500,
-                          horizontal: 12.w,
-                          vertical: 9.w,
-                        ),
-                        decoration: BoxDecoration(
-                          borderRadius: BorderRadius.circular(50.w),
-                          color: Colors.white.withValues(alpha: .1),
-                        ),
-                        child: Row(
-                          children: [
-                            Image.asset('ic_ep.png'.ktIcon, width: 16.sp),
-                            SizedBox(width: 6.w),
-                            Text(
-                              'EP.${index + 1}',
-                              style: TextStyle(
-                                fontSize: 13.sp,
-                                color: Colors.white,
-                              ),
-                            ),
-                            const Spacer(),
-                            Text(
-                              'All ${state.video?.shortPlayInfo?.episodeTotal ?? 0} Episodes',
-                              style: TextStyle(
-                                fontSize: 13.sp,
-                                color: Colors.white,
-                              ),
-                            ),
-                          ],
-                        ),
                       ),
                     ),
-                    GetBuilder<VideoPlayLogic>(
+                  ),
-                      id: 'video-like',
+                  if (logic.controllers[index] != null)
-                      builder: (c) {
+                    CustomVideoProgressBar(
-                        return GestureDetector(
+                      controller: logic.controllers[index]!,
-                          onTap: () => logic.likeVideo(),
+                      width: ScreenUtil().screenWidth,
-                          child: Column(
+                    ),
+                  SizedBox(height: 16.w),
+                  Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: [
+                      GestureDetector(
+                        onTap: showEpSelDialog,
+                        child: Container(
+                          width: 300.w,
+                          padding: EdgeInsets.symmetric(
+                            horizontal: 12.w,
+                            vertical: 9.w,
+                          ),
+                          decoration: BoxDecoration(
+                            borderRadius: BorderRadius.circular(50.w),
+                            color: Colors.white.withValues(alpha: .1),
+                          ),
+                          child: Row(
                             children: [
-                              Image.asset(
+                              Image.asset('ic_ep.png'.ktIcon, width: 16.sp),
-                                state.video?.shortPlayInfo?.isCollect == true
+                              SizedBox(width: 6.w),
-                                    ? 'ic_collect_sel.png'.ktIcon
+                              Text(
-                                    : 'ic_collect_unsel.png'.ktIcon,
+                                'EP.${index + 1}',
-                                width: 32.w,
+                                style: TextStyle(
+                                  fontSize: 13.sp,
+                                  color: Colors.white,
+                                ),
+                              ),
+                              const Spacer(),
+                              Text(
+                                'All ${state.video?.shortPlayInfo?.episodeTotal ?? 0} Episodes',
+                                style: TextStyle(
+                                  fontSize: 13.sp,
+                                  color: Colors.white,
+                                ),
                               ),
                             ],
                           ),
-                        );
+                        ),
-                      },
+                      ),
-                    ),
+                      GetBuilder<VideoPlayLogic>(
-                  ],
+                        id: 'video-like',
-                ),
+                        builder: (c) {
-              ],
+                          return GestureDetector(
+                            onTap: () => logic.likeVideo(),
+                            child: Column(
+                              children: [
+                                Image.asset(
+                                  state.video?.shortPlayInfo?.isCollect == true
+                                      ? 'ic_collect_sel.png'.ktIcon
+                                      : 'ic_collect_unsel.png'.ktIcon,
+                                  width: 32.w,
+                                ),
+                              ],
+                            ),
+                          );
+                        },
+                      ),
+                    ],
+                  ),
+                ],
+              ),
             ),
           ),
-        ),
+        ],
       ],
     );
   }