Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
hackycy committed Jul 21, 2020
2 parents 807e941 + 0ef0b59 commit bb4caba
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 28 deletions.
19 changes: 9 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ Flutter-PicGo: 一个用于快速上传图片并获取图片URL链接的**手机
# 特色功能

- 长按相册列表项可同步删除图床下的图片,也可配置仅删除本地列表
- 支持扫描二维码将PicGo配置文件转换成Flutter-PicGo的配置
- 长按相册列表项可**同步删除远端的文件**,也可配置仅删除本地列表
- 支持扫描二维码将PicGo(v2.3.0-beta.2以上版本)配置文件转换成Flutter-PicGo的配置,使用请移步[链接](https://github.com/Molunerfinn/PicGo/releases/tag/v2.3.0-beta.2)
- 适配深色模式,可跟随系统或手动设置
- 支持将flutter-picgo的配置导出至剪切板

Expand All @@ -40,17 +40,16 @@ Flutter-PicGo: 一个用于快速上传图片并获取图片URL链接的**手机

# 下载安装

点击此处下载应用[releases](https://github.com/hackycy/flutter-picgo/releases)[蒲公英](https://www.pgyer.com/flutter-picgo)
| | Android | iOS |
| :----: | :----------------------------------------------------------: | :----------------------------------------------------------: |
| 二维码 | ![](https://github.static.si-yee.com/picgo/android.png) | ![](https://github.static.si-yee.com/picgo/appstore.png) |
| 链接 | [点击链接](https://github.com/hackycy/flutter-picgo/releases) | [点击链接](https://apps.apple.com/cn/app/flutter-picgo/id1519714305) |

Android版直接下载apk安装包或扫码

![](https://github.static.si-yee.com/picgo/android.png)

iOS版本请扫描二维码下载或[点击链接](https://apps.apple.com/cn/app/flutter-picgo/id1519714305)
> 感谢[Trevor-Lan](https://github.com/Trevor-Lan)提供的苹果开发者账户
![](https://github.static.si-yee.com/picgo/appstore.png)
# 应用说明

> 感谢[Trevor-Lan](https://github.com/Trevor-Lan)提供的苹果开发者账户
目前仅支持iOS与Android端,由于部分插件例如[sqflite](https://pub.dev/packages/sqflite),所以并不支持Web端。

# 致谢

Expand Down
8 changes: 4 additions & 4 deletions docs/version.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"iOS": {
"versionName": "1.5.2",
"versionCode": "12"
"versionName": "1.5.3",
"versionCode": "13"
},
"Android": {
"versionName": "1.5.1",
"versionCode": "12"
"versionName": "1.5.3",
"versionCode": "13"
}
}
2 changes: 1 addition & 1 deletion lib/api/picgo_api.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ class PicgoApi {
/// 获取App最新版本
static Future getLatestVersion() async {
Response res = await NetUtils.getInstance().get(
'https://cdn.jsdelivr.net/gh/PicGo/flutter-picgo@dev/docs/version.json');
'https://cdn.jsdelivr.net/gh/PicGo/flutter-picgo/docs/version.json');
return res;
}
}
19 changes: 7 additions & 12 deletions lib/views/picgo_setting_page/picgo_setting_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ class _PicGoSettingPageState extends State<PicGoSettingPage> {
// onTap: () {},
// ),
ListTile(
title: Text('检查更新'),
title: Text('版本更新'),
onTap: () {
_handleUpdateTap();
},
Expand Down Expand Up @@ -171,20 +171,15 @@ class _PicGoSettingPageState extends State<PicGoSettingPage> {
this.isNeedUpdate = true;
});
}
} catch (e) {
print(e);
}
} catch (e) {}
}

/// 无论有无更新都进行跳转,不允许放置蒲公英链接
_handleUpdateTap() async {
if (isNeedUpdate) {
if (Platform.isAndroid) {
launch('https://www.pgyer.com/flutter-picgo');
} else if (Platform.isIOS) {
launch('https://apps.apple.com/cn/app/flutter-picgo/id1519714305');
}
} else {
Toast.show('当前已经是最新版本', context);
if (Platform.isAndroid) {
launch('https://github.com/PicGo/flutter-picgo/releases');
} else if (Platform.isIOS) {
launch('https://apps.apple.com/cn/app/flutter-picgo/id1519714305');
}
}
}
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
# Read more about iOS versioning at
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
version: 1.5.2+12
version: 1.5.3+13

environment:
sdk: ">=2.7.0 <3.0.0"
Expand Down

0 comments on commit bb4caba

Please sign in to comment.