Skip to content

Commit f23c1e7

Browse files
committed
Merge branch 'dev'
2 parents 5bdba97 + ffe3ee4 commit f23c1e7

24 files changed

+527
-105
lines changed

.flutter-plugins-dependencies

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"package_info","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/package_info-0.4.0+16/","dependencies":[]},{"name":"path_provider","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider-1.6.5/","dependencies":[]},{"name":"shared_preferences","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences-0.5.6+3/","dependencies":[]},{"name":"sqflite","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/sqflite-1.3.0/","dependencies":[]},{"name":"webview_flutter","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/webview_flutter-0.3.15+1/","dependencies":[]}],"android":[{"name":"package_info","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/package_info-0.4.0+16/","dependencies":[]},{"name":"path_provider","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider-1.6.5/","dependencies":[]},{"name":"shared_preferences","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences-0.5.6+3/","dependencies":[]},{"name":"sqflite","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/sqflite-1.3.0/","dependencies":[]},{"name":"webview_flutter","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/webview_flutter-0.3.15+1/","dependencies":[]}],"macos":[{"name":"path_provider_macos","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider_macos-0.0.4/","dependencies":[]},{"name":"shared_preferences_macos","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_macos-0.0.1+6/","dependencies":[]},{"name":"sqflite","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/sqflite-1.3.0/","dependencies":[]}],"linux":[],"windows":[],"web":[{"name":"shared_preferences_web","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_web-0.1.2+4/","dependencies":[]}]},"dependencyGraph":[{"name":"package_info","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_macos"]},{"name":"path_provider_macos","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_macos","shared_preferences_web"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]},{"name":"sqflite","dependencies":[]},{"name":"webview_flutter","dependencies":[]}],"date_created":"2020-05-25 22:40:54.999068","version":"1.17.1"}
1+
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"orientation","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/orientation-1.2.0/","dependencies":[]},{"name":"package_info","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/package_info-0.4.0+10/","dependencies":[]},{"name":"path_provider","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider-1.6.5/","dependencies":[]},{"name":"shared_preferences","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences-0.5.3+4/","dependencies":[]},{"name":"sqflite","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/sqflite-1.3.0/","dependencies":[]},{"name":"webview_flutter","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/webview_flutter-0.3.15+1/","dependencies":[]}],"android":[{"name":"orientation","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/orientation-1.2.0/","dependencies":[]},{"name":"package_info","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/package_info-0.4.0+10/","dependencies":[]},{"name":"path_provider","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider-1.6.5/","dependencies":[]},{"name":"shared_preferences","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences-0.5.3+4/","dependencies":[]},{"name":"sqflite","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/sqflite-1.3.0/","dependencies":[]},{"name":"webview_flutter","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/webview_flutter-0.3.15+1/","dependencies":[]}],"macos":[{"name":"path_provider_macos","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider_macos-0.0.4/","dependencies":[]},{"name":"sqflite","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/sqflite-1.3.0/","dependencies":[]}],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"orientation","dependencies":[]},{"name":"package_info","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_macos"]},{"name":"path_provider_macos","dependencies":[]},{"name":"shared_preferences","dependencies":[]},{"name":"sqflite","dependencies":[]},{"name":"webview_flutter","dependencies":[]}],"date_created":"2020-05-25 22:34:18.298371","version":"1.17.1"}

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212

1313
---
1414

15-
### 使用
15+
### ⚠️⚠️⚠️使用(Important)
1616
- 项目环境
17-
+ **Flutter:** ` 1.12.13+hotfix.9 `
17+
+ **Flutter:** ` 1.17.1 `
1818
+ **Dart:** `3.5.1`
1919

2020
- 项目运行

analysis_options.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
include: package:pedantic/analysis_options.1.8.0.yaml
2+
# https://stackoverflow.com/questions/55477046/how-can-i-enable-flutter-dart-language-experiments
3+
# https://blog.csdn.net/peng2hui1314/article/details/104787223
4+
linter:
5+
rules:
6+
- prefer_spread_collections

