diff --git a/wallpaper/lib/pages/downloadpage/downloadpage_view.dart b/wallpaper/lib/pages/downloadpage/downloadpage_view.dart index 8e55fa6..1f1bff3 100644 --- a/wallpaper/lib/pages/downloadpage/downloadpage_view.dart +++ b/wallpaper/lib/pages/downloadpage/downloadpage_view.dart @@ -1,7 +1,8 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; +import 'package:wallpaper/pages/downloadpage/downloadpage_controller.dart'; -class DownloadPageView extends GetView { +class DownloadPageView extends GetView { const DownloadPageView({super.key}); @override diff --git a/wallpaper/lib/pages/imgcategorypage/imgcategorypage_controller.dart b/wallpaper/lib/pages/imgcategorypage/imgcategorypage_controller.dart index 20481b5..1c4c075 100644 --- a/wallpaper/lib/pages/imgcategorypage/imgcategorypage_controller.dart +++ b/wallpaper/lib/pages/imgcategorypage/imgcategorypage_controller.dart @@ -1,5 +1,6 @@ import 'package:get/get.dart'; import 'package:wallpaper/models/imgnetodel.dart'; +import 'package:wallpaper/routes/app_routes.dart'; import 'package:wallpaper/utils/downloadmanager.dart'; class ImgCategoryPageController extends GetxController { @@ -19,4 +20,8 @@ class ImgCategoryPageController extends GetxController { //提示框 //....已下载 } + + void goScanView(var index,var dataModel){ + Get.toNamed(AppRoutes.imgscanpage, arguments: {"index":index,"dataModel":dataModel}); + } } \ No newline at end of file diff --git a/wallpaper/lib/pages/imgcategorypage/imgcategorypage_view.dart b/wallpaper/lib/pages/imgcategorypage/imgcategorypage_view.dart index 87b2cad..a85f7e1 100644 --- a/wallpaper/lib/pages/imgcategorypage/imgcategorypage_view.dart +++ b/wallpaper/lib/pages/imgcategorypage/imgcategorypage_view.dart @@ -68,7 +68,8 @@ class ImgCategoryPageView extends GetView { color: Colors.transparent, child: InkWell( onTap: () { - Get.to(ImgScanPageView(dataModel: controller.dataModel,currentIndex: index,)); + // Get.to(ImgScanPageView(dataModel: controller.dataModel,currentIndex: index,)); + controller.goScanView(index, controller.dataModel); }, child: Align( alignment: Alignment.bottomCenter, diff --git a/wallpaper/lib/pages/imgscanpage/imgscanpage_controller.dart b/wallpaper/lib/pages/imgscanpage/imgscanpage_controller.dart index 4f1d5e5..7f6bcf2 100644 --- a/wallpaper/lib/pages/imgscanpage/imgscanpage_controller.dart +++ b/wallpaper/lib/pages/imgscanpage/imgscanpage_controller.dart @@ -1,5 +1,15 @@ import 'package:get/get.dart'; +import 'package:get/get_rx/get_rx.dart'; +import 'package:wallpaper/models/imgnetodel.dart'; class ImgScanPageController extends GetxController { - + late NetImgCategory dataModel; + RxInt currentIndex = RxInt(0); + + @override + void onInit(){ + super.onInit(); + currentIndex.value = Get.arguments["index"]; + dataModel = Get.arguments["dataModel"]; + } } \ No newline at end of file diff --git a/wallpaper/lib/pages/imgscanpage/imgscanpage_view.dart b/wallpaper/lib/pages/imgscanpage/imgscanpage_view.dart index 6324fa1..ee4dd43 100644 --- a/wallpaper/lib/pages/imgscanpage/imgscanpage_view.dart +++ b/wallpaper/lib/pages/imgscanpage/imgscanpage_view.dart @@ -4,13 +4,14 @@ import 'package:wallpaper/models/imgnetodel.dart'; import 'package:photo_view/photo_view.dart'; import 'package:photo_view/photo_view_gallery.dart'; +import 'package:wallpaper/pages/imgscanpage/imgscanpage_controller.dart'; -class ImgScanPageView extends GetView { - final NetImgCategory dataModel; - final int currentIndex; +class ImgScanPageView extends GetView { + // final NetImgCategory dataModel; + // final int currentIndex; - const ImgScanPageView({super.key,required this.dataModel,required this.currentIndex}); + // const ImgScanPageView({super.key,required this.dataModel,required this.currentIndex}); @override Widget build(BuildContext context) { @@ -27,7 +28,7 @@ class ImgScanPageView extends GetView { scrollPhysics: const BouncingScrollPhysics(), builder: (BuildContext context, int index) { return PhotoViewGalleryPageOptions( - imageProvider: NetworkImage(dataModel.data![index].original!), + imageProvider: NetworkImage(controller.dataModel.data![index].original!), initialScale: PhotoViewComputedScale.contained * 0.8, minScale: PhotoViewComputedScale.contained*0.4, maxScale: PhotoViewComputedScale.contained * 4, @@ -37,7 +38,7 @@ class ImgScanPageView extends GetView { // heroAttributes: PhotoViewHeroAttributes(tag: galleryItems[index].id), ); }, - itemCount: dataModel.data!.length, + itemCount: controller.dataModel.data!.length, loadingBuilder: (context, event) => Center( child: SizedBox( width: 20.0, diff --git a/wallpaper/lib/routes/app_routes.dart b/wallpaper/lib/routes/app_routes.dart index 4f07f29..0cac2f4 100644 --- a/wallpaper/lib/routes/app_routes.dart +++ b/wallpaper/lib/routes/app_routes.dart @@ -2,6 +2,7 @@ import 'package:wallpaper/pages/homepage/homepage_binding.dart'; import 'package:wallpaper/pages/imgcategorypage/imgcategorypage_binding.dart'; import 'package:wallpaper/pages/imgcategorypage/imgcategorypage_view.dart'; import 'package:wallpaper/pages/imgscanpage/imgscanpage_binding.dart'; +import 'package:wallpaper/pages/imgscanpage/imgscanpage_view.dart'; import 'package:wallpaper/pages/tabarpage/tabarpage_binding.dart'; import 'package:wallpaper/pages/tabarpage/tabarpage_view.dart'; @@ -19,17 +20,25 @@ class AppRoutes { AppRoutes._(); static const initialPage = '/tabvc'; static const imgcategorypage = "/ImgCategoryPage"; + static const imgscanpage = "/imgscanpage"; + static final routes= [ GetPage( name: initialPage, page: ()=> const TabbarPageView(), - bindings: [TabbarPageBinding(), HomePageBinding(),DownloadPageBinding(),MyPageBinding(),ImgScanPageBinding()], + bindings: [TabbarPageBinding(), HomePageBinding(),DownloadPageBinding(),MyPageBinding()], ), GetPage( name: imgcategorypage, page: ()=> const ImgCategoryPageView(), bindings: [ImgCategoryPageBinding()], ), + GetPage( + name: imgscanpage, + page: ()=> ImgScanPageView(), + bindings: [ImgScanPageBinding()], + ), + ]; } \ No newline at end of file