禁止收藏必应图片并兼容旧版

KagurazakaHanabi · Mar 30, 2020 · 9696325 · 9696325
1 parent ac0c2e0
commit 9696325
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 20 deletions.
diff --git a/lib/pages/about.dart b/lib/pages/about.dart
@@ -15,6 +15,7 @@
 import 'dart:convert';
 
 import 'package:cached_network_image/cached_network_image.dart';
+import 'package:dailypics/extension.dart';
 import 'package:dailypics/misc/bean.dart';
 import 'package:dailypics/model/app.dart';
 import 'package:dailypics/pages/upload.dart';
@@ -359,7 +360,21 @@ class _AboutPageState extends State<AboutPage> {
     }
 
     for (int i = 0; i < ids.length; i++) {
-      result.add((await TujianApi.getDetails(ids[i]))..marked = true);
+      if (!ids[i].isUuid) {
+        result.add(Picture(
+          id: ids[i],
+          title: '',
+          content: '',
+          width: 1080,
+          height: 1920,
+          user: '',
+          url: 'https://cn.bing.com/th?${ids[i]}.jpg',
+          date: 'Unknown',
+          marked: true,
+        ));
+      } else {
+        result.add((await TujianApi.getDetails(ids[i]))..marked = true);
+      }
     }
     AppModel.of(context).collections = result;
     return result;

diff --git a/lib/pages/details.dart b/lib/pages/details.dart
@@ -23,8 +23,8 @@ import 'package:dailypics/model/app.dart';
 import 'package:dailypics/utils/api.dart';
 import 'package:dailypics/utils/utils.dart';
 import 'package:dailypics/widget/adaptive_scaffold.dart';
-import 'package:dailypics/widget/photo_card.dart';
 import 'package:dailypics/widget/optimized_image.dart';
+import 'package:dailypics/widget/photo_card.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart' show CircularProgressIndicator, Colors, Divider;
@@ -182,17 +182,18 @@ class _DetailsPageState extends State<DetailsPage> {
             ),
           ),
         ),
-        GestureDetector(
-          onTap: _mark,
-          child: Padding(
-            padding: const EdgeInsets.only(left: 12),
-            child: Icon(
-              data.marked ? Ionicons.ios_heart : Ionicons.ios_heart_empty,
-              color: CupertinoColors.activeBlue,
-              size: 24,
+        if (data.id.isUuid || (!data.id.isUuid && data.marked))
+          GestureDetector(
+            onTap: _mark,
+            child: Padding(
+              padding: const EdgeInsets.only(left: 12),
+              child: Icon(
+                data.marked ? Ionicons.ios_heart : Ionicons.ios_heart_empty,
+                color: CupertinoColors.activeBlue,
+                size: 24,
+              ),
             ),
           ),
-        ),
         Padding(
           padding: const EdgeInsets.only(left: 16),
           child: _DownloadButton(data),
@@ -318,14 +319,16 @@ class _DetailsPageState extends State<DetailsPage> {
       child: Row(
         children: <Widget>[
           Expanded(child: Divider(color: dividerColor)),
-          Padding(
-            padding: const EdgeInsets.only(left: 8),
-            child: Text(username),
-          ),
-          Padding(
-            padding: const EdgeInsets.only(right: 8),
-            child: Text(date),
-          ),
+          if (username.isNotEmpty)
+            Padding(
+              padding: const EdgeInsets.only(left: 8),
+              child: Text(username),
+            ),
+          if (date.isNotEmpty)
+            Padding(
+              padding: const EdgeInsets.only(right: 8),
+              child: Text(date),
+            ),
           Expanded(child: Divider(color: dividerColor)),
         ],
       ),
@@ -400,7 +403,8 @@ class _DetailsPageState extends State<DetailsPage> {
   }
 
   String _parseDate(String s) {
-    DateTime date = DateTime.parse(s);
+    DateTime date = DateTime.tryParse(s);
+    if (date == null) return '';
     String result = '${date.month} 月 ${date.day} 日';
     if (date.year != DateTime.now().year) {
       result = '${date.year} 年 $result';