Skip to content

Commit bb6a981

Browse files
authored
Merge pull request #35 from raoxudong/dev
demo 添加 http 支持
2 parents 4927be6 + 92fc6e0 commit bb6a981

File tree

8 files changed

+85
-11
lines changed

8 files changed

+85
-11
lines changed
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.","dependencyGraph":[{"name":"jverify","dependencies":[]}]}

example/android/app/build.gradle

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
2525
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
2626

2727
android {
28-
compileSdkVersion 27
28+
compileSdkVersion 28
2929

3030
lintOptions {
3131
disable 'InvalidPackage'
@@ -35,7 +35,7 @@ android {
3535
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
3636
applicationId "cn.jiguang.xx" // 应用包名
3737
minSdkVersion 16
38-
targetSdkVersion 27
38+
targetSdkVersion 28
3939
versionCode flutterVersionCode.toInteger()
4040
versionName flutterVersionName
4141
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -53,10 +53,23 @@ android {
5353
]
5454
}
5555

56+
signingConfigs {
57+
release {
58+
keyAlias 'androiddebugkey'
59+
keyPassword 'android'
60+
storePassword 'android'
61+
storeFile file('debug.keystore')
62+
}
63+
debug {
64+
storeFile file('debug.keystore')
65+
}
66+
}
5667
buildTypes {
5768
release {
58-
// TODO: Add your own signing config for the release build.
59-
// Signing with the debug keys for now, so `flutter run --release` works.
69+
signingConfig signingConfigs.release
70+
shrinkResources false
71+
}
72+
debug {
6073
signingConfig signingConfigs.debug
6174
}
6275
}

example/android/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
additional functionality it is fine to subclass or reimplement
88
FlutterApplication and put your custom class here. -->
99
<application
10+
android:networkSecurityConfig="@xml/network_security_config"
1011
android:name="io.flutter.app.FlutterApplication"
1112
android:label="jverify_example"
1213
android:icon="@mipmap/ic_launcher">
File renamed without changes.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<network-security-config>
3+
<base-config cleartextTrafficPermitted="true">
4+
<trust-anchors>
5+
<certificates src="system" />
6+
</trust-anchors>
7+
</base-config>
8+
</network-security-config>

example/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

example/ios/Flutter/flutter_export_environment.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
# This is a generated file; do not edit or check into version control.
33
export "FLUTTER_ROOT=/Applications/flutter"
44
export "FLUTTER_APPLICATION_PATH=/Users/raoxudong/JPush/jpush-github/jverify-flutter-plugin/example"
5-
export "FLUTTER_TARGET=/Users/raoxudong/JPush/jpush-github/jverify-flutter-plugin/example/lib/main.dart"
5+
export "FLUTTER_TARGET=lib/main.dart"
66
export "FLUTTER_BUILD_DIR=build"
77
export "SYMROOT=${SOURCE_ROOT}/../build/ios"
88
export "FLUTTER_FRAMEWORK_DIR=/Applications/flutter/bin/cache/artifacts/engine/ios"
9-
export "TRACK_WIDGET_CREATION=true"
9+
export "FLUTTER_BUILD_NAME=1.0.0"
10+
export "FLUTTER_BUILD_NUMBER=1"

example/pubspec.lock

Lines changed: 54 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,27 @@
11
# Generated by pub
22
# See https://dart.dev/tools/pub/glossary#lockfile
33
packages:
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
13+
description:
14+
name: args
15+
url: "https://pub.flutter-io.cn"
16+
source: hosted
17+
version: "1.5.2"
418
async:
519
dependency: transitive
620
description:
721
name: async
822
url: "https://pub.flutter-io.cn"
923
source: hosted
10-
version: "2.3.0"
24+
version: "2.4.0"
1125
boolean_selector:
1226
dependency: transitive
1327
description:
@@ -29,6 +43,20 @@ packages:
2943
url: "https://pub.flutter-io.cn"
3044
source: hosted
3145
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"
3260
cupertino_icons:
3361
dependency: "direct main"
3462
description:
@@ -46,6 +74,13 @@ packages:
4674
description: flutter
4775
source: sdk
4876
version: "0.0.0"
77+
image:
78+
dependency: transitive
79+
description:
80+
name: image
81+
url: "https://pub.flutter-io.cn"
82+
source: hosted
83+
version: "2.1.4"
4984
jverify:
5085
dependency: "direct dev"
5186
description:
@@ -59,14 +94,14 @@ packages:
5994
name: matcher
6095
url: "https://pub.flutter-io.cn"
6196
source: hosted
62-
version: "0.12.5"
97+
version: "0.12.6"
6398
meta:
6499
dependency: transitive
65100
description:
66101
name: meta
67102
url: "https://pub.flutter-io.cn"
68103
source: hosted
69-
version: "1.1.7"
104+
version: "1.1.8"
70105
modal_progress_hud:
71106
dependency: "direct main"
72107
description:
@@ -88,6 +123,13 @@ packages:
88123
url: "https://pub.flutter-io.cn"
89124
source: hosted
90125
version: "1.8.0+1"
126+
petitparser:
127+
dependency: transitive
128+
description:
129+
name: petitparser
130+
url: "https://pub.flutter-io.cn"
131+
source: hosted
132+
version: "2.4.0"
91133
platform:
92134
dependency: transitive
93135
description:
@@ -148,7 +190,7 @@ packages:
148190
name: test_api
149191
url: "https://pub.flutter-io.cn"
150192
source: hosted
151-
version: "0.2.5"
193+
version: "0.2.11"
152194
typed_data:
153195
dependency: transitive
154196
description:
@@ -163,5 +205,12 @@ packages:
163205
url: "https://pub.flutter-io.cn"
164206
source: hosted
165207
version: "2.0.8"
208+
xml:
209+
dependency: transitive
210+
description:
211+
name: xml
212+
url: "https://pub.flutter-io.cn"
213+
source: hosted
214+
version: "3.5.0"
166215
sdks:
167-
dart: ">=2.2.2 <3.0.0"
216+
dart: ">=2.4.0 <3.0.0"

0 commit comments

Comments
 (0)