android/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
FlutterApplication and put your custom class here. -->
99
<application
1010
android:name="io.flutter.app.FlutterApplication"
11-
android:label="微信"
11+
android:label="flutter_wechat"
1212
android:icon="@mipmap/ic_launcher">
1313
<activity
1414
android:name=".MainActivity"
3.52 KB
Loading
3.5 KB
Loading
Lines changed: 11 additions & 0 deletions
Loading
Lines changed: 12 additions & 0 deletions
Loading

assets/images/moments/kris_wu.png

427 KB
Loading

ios/Podfile.lock

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ PODS:
33
- FMDB (2.7.5):
44
- FMDB/standard (= 2.7.5)
55
- FMDB/standard (2.7.5)
6+
- orientation (0.0.1):
7+
- Flutter
68
- package_info (0.0.1):
79
- Flutter
810
- path_provider (0.0.1):
@@ -11,10 +13,6 @@ PODS:
1113
- Flutter
1214
- shared_preferences (0.0.1):
1315
- Flutter
14-
- shared_preferences_macos (0.0.1):
15-
- Flutter
16-
- shared_preferences_web (0.0.1):
17-
- Flutter
1816
- sqflite (0.0.1):
1917
- Flutter
2018
- FMDB (~> 2.7.2)
@@ -23,12 +21,11 @@ PODS:
2321

2422
DEPENDENCIES:
2523
- Flutter (from `Flutter`)
24+
- orientation (from `.symlinks/plugins/orientation/ios`)
2625
- package_info (from `.symlinks/plugins/package_info/ios`)
2726
- path_provider (from `.symlinks/plugins/path_provider/ios`)
2827
- path_provider_macos (from `.symlinks/plugins/path_provider_macos/ios`)
2928
- shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
30-
- shared_preferences_macos (from `.symlinks/plugins/shared_preferences_macos/ios`)
31-
- shared_preferences_web (from `.symlinks/plugins/shared_preferences_web/ios`)
3229
- sqflite (from `.symlinks/plugins/sqflite/ios`)
3330
- webview_flutter (from `.symlinks/plugins/webview_flutter/ios`)
3431

@@ -39,6 +36,8 @@ SPEC REPOS:
3936
EXTERNAL SOURCES:
4037
Flutter:
4138
:path: Flutter
39+
orientation:
40+
:path: ".symlinks/plugins/orientation/ios"
4241
package_info:
4342
:path: ".symlinks/plugins/package_info/ios"
4443
path_provider:
@@ -47,10 +46,6 @@ EXTERNAL SOURCES:
4746
:path: ".symlinks/plugins/path_provider_macos/ios"
4847
shared_preferences:
4948
:path: ".symlinks/plugins/shared_preferences/ios"
50-
shared_preferences_macos:
51-
:path: ".symlinks/plugins/shared_preferences_macos/ios"
52-
shared_preferences_web:
53-
:path: ".symlinks/plugins/shared_preferences_web/ios"
5449
sqflite:
5550
:path: ".symlinks/plugins/sqflite/ios"
5651
webview_flutter:
@@ -59,12 +54,11 @@ EXTERNAL SOURCES:
5954
SPEC CHECKSUMS:
6055
Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
6156
FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
57+
orientation: 6c9203efe86ce4cff379756910f18b2d745628c3
6258
package_info: 48b108e75b8802c2d5e126f208ef540561c98aef
6359
path_provider: fb74bd0465e96b594bb3b5088ee4a4e7bb1f2a9d
6460
path_provider_macos: f760a3c5b04357c380e2fddb6f9db6f3015897e0
65-
shared_preferences: 430726339841afefe5142b9c1f50cb6bd7793e01
66-
shared_preferences_macos: f3f29b71ccbb56bf40c9dd6396c9acf15e214087
67-
shared_preferences_web: 141cce0c3ed1a1c5bf2a0e44f52d31eeb66e5ea9
61+
shared_preferences: 1feebfa37bb57264736e16865e7ffae7fc99b523
6862
sqflite: 4001a31ff81d210346b500c55b17f4d6c7589dd0
6963
webview_flutter: db3aba222b23e4dc432e0c5882834123dc50ff9f
7064

0 commit comments

Comments
 (0)