Skip to content

Commit c1721ef

Browse files
hackycyhackycy
committed
Merge branch 'dev'
2 parents 1193b9a + 4cc6206 commit c1721ef

File tree

15 files changed

+262
-12
lines changed

15 files changed

+262
-12
lines changed

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ Flutter-PicGo: 一个用于快速上传图片并获取图片URL链接的**手机
2121
- 七牛云 [v1.3+]
2222
- 阿里云OSS [v1.4+]
2323
- 腾讯云COS [v1.5+]
24+
- 牛图网 [v1.6+]
2425

2526
> 开发进度可以查看 [Projects](https://github.com/PicGo/flutter-picgo/projects)，会同步更新开发进度
2627
@@ -65,7 +66,7 @@ Flutter-PicGo: 一个用于快速上传图片并获取图片URL链接的**手机
6566

6667
- [Flutter-Go](https://github.com/alibaba/flutter-go)
6768

68-
# [License](https://github.com/hackycy/flutter-picgo/blob/master/LICENSE)
69+
# License
6970

7071
``` txt
7172
MIT License

‎docs/static/location.html‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
4+
<head>
5+
<meta charset="UTF-8">
6+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
7+
<title>Flutter-Picgo Release</title>
8+
<script>
9+
// var u = navigator.userAgent;
10+
// var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //判断是否是 android终端
11+
// var isIOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/); //判断是否是 iOS终端
12+
if (/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)) {
13+
window.location.href = 'https://apps.apple.com/cn/app/flutter-picgo/id1519714305'
14+
} else if (/(Android)/i.test(navigator.userAgent)) {
15+
window.location.href = 'https://www.pgyer.com/flutter-picgo'
16+
}
17+
</script>
18+
</head>
19+
20+
<body>
21+
</body>
22+
23+
</html>

‎docs/version.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"iOS": {
3-
"versionName": "1.6.0",
4-
"versionCode": "14"
3+
"versionName": "1.7.0",
4+
"versionCode": "15"
55
},
66
"Android": {
7-
"versionName": "1.6.0",
8-
"versionCode": "14"
7+
"versionName": "1.7.0",
8+
"versionCode": "15"
99
}
1010
}

‎docs/设计文档.md‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,12 @@
2424

2525
| 版本 | 描述 |
2626
| ---- | ------------------------------------------------ |
27-
| 1 | pb_setting，uploaded表初始化，增加Github图床记录 |
27+
| 1 | pb_setting，uploaded表初始化，增加Github图床记录 |
2828
| 2 | uploaded新增info列，新增SM.MS图床记录 |
29-
| 3 | 新增Gitee图床记录 |
30-
| 4 | 新增Qiniu图床记录 |
29+
| 3 | 新增Gitee图床记录 |
30+
| 4 | 新增Qiniu图床记录 |
3131
| 5 | 新增阿里云OSS图床记录 |
3232
| 6 | 新增腾讯云COS图床记录 |
33-
| 7 | 新增牛图网图床记录 |
33+
| 7 | 新增牛图网图床记录 |
34+
| 8 | 新增兰空图床记录 |
3435

‎lib/api/lsky_api.dart‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
import 'package:dio/dio.dart';
2+
import 'package:flutter_picgo/utils/net.dart';
3+
import 'package:path/path.dart' as path;
4+
5+
class LskyApi {
6+
static Future token(String email, String pwd, String host) async {
7+
String url = path.joinAll([host, 'api/token']);
8+
Response res = await NetUtils.getInstance().post(url, data: {
9+
'email': email,
10+
'password': pwd,
11+
});
12+
return res.data;
13+
}
14+
15+
static Future upload(String token, String host, FormData data) async {
16+
String url = path.joinAll([host, 'api/upload']);
17+
Response res = await NetUtils.getInstance()
18+
.post(url, data: data, options: buildCommonOptions(token));
19+
return res.data;
20+
}
21+
22+
static Options buildCommonOptions(String token) {
23+
return Options(headers: {
24+
'token': token,
25+
});
26+
}
27+
}

‎lib/model/lsky_config.dart‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
class LskyConfig {
2+
String host;
3+
String email;
4+
String password;
5+
String token;
6+
7+
LskyConfig({this.host, this.email, this.password, this.token});
8+
9+
LskyConfig.fromJson(Map<String, dynamic> json) {
10+
host = json['host'];
11+
email = json['email'];
12+
password = json['password'];
13+
token = json['token'];
14+
}
15+
16+
Map<String, dynamic> toJson() {
17+
final Map<String, dynamic> data = new Map<String, dynamic>();
18+
data['host'] = this.host;
19+
data['email'] = this.email;
20+
data['password'] = this.password;
21+
data['token'] = this.token;
22+
return data;
23+
}
24+
}

‎lib/resources/pb_type_keys.dart‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,6 @@ class PBTypeKeys {
1212
static const tcyun = 'tcyun';
1313

1414
static const niupic = 'niupic';
15+
16+
static const lsky = 'lsky';
1517
}

‎lib/routers/router_handler.dart‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import 'package:flutter_picgo/views/pb_setting_page/aliyun_page/aliyun_page.dart
77
import 'package:flutter_picgo/views/pb_setting_page/gitee_page/gitee_page.dart';
88
import 'package:flutter_picgo/views/pb_setting_page/gitee_page/gitee_repo_page.dart';
99
import 'package:flutter_picgo/views/pb_setting_page/github_page/github_repo_page.dart';
10+
import 'package:flutter_picgo/views/pb_setting_page/lsky_page/lsky_page.dart';
1011
import 'package:flutter_picgo/views/pb_setting_page/niupic_page/niupic_page.dart';
1112
import 'package:flutter_picgo/views/pb_setting_page/pb_setting_page.dart';
1213
import 'package:flutter_picgo/views/pb_setting_page/qiniu_page/qiniu_page.dart';
@@ -126,6 +127,11 @@ var pbsettingNiupicHandler = new Handler(
126127
handlerFunc: (context, parameters) => NiupicPage(),
127128
);
128129

130+
// 兰空图床设置页面
131+
var pbsettingLskyHandler = new Handler(
132+
handlerFunc: (context, parameters) => LskyPage(),
133+
);
134+
129135
// picgo设置页面
130136
var picgosettingHandler = new Handler(
131137
handlerFunc: (BuildContext context, Map<String, List<String>> params) =>

‎lib/routers/routers.dart‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ class Routes {
3434
// --------- niupic -------------------
3535
static const String settingPbNiupic = '/setting/pb/niupic';
3636
// -----------------------------------
37+
// --------- lsky -------------------
38+
static const String settingPbLsky = '/setting/pb/lsky';
39+
// -----------------------------------
3740

3841
static void configureRoutes(Router router) {
3942
router.notFoundHandler = notfoundHandler;
@@ -54,5 +57,6 @@ class Routes {
5457
router.define(settingPbAliyun, handler: pbsettingAliyunHandler);
5558
router.define(settingPbTcyun, handler: pbsettingTcyunHandler);
5659
router.define(settingPbNiupic, handler: pbsettingNiupicHandler);
60+
router.define(settingPbLsky, handler: pbsettingLskyHandler);
5761
}
5862
}

‎lib/utils/db_provider.dart‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class DbProvider {
3434
try {
3535
db = await openDatabase(
3636
path,
37-
version: 7,
37+
version: 8,
3838
onCreate: (db, version) async {
3939
// 创建pb_setting表
4040
_initPb(db);
@@ -108,6 +108,9 @@ class DbProvider {
108108
// 牛图网
109109
await db.rawInsert(
110110
'INSERT INTO $TABLE_NAME_PBSETTING(type, path, name, config, visible) VALUES("${PBTypeKeys.niupic}", "/setting/pb/niupic", "牛图网图床", NULL, 1)');
111+
// 兰空图床
112+
await db.rawInsert(
113+
'INSERT INTO $TABLE_NAME_PBSETTING(type, path, name, config, visible) VALUES("${PBTypeKeys.lsky}", "/setting/pb/lsky", "兰空图床", NULL, 1)');
111114
// copy data
112115
// update authors set dynasty_index=(select id from dynasties where dynasties .name=authors.dynasty) where dynasty in (select name from dynasties )
113116
if (isExists) {

0 commit comments

Comments
 (0)