From 9bab646dcf3a66e13dffa2c914865fef4cba1183 Mon Sep 17 00:00:00 2001 From: honjow Date: Fri, 23 Jul 2021 00:08:36 +0800 Subject: [PATCH] =?UTF-8?q?Fix:=20=E4=B8=BB=E9=A2=98=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/const/theme_colors.dart | 6 +++--- lib/route/navigator_util.dart | 16 ++++++++++------ pubspec.yaml | 2 +- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/lib/const/theme_colors.dart b/lib/const/theme_colors.dart index bd588e2f2..c1ff76506 100644 --- a/lib/const/theme_colors.dart +++ b/lib/const/theme_colors.dart @@ -41,7 +41,7 @@ class EhDynamicColors { static const EhDynamicColor itemBackground = EhDynamicColor( color: Color.fromARGB(255, 255, 255, 255), darkColor: Color.fromARGB(255, 30, 30, 30), - darkGrayColor: Color.fromARGB(255, 30, 30, 30), + darkGrayColor: Color.fromARGB(255, 32, 32, 32), ); } @@ -165,7 +165,7 @@ class ThemeColors { /// 深色灰黑 static CupertinoThemeData darkGrayTheme = CupertinoThemeData( brightness: Brightness.dark, - scaffoldBackgroundColor: const Color.fromARGB(255, 30, 30, 30), + scaffoldBackgroundColor: const Color.fromARGB(255, 20, 20, 20), barBackgroundColor: navigationBarBackgroundGray, textTheme: ehTextTheme, ); @@ -243,7 +243,7 @@ class ThemeColors { debugLabel: 'navigationBarBackgroundGray', // color: Color.fromARGB(230, 35, 35, 35), color: Color.fromARGB(200, 249, 249, 249), - darkColor: Color.fromARGB(200, 35, 35, 35), + darkColor: Color.fromARGB(200, 25, 25, 25), // color: Color.fromARGB(222, 186, 27, 27), // darkColor: Color.fromARGB(230, 21, 212, 75), ); diff --git a/lib/route/navigator_util.dart b/lib/route/navigator_util.dart index dc74b21c6..bf5a4ac01 100644 --- a/lib/route/navigator_util.dart +++ b/lib/route/navigator_util.dart @@ -11,6 +11,7 @@ import 'package:fehviewer/pages/tab/view/search_page_new.dart'; import 'package:fehviewer/route/routes.dart'; import 'package:fehviewer/utils/logger.dart'; import 'package:flutter/cupertino.dart'; +import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; @@ -178,12 +179,15 @@ class NavigatorUtil { static Future goGalleryViewPage(int index, String gid) async { // logger.d('goGalleryViewPage $index'); // 命名路由方式 - // await Get.toNamed(EHRoutes.galleryView, arguments: index); - await Get.toNamed(EHRoutes.galleryViewExt, - arguments: ViewRepository( - index: index, - loadType: LoadType.network, - )); + if (!kDebugMode) { + await Get.toNamed(EHRoutes.galleryView, arguments: index); + } else { + await Get.toNamed(EHRoutes.galleryViewExt, + arguments: ViewRepository( + index: index, + loadType: LoadType.network, + )); + } } static Future goGalleryViewPageFile( diff --git a/pubspec.yaml b/pubspec.yaml index 3a09d74b2..bb58d9efc 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -3,7 +3,7 @@ description: fehviewer publish_to: 'none' # Remove this line if you wish to publish to pub.dev -version: 1.1.20+248 +version: 1.1.20+250 environment: sdk: '>=2.13.0 <3.0.0'