完善了预览页面的选择逻辑和大图显示逻辑

lib/src/ui/page/photo_main_page.dart

@@ -49,6 +49,8 @@ class _PhotoMainPageState extends State<PhotoMainPage>
   GlobalKey scaffoldKey;
   ScrollController scrollController;
 
+  bool isPushed = false;
+
   @override
   void initState() {
     super.initState();
@@ -127,6 +129,9 @@ class _PhotoMainPageState extends State<PhotoMainPage>
   }
 
   void _showTip(String msg) {
+    if (isPushed) {
+      return;
+    }
     Scaffold.of(scaffoldKey.currentContext).showSnackBar(
       SnackBar(
         content: Text(
@@ -267,6 +272,7 @@ class _PhotoMainPageState extends State<PhotoMainPage>
 
   void _onItemClick(ImageEntity data, int index) {
     var result = new PhotoPreviewResult();
+    isPushed = true;
     Navigator.of(context).push(
       MaterialPageRoute(
         builder: (ctx) {
@@ -284,12 +290,14 @@ class _PhotoMainPageState extends State<PhotoMainPage>
         },
       ),
     ).then((v) {
+      isPushed = false;
       setState(() {});
     });
   }
 
   void _onTapPreview() {
     var result = new PhotoPreviewResult();
+    isPushed = true;
     Navigator.of(context)
         .push(
       MaterialPageRoute(
@@ -307,6 +315,7 @@ class _PhotoMainPageState extends State<PhotoMainPage>
     )
         .then(
       (v) {
+        isPushed = false;
         compareAndRemoveEntities(result.previewSelectedList);
       },
     );

lib/src/ui/page/photo_preview_page.dart

@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:io';
 import 'dart:typed_data';
 
 import 'package:flutter/material.dart';
@@ -54,8 +53,24 @@ class _PhotoPreviewPageState extends State<PhotoPreviewPage> {
 
   bool get changeProviderOnCheckChange => widget.changeProviderOnCheckChange;
 
-  List<ImageEntity> get previewSelectedList =>
-      widget.result.previewSelectedList;
+  PhotoPreviewResult get result => widget.result;
+
+  /// 缩略图用的数据
+  ///
+  /// 用于与provider数据联动
+  List<ImageEntity> get previewList {
+    return selectedProvider.selectedList;
+  }
+
+  /// 选中的数据
+  List<ImageEntity> _selectedList = [];
+
+  List<ImageEntity> get selectedList {
+    if (changeProviderOnCheckChange) {
+      return previewList;
+    }
+    return _selectedList;
+  }
 
   PageController pageController;
 
@@ -63,11 +78,14 @@ class _PhotoPreviewPageState extends State<PhotoPreviewPage> {
   void initState() {
     super.initState();
     pageChangeController.add(0);
-    previewSelectedList.clear();
-    previewSelectedList.addAll(selectedProvider.selectedList);
     pageController = PageController(
       initialPage: widget.initIndex,
     );
+
+    _selectedList.clear();
+    _selectedList.addAll(selectedProvider.selectedList);
+
+    result.previewSelectedList = _selectedList;
   }
 
   @override
@@ -128,7 +146,7 @@ class _PhotoPreviewPageState extends State<PhotoPreviewPage> {
           var index = snapshot.data;
           var data = list[index];
           return CheckboxListTile(
-            value: previewSelectedList.contains(data),
+            value: selectedList.contains(data),
             onChanged: (bool check) {
               if (changeProviderOnCheckChange) {
                 _onChangeProvider(check, index);
@@ -154,9 +172,9 @@ class _PhotoPreviewPageState extends State<PhotoPreviewPage> {
   void _onCheckInOnlyPreview(bool check, int index) {
     var item = list[index];
     if (check) {
-      previewSelectedList.add(item);
+      selectedList.add(item);
     } else {
-      previewSelectedList.remove(item);
+      selectedList.remove(item);
     }
     pageChangeController.add(index);
   }
@@ -165,12 +183,9 @@ class _PhotoPreviewPageState extends State<PhotoPreviewPage> {
   void _onChangeProvider(bool check, int index) {
     var item = list[index];
     if (check) {
-      if (selectedProvider.addSelectEntity(item)) {
-        previewSelectedList.add(item);
-      }
+      selectedProvider.addSelectEntity(item);
     } else {
       selectedProvider.removeSelectEntity(item);
-      previewSelectedList.remove(item);
     }
     pageChangeController.add(index);
   }
@@ -187,18 +202,21 @@ class _PhotoPreviewPageState extends State<PhotoPreviewPage> {
   }
 
   Widget _buildThumb() {
-    return Container(
-      height: 80.0,
-      child: ListView.builder(
-        itemBuilder: _buildThumbItem,
-        itemCount: previewSelectedList.length,
-        scrollDirection: Axis.horizontal,
-      ),
+    return StreamBuilder(
+      builder: (ctx, snapshot) => Container(
+            height: 80.0,
+            child: ListView.builder(
+              itemBuilder: _buildThumbItem,
+              itemCount: previewList.length,
+              scrollDirection: Axis.horizontal,
+            ),
+          ),
+      stream: pageStream,
     );
   }
 
   Widget _buildThumbItem(BuildContext context, int index) {
-    var item = previewSelectedList[index];
+    var item = previewList[index];
     return GestureDetector(
       onTap: () => changeSelected(item, index),
       child: Container(
@@ -213,7 +231,7 @@ class _PhotoPreviewPageState extends State<PhotoPreviewPage> {
               child: StreamBuilder(
                 stream: pageStream,
                 builder: (BuildContext context, AsyncSnapshot snapshot) {
-                  if (previewSelectedList.contains(item)) {
+                  if (selectedList.contains(item)) {
                     return Container();
                   }
                   return Container(
@@ -247,13 +265,15 @@ class _BigPhotoImageState extends State<BigPhotoImage>
     with AutomaticKeepAliveClientMixin {
   @override
   Widget build(BuildContext context) {
+    var width = MediaQuery.of(context).size.width;
+    var height = MediaQuery.of(context).size.height;
     return FutureBuilder(
-      future: widget.imageEntity.thumbDataWithSize(1300, 1300),
+      future:
+          widget.imageEntity.thumbDataWithSize(width.floor(), height.floor()),
       builder: (BuildContext context, AsyncSnapshot<Uint8List> snapshot) {
         var file = snapshot.data;
         if (snapshot.connectionState == ConnectionState.done && file != null) {
-          // todo ios 图片优化,在返回时再生成图片
-          // 展示时,不允许放大,使用原生方案生成一个与屏幕同宽的图片
+          print(file.length);
           return Image.memory(
             file,
             fit: BoxFit.contain,

pubspec.lock

@@ -211,8 +211,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "6da7b897b0c0a174a4285831193428c8c0df73d5"
-      resolved-ref: "6da7b897b0c0a174a4285831193428c8c0df73d5"
+      ref: c87060911e1312113a9df43bec084e0c031ac58a
+      resolved-ref: c87060911e1312113a9df43bec084e0c031ac58a
       url: "https://github.com/CaiJingLong/flutter_photo_manager.git"
     source: git
     version: "0.0.1"

pubspec.yaml

@@ -13,7 +13,7 @@ dependencies:
   photo_manager:
     git:
       url: https://github.com/CaiJingLong/flutter_photo_manager.git
-      ref: 6da7b897b0c0a174a4285831193428c8c0df73d5
+      ref: c87060911e1312113a9df43bec084e0c031ac58a
 #  photo_manager:
 #    path: /Users/caijinglong/code/flutter/plugin/flutter_photo_manager/