From 504be6fbdac224ad7dbb2c72f7bc06c086aa7e84 Mon Sep 17 00:00:00 2001
From: guozhigq <guozhigq@outlook.com>
Date: Sat, 9 Mar 2024 01:18:26 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=90=9C=E7=B4=A2=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=BA=E8=AF=BE=E5=A0=82=E6=97=B6=E6=B8=B2?=
 =?UTF-8?q?=E6=9F=93=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/common/widgets/video_card_h.dart | 28 ++++++++++++++++++++++------
 lib/models/search/result.dart        |  4 +++-
 lib/utils/utils.dart                 | 12 +++++++++---
 3 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/lib/common/widgets/video_card_h.dart b/lib/common/widgets/video_card_h.dart
index c78643db..99059a9e 100644
--- a/lib/common/widgets/video_card_h.dart
+++ b/lib/common/widgets/video_card_h.dart
@@ -38,6 +38,10 @@ class VideoCardH extends StatelessWidget {
   Widget build(BuildContext context) {
     final int aid = videoItem.aid;
     final String bvid = videoItem.bvid;
+    String type = 'video';
+    try {
+      type = videoItem.type;
+    } catch (_) {}
     final String heroTag = Utils.makeHeroTag(aid);
     return GestureDetector(
       onLongPress: () {
@@ -53,6 +57,10 @@ class VideoCardH extends StatelessWidget {
       child: InkWell(
         onTap: () async {
           try {
+            if (type == 'ketang') {
+              SmartDialog.showToast('课堂视频暂不支持播放');
+              return;
+            }
             final int cid =
                 videoItem.cid ?? await SearchHttp.ab2c(aid: aid, bvid: bvid);
             Get.toNamed('/video?bvid=$bvid&cid=$cid',
@@ -95,12 +103,20 @@ class VideoCardH extends StatelessWidget {
                                   height: maxHeight,
                                 ),
                               ),
-                              PBadge(
-                                text: Utils.timeFormat(videoItem.duration!),
-                                right: 6.0,
-                                bottom: 6.0,
-                                type: 'gray',
-                              ),
+                              if (videoItem.duration != 0)
+                                PBadge(
+                                  text: Utils.timeFormat(videoItem.duration!),
+                                  right: 6.0,
+                                  bottom: 6.0,
+                                  type: 'gray',
+                                ),
+                              if (type != 'video')
+                                PBadge(
+                                  text: type,
+                                  left: 6.0,
+                                  bottom: 6.0,
+                                  type: 'primary',
+                                ),
                               // if (videoItem.rcmdReason != null &&
                               //     videoItem.rcmdReason.content != '')
                               //   pBadge(videoItem.rcmdReason.content, context,
diff --git a/lib/models/search/result.dart b/lib/models/search/result.dart
index 3d381ed9..0067791c 100644
--- a/lib/models/search/result.dart
+++ b/lib/models/search/result.dart
@@ -85,7 +85,9 @@ class SearchVideoItemModel {
     // title = json['title'].replaceAll(RegExp(r'<.*?>'), '');
     title = Em.regTitle(json['title']);
     description = json['description'];
-    pic = 'https:${json['pic']}';
+    pic = json['pic'] != null && json['pic'].startsWith('//')
+        ? 'https:${json['pic']}'
+        : json['pic'] ?? '';
     videoReview = json['video_review'];
     pubdate = json['pubdate'];
     senddate = json['senddate'];
diff --git a/lib/utils/utils.dart b/lib/utils/utils.dart
index 09d8c97f..62bd4d0a 100644
--- a/lib/utils/utils.dart
+++ b/lib/utils/utils.dart
@@ -50,6 +50,9 @@ class Utils {
       return time;
     }
     if (time < 3600) {
+      if (time == 0) {
+        return time;
+      }
       final int minute = time ~/ 60;
       final double res = time / 60;
       if (minute != res) {
@@ -87,6 +90,9 @@ class Utils {
 
   // 时间显示，刚刚，x分钟前
   static String dateFormat(timeStamp, {formatType = 'list'}) {
+    if (timeStamp == 0 || timeStamp == null || timeStamp == '') {
+      return '';
+    }
     // 当前时间
     int time = (DateTime.now().millisecondsSinceEpoch / 1000).round();
     // 对比
@@ -103,6 +109,7 @@ class Utils {
           toInt: false,
           formatType: formatType);
     }
+    print('distance: $distance');
     if (distance <= 60) {
       return '刚刚';
     } else if (distance <= 3600) {
@@ -344,9 +351,8 @@ class Utils {
   }
 
   static List<int> generateRandomBytes(int minLength, int maxLength) {
-    return List<int>.generate(
-      random.nextInt(maxLength-minLength+1), (_) => random.nextInt(0x60) + 0x20
-    );
+    return List<int>.generate(random.nextInt(maxLength - minLength + 1),
+        (_) => random.nextInt(0x60) + 0x20);
   }
 
   static String base64EncodeRandomString(int minLength, int maxLength) {