From e9e875a4da06db4334be17e78bd7255d9263b3c9 Mon Sep 17 00:00:00 2001 From: niuhuan Date: Thu, 11 Nov 2021 10:10:18 +0800 Subject: [PATCH] rename --- .gitignore | 3 +++ README.md | 8 ++++---- lib/basic/config/Version.dart | 23 +++++++++++++++++++++++ lib/screens/AboutScreen.dart | 2 +- lib/screens/InitScreen.dart | 2 ++ 5 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 lib/basic/config/Version.dart diff --git a/.gitignore b/.gitignore index e329e38..986ab8f 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,6 @@ app.*.map.json /go/vendor/ ios/build/ + +# APP +/lib/assets/version.txt diff --git a/README.md b/README.md index f04151b..c643446 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,13 @@ PIKAPI - 漫画客户端 ======== -[![license](https://img.shields.io/github/license/niuhuan/pikapi-flutter)](https://raw.githubusercontent.com/niuhuan/pikapi-flutter/master/LICENSE) -[![releases](https://img.shields.io/github/v/release/niuhuan/pikapi-flutter)](https://github.com/niuhuan/pikapi-flutter/releases) -[![downloads](https://img.shields.io/github/downloads/niuhuan/pikapi-flutter/total)](https://github.com/niuhuan/pikapi-flutter/releases) +[![license](https://img.shields.io/github/license/niuhuan/pikapi)](https://raw.githubusercontent.com/niuhuan/pikapi/master/LICENSE) +[![releases](https://img.shields.io/github/v/release/niuhuan/pikapi)](https://github.com/niuhuan/pikapi/releases) +[![downloads](https://img.shields.io/github/downloads/niuhuan/pikapi/total)](https://github.com/niuhuan/pikapi/releases) - 美观易用且无广告的漫画客户端, 能运行在Windows/MacOS/Linux/Android/IOS中。 - 本仓库仅作为学习交流使用, 请您遵守当地法律法规以及开源协议。 - 您的star和issue是对开发者的莫大鼓励, 可以源仓库下载最新的源码/安装包, 表示支持/提出建议。 -- 源仓库地址 [https://github.com/niuhuan/pikapi-flutter](https://github.com/niuhuan/pikapi-flutter) +- 源仓库地址 [https://github.com/niuhuan/pikapi](https://github.com/niuhuan/pikapi) ## 界面 / 功能 diff --git a/lib/basic/config/Version.dart b/lib/basic/config/Version.dart new file mode 100644 index 0000000..1dc1508 --- /dev/null +++ b/lib/basic/config/Version.dart @@ -0,0 +1,23 @@ +import 'dart:async' show Future; +import 'package:flutter/services.dart' show rootBundle; + +const _versionAssets = 'lib/assets/version.txt'; +RegExp _versionExp = RegExp(r"^v\d+\.\d+.\d+$"); + +late String _version; + +Future initVersion() async { + try { + _version = (await rootBundle.loadString(_versionAssets)).trim(); + } catch (e) { + _version = "dirty"; + } +} + +Future versionCheck() async { + if (_versionExp.hasMatch(_version)) { + } else { + // dirtyVersion + } + // String latestVersion = (await method.httpGet(_versionAddress)).trim(); +} diff --git a/lib/screens/AboutScreen.dart b/lib/screens/AboutScreen.dart index 478d754..9b99e85 100644 --- a/lib/screens/AboutScreen.dart +++ b/lib/screens/AboutScreen.dart @@ -29,7 +29,7 @@ class AboutScreen extends StatelessWidget { Container( padding: EdgeInsets.all(20), child: Text( - '请从软件取得渠道获取更新\n本软件开源, 若您想提出改进建议或者获取源码, 请在开源社区搜索 pikapi-flutter', + '请从软件取得渠道获取更新\n本软件开源, 若您想提出改进建议或者获取源码, 请在开源社区搜索 pikapi', style: TextStyle( height: 1.3, ), diff --git a/lib/screens/InitScreen.dart b/lib/screens/InitScreen.dart index 9d5eadf..58b1600 100644 --- a/lib/screens/InitScreen.dart +++ b/lib/screens/InitScreen.dart @@ -23,6 +23,7 @@ import 'package:pikapi/basic/config/Themes.dart'; import 'package:pikapi/basic/Method.dart'; import 'package:pikapi/basic/config/ListLayout.dart'; import 'package:pikapi/basic/config/TimeOffsetHour.dart'; +import 'package:pikapi/basic/config/Version.dart'; import 'package:pikapi/basic/config/VolumeController.dart'; import 'AccountScreen.dart'; @@ -69,6 +70,7 @@ class _InitScreenState extends State { await initAndroidSecureFlag(); await initDownloadThreadCount(); await initConvertToPNG(); + await initVersion(); // 登录, 如果token失效重新登录, 网络不好的时候可能需要1分钟 if (await method.preLogin()) { // 如果token或username+password有效则直接进入登录好的界面