update 1.0.7

This commit is contained in:
jyuesong
2022-02-21 14:38:12 +08:00
parent 5a681067b7
commit ab2fdb28c2
7 changed files with 350 additions and 334 deletions

View File

@@ -1,3 +1,8 @@
## v1.0.7
* 首页任务增加分类
* 增加国际化相关配置
* 登录页状态栏适配
## v1.0.6 ## v1.0.6
* 支持切换账号功能 * 支持切换账号功能
* 登录页青龙图标随颜色主题变换 * 登录页青龙图标随颜色主题变换

View File

@@ -10,6 +10,7 @@ import 'package:logger/logger.dart';
import 'package:qinglong_app/base/theme.dart'; import 'package:qinglong_app/base/theme.dart';
import 'package:qinglong_app/module/login/login_page.dart'; import 'package:qinglong_app/module/login/login_page.dart';
import 'package:qinglong_app/utils/sp_utils.dart'; import 'package:qinglong_app/utils/sp_utils.dart';
import 'package:flutter_localizations/flutter_localizations.dart';
import 'base/routes.dart'; import 'base/routes.dart';
import 'base/userinfo_viewmodel.dart'; import 'base/userinfo_viewmodel.dart';
@@ -34,8 +35,7 @@ void main() async {
), ),
); );
if (Platform.isAndroid) { if (Platform.isAndroid) {
SystemUiOverlayStyle style = SystemUiOverlayStyle style = const SystemUiOverlayStyle(statusBarColor: Colors.transparent);
const SystemUiOverlayStyle(statusBarColor: Colors.transparent);
SystemChrome.setSystemUIOverlayStyle(style); SystemChrome.setSystemUIOverlayStyle(style);
} }
} }
@@ -56,14 +56,22 @@ class QlAppState extends ConsumerState<QlApp> {
FocusScope.of(context).requestFocus(FocusNode()); FocusScope.of(context).requestFocus(FocusNode());
}, },
child: MediaQuery( child: MediaQuery(
data: data: MediaQueryData.fromWindow(WidgetsBinding.instance!.window).copyWith(
MediaQueryData.fromWindow(WidgetsBinding.instance!.window).copyWith(
textScaleFactor: 1, textScaleFactor: 1,
), ),
child: MaterialApp( child: MaterialApp(
title: "青龙", title: "青龙",
locale: const Locale('zh', 'CN'), locale: const Locale('zh', 'CN'),
navigatorKey: navigatorState, navigatorKey: navigatorState,
localizationsDelegates: const [
GlobalMaterialLocalizations.delegate,
GlobalWidgetsLocalizations.delegate,
GlobalCupertinoLocalizations.delegate,
],
supportedLocales: const [
Locale('zh', 'CN'),
Locale('en', 'US'),
],
theme: ref.watch<ThemeViewModel>(themeProvider).currentTheme, theme: ref.watch<ThemeViewModel>(themeProvider).currentTheme,
onGenerateRoute: (setting) { onGenerateRoute: (setting) {
return Routes.generateRoute(setting); return Routes.generateRoute(setting);
@@ -73,9 +81,7 @@ class QlAppState extends ConsumerState<QlApp> {
if (!kReleaseMode) { if (!kReleaseMode) {
showDebugBtn(context); showDebugBtn(context);
} }
return getIt<UserInfoViewModel>().isLogined() return getIt<UserInfoViewModel>().isLogined() ? const HomePage() : const LoginPage();
? const HomePage()
: const LoginPage();
}, },
), ),
// home: LoginPage(), // home: LoginPage(),

View File

@@ -1,6 +1,7 @@
import 'package:dio_log/dio_log.dart'; import 'package:dio_log/dio_log.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:qinglong_app/base/http/api.dart'; import 'package:qinglong_app/base/http/api.dart';
import 'package:qinglong_app/base/http/http.dart'; import 'package:qinglong_app/base/http/http.dart';
@@ -74,7 +75,9 @@ class _LoginPageState extends ConsumerState<LoginPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return SafeArea( return Scaffold(
body: AnnotatedRegion<SystemUiOverlayStyle>(
value: ref.watch(themeProvider).darkMode == true ? SystemUiOverlayStyle.light : SystemUiOverlayStyle.dark,
child: ColoredBox( child: ColoredBox(
color: ref.watch(themeProvider).themeColor.settingBgColor(), color: ref.watch(themeProvider).themeColor.settingBgColor(),
child: SizedBox( child: SizedBox(
@@ -407,6 +410,7 @@ class _LoginPageState extends ConsumerState<LoginPage> {
), ),
), ),
), ),
),
); );
} }

View File

@@ -57,7 +57,7 @@ class _TaskPageState extends State<TaskPage> {
text: "从未运行", text: "从未运行",
), ),
Tab( Tab(
text: "脚本", text: "拉库脚本",
), ),
Tab( Tab(
text: "已禁用", text: "已禁用",

View File

@@ -43,7 +43,7 @@ class TaskViewModel extends BaseViewModel {
running.clear(); running.clear();
running.addAll(list.where((element) => element.status == 0)); running.addAll(list.where((element) => element.status == 0));
neverRunning.clear(); neverRunning.clear();
neverRunning.addAll(list.where((element) => element.lastRunningTime == null || element.lastRunningTime == 0)); neverRunning.addAll(list.where((element) => element.lastRunningTime == null ));
notScripts.clear(); notScripts.clear();
notScripts.addAll(list.where((element) => (element.command != null && (element.command!.startsWith("ql repo") || element.command!.startsWith("ql raw"))))); notScripts.addAll(list.where((element) => (element.command != null && (element.command!.startsWith("ql repo") || element.command!.startsWith("ql raw")))));
disabled.clear(); disabled.clear();

View File

@@ -1,17 +1,18 @@
name: qinglong_app name: qinglong_app
description: A new Flutter project. description: A new Flutter project.
publish_to: 'none' # Remove this line if you wish to publish to pub.dev publish_to: 'none' # Remove this line if you wish to publish to pub.dev
version: 1.0.6+8 version: 1.0.7+9
environment: environment:
sdk: ">=2.15.1 <3.0.0" sdk: ">=2.15.1 <3.0.0"
flutter: ">=2.8.1" flutter: ">=2.10.1"
dependencies: dependencies:
flutter: flutter:
sdk: flutter sdk: flutter
flutter_localizations:
sdk: flutter
cupertino_icons: ^1.0.4 cupertino_icons: ^1.0.4
flutter_riverpod: ^1.0.3 flutter_riverpod: ^1.0.3
shared_preferences: ^2.0.13 shared_preferences: ^2.0.13

View File

@@ -1 +1 @@
1.0.6 1.0.7