Skip to content

Commit d00730b

Browse files
committed
update
1 parent 0df09d0 commit d00730b

File tree

8 files changed

+183
-31
lines changed

8 files changed

+183
-31
lines changed

.flutter-plugins-dependencies

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"shared_preferences","path":"C:\\\\Users\\\\Farry\\\\AppData\\\\Roaming\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\shared_preferences-0.5.6+3\\\\","dependencies":[]},{"name":"url_launcher","path":"C:\\\\Users\\\\Farry\\\\AppData\\\\Roaming\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher-5.4.2\\\\","dependencies":[]}],"android":[{"name":"shared_preferences","path":"C:\\\\Users\\\\Farry\\\\AppData\\\\Roaming\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\shared_preferences-0.5.6+3\\\\","dependencies":[]},{"name":"url_launcher","path":"C:\\\\Users\\\\Farry\\\\AppData\\\\Roaming\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher-5.4.2\\\\","dependencies":[]}],"macos":[{"name":"shared_preferences_macos","path":"C:\\\\Users\\\\Farry\\\\AppData\\\\Roaming\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\shared_preferences_macos-0.0.1+6\\\\","dependencies":[]},{"name":"url_launcher_macos","path":"C:\\\\Users\\\\Farry\\\\AppData\\\\Roaming\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher_macos-0.0.1+4\\\\","dependencies":[]}],"linux":[],"windows":[],"web":[{"name":"shared_preferences_web","path":"C:\\\\Users\\\\Farry\\\\AppData\\\\Roaming\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\shared_preferences_web-0.1.2+4\\\\","dependencies":[]},{"name":"url_launcher_web","path":"C:\\\\Users\\\\Farry\\\\AppData\\\\Roaming\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher_web-0.1.1+1\\\\","dependencies":[]}]},"dependencyGraph":[{"name":"shared_preferences","dependencies":["shared_preferences_macos","shared_preferences_web"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]},{"name":"url_launcher","dependencies":["url_launcher_web","url_launcher_macos"]},{"name":"url_launcher_macos","dependencies":[]},{"name":"url_launcher_web","dependencies":[]}],"date_created":"2020-04-12 18:28:37.047458","version":"1.16.0"}

.travis.yml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
cache:
2+
directories:
3+
- "$HOME/.pub-cache"
4+
jobs:
5+
include:
6+
- stage: deployAPK
7+
os: linux
8+
language: android
9+
licenses:
10+
- android-sdk-preview-license-.+
11+
- android-sdk-license-.+
12+
- google-gdk-license-.+
13+
android:
14+
components:
15+
- tools
16+
- platform-tools
17+
- build-tools-28.0.3
18+
- android-28
19+
- sys-img-armeabi-v7a-google_apis-25
20+
- extra-android-m2repository
21+
- extra-google-m2repository
22+
- extra-google-android-support
23+
jdk: oraclejdk8
24+
sudo: false
25+
# env: APK_OUTPUT=build/app/outputs/apk/release/app-arm64-v8a-release.apk
26+
addons:
27+
apt:
28+
sources:
29+
- ubuntu-toolchain-r-test
30+
packages:
31+
- libstdc++6
32+
- fonts-droid
33+
before_script:
34+
- git clone https://github.com/flutter/flutter.git
35+
script:
36+
- yes | sdkmanager "platforms;android-28"
37+
- yes | sdkmanager "platforms;android-29"
38+
- "./flutter/bin/flutter doctor -v"
39+
- "./flutter/bin/flutter pub get"
40+
- "./flutter/bin/flutter -v build apk --release --split-per-abi"
41+
- "./flutter/bin/flutter --version"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
ESP8266 Controller for esp01-relay
44
Support Android and iOS
5-
> firmware file in ./firmware dir,support nodemcu and arduino
5+
> firmware file in ./firmware dir,support [nodemcu](./firmware/arduino/main.ino) and [arduino](./firmware/nodemcu/init.lua)
66
77
![image](./images/esp01-relay.png)
88
![image](./images/screen.png)

android/gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
org.gradle.jvmargs=-Xmx1536M
2+
android.enableR8=true
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/bin/sh
2+
# This is a generated file; do not edit or check into version control.
3+
export "FLUTTER_ROOT=C:\git\flutter"
4+
export "FLUTTER_APPLICATION_PATH=C:\Users\Farry\StudioProjects\esp8266_controller"
5+
export "FLUTTER_TARGET=lib\main.dart"
6+
export "FLUTTER_BUILD_DIR=build"
7+
export "SYMROOT=${SOURCE_ROOT}/../build\ios"
8+
export "OTHER_LDFLAGS=$(inherited) -framework Flutter"
9+
export "FLUTTER_FRAMEWORK_DIR=C:\git\flutter\bin\cache\artifacts\engine\ios"
10+
export "FLUTTER_BUILD_NAME=1.0.0"
11+
export "FLUTTER_BUILD_NUMBER=1"

