This commit is contained in:
cxc
2023-02-10 17:33:51 +08:00
parent bd259d8303
commit 5f5f2554eb
10 changed files with 100 additions and 38 deletions

View File

@ -1,8 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
// import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:momo/material/router.dart';
import 'package:momo/provider/rerender.dart';
import 'package:momo/provider/token.dart';
import 'package:shared_preferences/shared_preferences.dart';
@ -18,8 +17,9 @@ class MyMaterialApp extends ConsumerWidget {
@override
Widget build(BuildContext context, WidgetRef ref) {
String? token = ref.watch(tokenProvider);
UniqueKey uniqueKey = ref.watch(uniqueIdProvider);
MyMaterialRouterConfig myMaterialRouterConfig =
MyMaterialRouterConfig(token);
MyMaterialRouterConfig(token,uniqueKey);
return MaterialApp.router(
routerConfig: myMaterialRouterConfig.router,

View File

@ -3,6 +3,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:go_router/go_router.dart';
import 'package:momo/models/image_list_resp.dart';
import 'package:momo/models/image_resp.dart';
import 'package:momo/provider/gallery.dart';
import 'package:momo/request/http_client.dart';
class Gallery extends ConsumerStatefulWidget {
@ -13,14 +14,20 @@ class Gallery extends ConsumerStatefulWidget {
}
class _GalleryState extends ConsumerState<Gallery> {
late ScrollController _scrollController;
List<ImageResp> imageList = [];
int pageNum = 1;
int pageSize = 10;
bool hasMore = false;
bool loading = true;
bool hasMore = true;
bool loading = false;
Future<dynamic> loadImages() async {
loading = true;
if (!hasMore) {
loading = false;
return;
}
print(pageNum);
var resp = await dio.get("/image/history",
queryParameters: {"page": pageNum, "size": pageSize});
@ -38,8 +45,9 @@ class _GalleryState extends ConsumerState<Gallery> {
void resetState() {
imageList = [];
pageNum = 1;
hasMore = false;
loading = true;
hasMore = true;
loading = false;
ref.read(galleryProvider.notifier).clearImage();
}
@override
@ -47,26 +55,30 @@ class _GalleryState extends ConsumerState<Gallery> {
// TODO: implement initState
super.initState();
print("init");
// resetState();
// ref.read(galleryProvider.notifier).clearImage();
_scrollController = ScrollController(initialScrollOffset: 5.0)
..addListener(() {
if (_scrollController.offset >=
_scrollController.position.maxScrollExtent &&
!_scrollController.position.outOfRange) {
print("到底了 controller $loading");
if (!loading) {
loadImages();
}
}
});
loadImages();
}
@override
Widget build(BuildContext context) {
print("build");
print("build gallery");
return GridView.builder(
itemCount: imageList.length,
controller: _scrollController,
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: MediaQuery.of(context).size.width > 640 ? 5 : 3),
itemBuilder: (BuildContext context, int index) {
if (index == imageList.length - 1 && imageList.length < 200) {
if (hasMore && pageNum != 1 && !loading) {
loadImages();
} else {
print("没有了");
}
}
return InkWell(
onTap: () {
context.go(Uri(
@ -83,5 +95,28 @@ class _GalleryState extends ConsumerState<Gallery> {
),
);
});
// final imageList = ref.watch(galleryProvider);
// return GridView.builder(
// itemCount: imageList.length,
// controller: _scrollController,
// gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
// crossAxisCount: MediaQuery.of(context).size.width > 640 ? 5 : 3),
// itemBuilder: (BuildContext context, int index) {
// return InkWell(
// onTap: () {
// context.go(Uri(
// path: "/detail",
// queryParameters: {"id": "${imageList[index].id}"})
// .toString());
// },
// child: Image.network(
// "${dio.options.baseUrl}/image/thumbnail/${imageList[index].file_path}",
// fit: BoxFit.cover,
// errorBuilder: (BuildContext context, o, err) {
// return const Icon(Icons.error_outline);
// },
// ),
// );
// });
}
}

View File

@ -5,6 +5,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:go_router/go_router.dart';
import 'package:http_parser/http_parser.dart';
import 'package:mime/mime.dart';
import 'package:momo/provider/rerender.dart';
import 'package:momo/request/http_client.dart';
class HomePage extends ConsumerStatefulWidget {
@ -25,10 +26,6 @@ class _HomePageState extends ConsumerState<HomePage> {
@override
Widget build(BuildContext context) {
print(
widget.content.toString(),
);
print("123");
return Scaffold(
appBar: AppBar(
leading: ["/", "/profile"].contains(GoRouterState.of(context).location)
@ -67,8 +64,7 @@ class _HomePageState extends ConsumerState<HomePage> {
mimeType.split("/").last))
});
await dio.post("/image/upload", data: data).then((value) {
// widget.content.key = GlobalKey();
// widget.content
ref.read(uniqueIdProvider.notifier).updateId();
ScaffoldMessenger.of(context).showSnackBar(SnackBar(
content: Row(
crossAxisAlignment: CrossAxisAlignment.center,

View File

@ -8,10 +8,11 @@ import 'package:momo/material/profile.dart';
class MyMaterialRouterConfig {
late GoRouter router;
final GlobalKey<NavigatorState> _rootNavigatorKey =
GlobalKey<NavigatorState>();
MyMaterialRouterConfig(String? token) {
MyMaterialRouterConfig(String? token, UniqueKey uniqueKey) {
router = GoRouter(
navigatorKey: _rootNavigatorKey,
initialLocation: "/",