Merge pull request #33 from CaiJingLong/auto-refresh-patch-2

update gallery change refresh

CHANGELOG.md

@@ -4,10 +4,14 @@
 
 **Breaking change**. Migrate from the deprecated original Android Support Library to AndroidX. This shouldn't result in any functional changes, but it requires any Android apps using this plugin to also migrate if they're using the original support library.
 
+add:
+
+- When the album changes, it refreshes in real time.
+
 fix:
 
-- duration badge
-- sort image
+- Video duration badge time problem.
+- Images sort by create time.
 
 ## [0.2.0]
 

README.md

@@ -14,7 +14,7 @@ use flutter as ui
 
 if you want to build custom ui, you just need api to make custom ui. to use [photo_manager](https://github.com/CaiJingLong/flutter_photo_manager) or fork the library to custom ui.
 
-## screenshot
+## Screenshot
 
 ![image](https://github.com/CaiJingLong/some_asset/blob/master/image_picker1.gif)
 
@@ -27,7 +27,7 @@ dependencies:
   photo: $latest_version
 ```
 
-## import
+## Import
 
 ```dart
 import 'package:photo/photo.dart';
@@ -81,19 +81,23 @@ void pickAsset() async {
     );
 ```
 
-### about photoPathList params
+### About photoPathList params
 
 You can use [photo_manager] package to get `List<AssetPathEntity>` and handle or cache.
 
 This parameter is then passed into the `pickAsset` method, where the incoming photoList is rendered instead of the data in the album.
 
-## whole example
+## Whole example
 
-you can see [github](https://github.com/caijinglong/flutter_photo/blob/master/example/) [main.dart](https://github.com/caijinglong/flutter_photo/blob/master/example/lib/main.dart)
+You can see [github](https://github.com/caijinglong/flutter_photo/blob/master/example/) [main.dart](https://github.com/caijinglong/flutter_photo/blob/master/example/lib/main.dart)
 
-## about android
+## About android
 
-### glide
+### Migrate to androidX
+
+See the [gitbook](https://caijinglong.gitbooks.io/migrate-flutter-to-androidx/content/)
+
+### Glide
 
 Android native use glide to create image thumb bytes, version is 4.8.0.
 
@@ -120,7 +124,7 @@ if you use the proguard
 
 see the [github](https://github.com/bumptech/glide#proguard)
 
-## about ios
+## About ios
 
 Because the album is a privacy privilege, you need user permission to access it. You must to modify the `Info.plist` file in Runner project.
 
@@ -134,15 +138,15 @@ like next
 xcode like image
 ![in xcode](https://github.com/CaiJingLong/some_asset/blob/master/flutter_photo2.png)
 
-### build error
+### Build error
 
 if you build error like include of non-modular header inside framework module, see [#10](https://github.com/CaiJingLong/flutter_photo/issues/10) or [so](https://stackoverflow.com/questions/27776497/include-of-non-modular-header-inside-framework-module)
 
-## thanks
+## Thanks
 
 Part of the Android code comes from [debuggerx01](https://github.com/debuggerx01).
 
-## donate
+## Donate
 
 If my code helps you, and you're willing to buy me a cup of coffee.
 

lib/src/engine/throttle.dart

@@ -0,0 +1,52 @@
+import 'dart:async';
+
+import 'package:meta/meta.dart';
+
+typedef VoidCallback();
+
+/// When multiple calls are repeated, only the first time is valid.
+///
+/// Like rxdart `throttle` method
+class Throttle {
+  Duration duration;
+
+  VoidCallback onCall;
+
+  bool _isRunning = false;
+
+  Timer _timer;
+
+  Throttle({
+    @required this.onCall,
+    this.duration = const Duration(seconds: 2),
+  });
+
+  void call() {
+    if (!_isRunning) {
+      _startTimer();
+      onCall?.call();
+    }
+  }
+
+  void _startTimer() {
+    if (_timer != null) {
+      _stopTimer();
+    }
+    _isRunning = true;
+    _timer = Timer(duration, () {
+      _isRunning = false;
+      _timer = null;
+    });
+  }
+
+  void _stopTimer() {
+    _timer?.cancel();
+    _isRunning = false;
+    _timer = null;
+  }
+
+  void dispose() {
+    this.onCall = null;
+    _stopTimer();
+  }
+}

lib/src/ui/page/photo_main_page.dart

@@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:photo/src/delegate/badge_delegate.dart';
 import 'package:photo/src/delegate/loading_delegate.dart';
 import 'package:photo/src/engine/lru_cache.dart';
+import 'package:photo/src/engine/throttle.dart';
 import 'package:photo/src/entity/options.dart';
 import 'package:photo/src/provider/config_provider.dart';
 import 'package:photo/src/provider/gallery_list_provider.dart';
@@ -72,20 +73,24 @@ class _PhotoMainPageState extends State<PhotoMainPage>
 
   bool get useAlbum => widget.photoList == null || widget.photoList.isEmpty;
 
+  Throttle _changeThrottle;
+
   @override
   void initState() {
     super.initState();
     _refreshList();
     scaffoldKey = GlobalKey();
     scrollController = ScrollController();
-    PhotoManager.addChangeCallback(_onAssetChange);
+    _changeThrottle = Throttle(onCall: _onAssetChange);
+    PhotoManager.addChangeCallback(_changeThrottle.call);
     PhotoManager.startChangeNotify();
   }
 
   @override
   void dispose() {
-    PhotoManager.removeChangeCallback(_onAssetChange);
+    PhotoManager.removeChangeCallback(_changeThrottle.call);
     PhotoManager.stopChangeNotify();
+    _changeThrottle.dispose();
     scaffoldKey = null;
     super.dispose();
   }
@@ -353,8 +358,8 @@ class _PhotoMainPageState extends State<PhotoMainPage>
     setState(() {});
   }
 
-  void _onGalleryChange(AssetPathEntity value) {
-    _currentPath = value;
+  void _onGalleryChange(AssetPathEntity assetPathEntity) {
+    _currentPath = assetPathEntity;
 
     _currentPath.assetList.then((v) {
       _sortAssetList(v);
@@ -460,8 +465,38 @@ class _PhotoMainPageState extends State<PhotoMainPage>
 
   void _onAssetChange() {
     if (useAlbum) {
-      _refreshList();
+      _onPhotoRefresh();
+    }
+  }
+
+  void _onPhotoRefresh() async {
+    List<AssetPathEntity> pathList;
+    switch (options.pickType) {
+      case PickType.onlyImage:
+        pathList = await PhotoManager.getImageAsset();
+        break;
+      case PickType.onlyVideo:
+        pathList = await PhotoManager.getVideoAsset();
+        break;
+      default:
+        pathList = await PhotoManager.getAssetPathList();
+    }
+
+    if (pathList == null) {
+      return;
+    }
+
+    this.galleryPathList.clear();
+    this.galleryPathList.addAll(pathList);
+
+    if (!this.galleryPathList.contains(this.currentPath)) {
+      // current path is deleted , 当前的相册被删除, 应该提示刷新
+      if (this.galleryPathList.length > 0) {
+        _onGalleryChange(this.galleryPathList[0]);
+      }
+      return;
     }
+    // Not deleted
+    _onGalleryChange(this.currentPath);
   }
-  
 }

pubspec.lock

@@ -70,11 +70,9 @@ packages:
   photo_manager:
     dependency: "direct main"
     description:
-      path: "."
-      ref: "8ef0bf9047cdd86e2331f0db8d15c4c50f35610d"
-      resolved-ref: "8ef0bf9047cdd86e2331f0db8d15c4c50f35610d"
-      url: "https://github.com/CaiJingLong/flutter_photo_manager.git"
-    source: git
+      name: photo_manager
+      url: "https://pub.flutter-io.cn"
+    source: hosted
     version: "0.3.0"
   quiver:
     dependency: transitive

pubspec.yaml

@@ -11,11 +11,11 @@ dependencies:
   flutter:
     sdk: flutter
 
-  # photo_manager: ^0.2.1
-  photo_manager:
-    git:
-      url: https://github.com/CaiJingLong/flutter_photo_manager.git
-      ref: 8ef0bf9047cdd86e2331f0db8d15c4c50f35610d
+  photo_manager: ^0.3.0
+  # photo_manager:
+  #   git:
+  #     url: https://github.com/CaiJingLong/flutter_photo_manager.git
+  #     ref: 2e4821c1fa797272e4c454366b4fb264e8a054d6
   # photo_manager:
   #   path: ../flutter_photo_manager