lib/main.dart

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'package:flutter/material.dart';
22
import 'package:http/http.dart' as http;
33
import 'package:shared_preferences/shared_preferences.dart';
4-
import 'package:android_intent/android_intent.dart';
4+
import 'package:url_launcher/url_launcher.dart';
55

66
void main() => runApp(MyApp());
77

@@ -144,11 +144,12 @@ class _MyHomePageState extends State<MyHomePage> {
144144
}
145145

146146
_launchURL(String url) async {
147-
AndroidIntent intent = AndroidIntent(
148-
action: 'action_view',
149-
data: url,
150-
);
151-
await intent.launch();
147+
// await intent.launch();
148+
if (await canLaunch(url)) {
149+
await launch(url);
150+
} else {
151+
print('Could not launch $url');
152+
}
152153
}
153154

154155
_setHost() async {

pubspec.lock

Lines changed: 119 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,34 @@
11
# Generated by pub
2-
# See https://www.dartlang.org/tools/pub/glossary#lockfile
2+
# See https://dart.dev/tools/pub/glossary#lockfile
33
packages:
4-
android_intent:
5-
dependency: "direct main"
4+
archive:
5+
dependency: transitive
6+
description:
7+
name: archive
8+
url: "https://pub.flutter-io.cn"
9+
source: hosted
10+
version: "2.0.11"
11+
args:
12+
dependency: transitive
613
description:
7-
name: android_intent
14+
name: args
815
url: "https://pub.flutter-io.cn"
916
source: hosted
10-
version: "0.3.2"
17+
version: "1.5.2"
1118
async:
1219
dependency: transitive
1320
description:
1421
name: async
1522
url: "https://pub.flutter-io.cn"
1623
source: hosted
17-
version: "2.1.0"
24+
version: "2.4.0"
1825
boolean_selector:
1926
dependency: transitive
2027
description:
2128
name: boolean_selector
2229
url: "https://pub.flutter-io.cn"
2330
source: hosted
24-
version: "1.0.4"
31+
version: "1.0.5"
2532
charcode:
2633
dependency: transitive
2734
description:
@@ -36,13 +43,27 @@ packages:
3643
url: "https://pub.flutter-io.cn"
3744
source: hosted
3845
version: "1.14.11"
46+
convert:
47+
dependency: transitive
48+
description:
49+
name: convert
50+
url: "https://pub.flutter-io.cn"
51+
source: hosted
52+
version: "2.1.1"
53+
crypto:
54+
dependency: transitive
55+
description:
56+
name: crypto
57+
url: "https://pub.flutter-io.cn"
58+
source: hosted
59+
version: "2.1.3"
3960
cupertino_icons:
4061
dependency: "direct main"
4162
description:
4263
name: cupertino_icons
4364
url: "https://pub.flutter-io.cn"
4465
source: hosted
45-
version: "0.1.2"
66+
version: "0.1.3"
4667
flutter:
4768
dependency: "direct main"
4869
description: flutter
@@ -53,69 +74,109 @@ packages:
5374
description: flutter
5475
source: sdk
5576
version: "0.0.0"
77+
flutter_web_plugins:
78+
dependency: transitive
79+
description: flutter
80+
source: sdk
81+
version: "0.0.0"
5682
http:
5783
dependency: "direct main"
5884
description:
5985
name: http
6086
url: "https://pub.flutter-io.cn"
6187
source: hosted
62-
version: "0.12.0+2"
88+
version: "0.12.0+4"
6389
http_parser:
6490
dependency: transitive
6591
description:
6692
name: http_parser
6793
url: "https://pub.flutter-io.cn"
6894
source: hosted
69-
version: "3.1.3"
95+
version: "3.1.4"
96+
image:
97+
dependency: transitive
98+
description:
99+
name: image
100+
url: "https://pub.flutter-io.cn"
101+
source: hosted
102+
version: "2.1.4"
70103
matcher:
71104
dependency: transitive
72105
description:
73106
name: matcher
74107
url: "https://pub.flutter-io.cn"
75108
source: hosted
76-
version: "0.12.5"
109+
version: "0.12.6"
77110
meta:
78111
dependency: transitive
79112
description:
80113
name: meta
81114
url: "https://pub.flutter-io.cn"
82115
source: hosted
83-
version: "1.1.6"
116+
version: "1.1.8"
84117
path:
85118
dependency: transitive
86119
description:
87120
name: path
88121
url: "https://pub.flutter-io.cn"
89122
source: hosted
90-
version: "1.6.2"
123+
version: "1.6.4"
91124
pedantic:
92125
dependency: transitive
93126
description:
94127
name: pedantic
95128
url: "https://pub.flutter-io.cn"
96129
source: hosted
97-
version: "1.5.0"
98-
platform:
130+
version: "1.9.0"
131+
petitparser:
99132
dependency: transitive
100133
description:
101-
name: platform
134+
name: petitparser
102135
url: "https://pub.flutter-io.cn"
103136
source: hosted
104-
version: "2.2.1"
137+
version: "2.4.0"
138+
plugin_platform_interface:
139+
dependency: transitive
140+
description:
141+
name: plugin_platform_interface
142+
url: "https://pub.flutter-io.cn"
143+
source: hosted
144+
version: "1.0.2"
105145
quiver:
106146
dependency: transitive
107147
description:
108148
name: quiver
109149
url: "https://pub.flutter-io.cn"
110150
source: hosted
111-
version: "2.0.2"
151+
version: "2.0.5"
112152
shared_preferences:
113153
dependency: "direct main"
114154
description:
115155
name: shared_preferences
116156
url: "https://pub.flutter-io.cn"
117157
source: hosted
118-
version: "0.5.3+4"
158+
version: "0.5.6+3"
159+
shared_preferences_macos:
160+
dependency: transitive
161+
description:
162+
name: shared_preferences_macos
163+
url: "https://pub.flutter-io.cn"
164+
source: hosted
165+
version: "0.0.1+6"
166+
shared_preferences_platform_interface:
167+
dependency: transitive
168+
description:
169+
name: shared_preferences_platform_interface
170+
url: "https://pub.flutter-io.cn"
171+
source: hosted
172+
version: "1.0.3"
173+
shared_preferences_web:
174+
dependency: transitive
175+
description:
176+
name: shared_preferences_web
177+
url: "https://pub.flutter-io.cn"
178+
source: hosted
179+
version: "0.1.2+4"
119180
sky_engine:
120181
dependency: transitive
121182
description: flutter
@@ -148,7 +209,7 @@ packages:
148209
name: string_scanner
149210
url: "https://pub.flutter-io.cn"
150211
source: hosted
151-
version: "1.0.4"
212+
version: "1.0.5"
152213
term_glyph:
153214
dependency: transitive
154215
description:
@@ -162,21 +223,56 @@ packages:
162223
name: test_api
163224
url: "https://pub.flutter-io.cn"
164225
source: hosted
165-
version: "0.2.4"
226+
version: "0.2.15"
166227
typed_data:
167228
dependency: transitive
168229
description:
169230
name: typed_data
170231
url: "https://pub.flutter-io.cn"
171232
source: hosted
172233
version: "1.1.6"
234+
url_launcher:
235+
dependency: "direct main"
236+
description:
237+
name: url_launcher
238+
url: "https://pub.flutter-io.cn"
239+
source: hosted
240+
version: "5.4.2"
241+
url_launcher_macos:
242+
dependency: transitive
243+
description:
244+
name: url_launcher_macos
245+
url: "https://pub.flutter-io.cn"
246+
source: hosted
247+
version: "0.0.1+4"
248+
url_launcher_platform_interface:
249+
dependency: transitive
250+
description:
251+
name: url_launcher_platform_interface
252+
url: "https://pub.flutter-io.cn"
253+
source: hosted
254+
version: "1.0.6"
255+
url_launcher_web:
256+
dependency: transitive
257+
description:
258+
name: url_launcher_web
259+
url: "https://pub.flutter-io.cn"
260+
source: hosted
261+
version: "0.1.1+1"
173262
vector_math:
174263
dependency: transitive
175264
description:
176265
name: vector_math
177266
url: "https://pub.flutter-io.cn"
178267
source: hosted
179268
version: "2.0.8"
269+
xml:
270+
dependency: transitive
271+
description:
272+
name: xml
273+
url: "https://pub.flutter-io.cn"
274+
source: hosted
275+
version: "3.5.0"
180276
sdks:
181-
dart: ">=2.2.0 <3.0.0"
182-
flutter: ">=1.5.0 <2.0.0"
277+
dart: ">=2.4.0 <3.0.0"
278+
flutter: ">=1.12.13+hotfix.4 <2.0.0"

pubspec.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ dependencies:
2626

2727
http: ^0.12.0+2
2828
shared_preferences: ^0.5.3+4
29-
android_intent: ^0.3.0+2
29+
# 打开url
30+
url_launcher: ^5.0.2
3031

3132
dev_dependencies:
3233
flutter_test:

0 commit comments

Comments
 (0)