Skip to content

Commit 48bbc58

Browse files
talobintalobin
authored
Merge pull request #13 from dji-sdk/develop
Merge develop into master
2 parents ae54905 + b348c27 commit 48bbc58

File tree

14 files changed

+824
-95
lines changed

14 files changed

+824
-95
lines changed

‎android-wsbridge/.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ captures/
3838

3939
# IntelliJ
4040
*.iml
41+
.idea/
4142
.idea/*.xml
4243
.idea/dictionaries
4344
.idea/libraries
@@ -65,3 +66,7 @@ Thumbs.db
6566

6667
# OSX files
6768
.DS_Store
69+
70+
.gradle/
71+
.gradle/buildOutputCleanup
72+
build/

‎android-wsbridge/app/build.gradle‎

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
}
55

66
dependencies {
7-
classpath 'io.fabric.tools:gradle:1.24.3'
7+
classpath 'io.fabric.tools:gradle:1.25.4'
88
}
99
}
1010
apply plugin: 'com.android.application'
@@ -17,17 +17,21 @@ repositories {
1717

1818
android {
1919
compileSdkVersion 25
20-
buildToolsVersion "26.0.2"
20+
buildToolsVersion '27.0.3'
2121
defaultConfig {
2222
applicationId "com.dji.wsbridge"
2323
minSdkVersion 16
2424
targetSdkVersion 25
2525
versionCode 1
26-
versionName "1.2.4"
26+
versionName "1.2.5"
2727
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
28-
buildConfigField "String", "REMOTE_LOGGER_URL", getRemoteLoggerURL()
28+
buildConfigField "String", "BASE_URL", getBaseUrl()
2929
}
3030
buildTypes {
31+
// Only used internally by DJI
32+
internal {
33+
initWith buildTypes.debug
34+
}
3135
release {
3236
minifyEnabled false
3337
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
@@ -39,29 +43,32 @@ android {
3943
}
4044

4145
dependencies {
42-
compile 'com.amitshekhar.android:android-networking:0.3.0'
43-
compile 'org.java-websocket:java-websocket:1.3.3'
44-
compile fileTree(dir: 'libs', include: ['*.jar'])
45-
compile 'com.squareup:otto:1.3.8'
46-
compile('com.crashlytics.sdk.android:crashlytics:2.6.5@aar') {
46+
implementation 'com.amitshekhar.android:android-networking:0.3.0'
47+
implementation 'org.java-websocket:java-websocket:1.3.3'
48+
implementation fileTree(dir: 'libs', include: ['*.jar'])
49+
implementation 'com.squareup:otto:1.3.8'
50+
implementation('com.crashlytics.sdk.android:crashlytics:2.6.5@aar') {
4751
transitive = true;
4852
}
49-
compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
53+
implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
5054
// Because RxAndroid releases are few and far between, it is recommended you also
5155
// explicitly depend on RxJava's latest version for bug fixes and new features.
52-
compile 'io.reactivex.rxjava2:rxjava:2.1.3'
53-
compile 'com.android.support:support-annotations:25.0.1'
54-
debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5.1'
55-
releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
56-
debugCompile 'com.github.markzhai:blockcanary-android:1.5.0'
57-
releaseCompile 'com.github.markzhai:blockcanary-no-op:1.5.0'
56+
implementation 'io.reactivex.rxjava2:rxjava:2.1.12'
57+
implementation 'com.android.support:support-annotations:25.0.1'
58+
implementation 'com.android.support.constraint:constraint-layout:1.1.2'
59+
debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.5.1'
60+
internalImplementation 'com.squareup.leakcanary:leakcanary-android:1.5.1'
61+
releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
62+
debugImplementation 'com.github.markzhai:blockcanary-android:1.5.0'
63+
internalImplementation 'com.github.markzhai:blockcanary-android:1.5.0'
64+
releaseImplementation 'com.github.markzhai:blockcanary-no-op:1.5.0'
5865
}
5966

6067
/**
61-
*
68+
* e.g, ./gradlew -PbaseUrl=yoururl.com assembleDebug
6269
* @return return the entered value if there is any, if not empty string
6370
*/
64-
def getRemoteLoggerURL() {
65-
def value = project.getProperties().get("remoteLoggerURL")
71+
def getBaseUrl() {
72+
def value = project.getProperties().get("baseUrl")
6673
return value != null ? "\"" + value + "\"" : "\"\""
6774
}

‎android-wsbridge/app/src/main/AndroidManifest.xml‎

Lines changed: 34 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,23 @@
33
package="com.dji.wsbridge">
44

55
<!-- SDK permission requirement -->
6-
<uses-permission android:name="android.permission.VIBRATE"/>
7-
<uses-permission android:name="android.permission.INTERNET"/>
8-
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
9-
<uses-permission android:name="android.permission.WAKE_LOCK"/>
10-
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
11-
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
12-
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
13-
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
14-
<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
15-
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
16-
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
17-
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
18-
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
6+
<uses-permission android:name="android.permission.VIBRATE" />
7+
<uses-permission android:name="android.permission.INTERNET" />
8+
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
9+
<uses-permission android:name="android.permission.WAKE_LOCK" />
10+
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
11+
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
12+
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
13+
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
14+
<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
15+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
16+
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
17+
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
18+
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
1919

2020
<uses-feature
2121
android:name="android.hardware.usb.accessory"
22-
android:required="true"/>
22+
android:required="true" />
2323

2424
<!-- SDK requirement permission end -->
2525
<application
@@ -29,30 +29,40 @@
2929
android:label="@string/app_name"
3030
android:supportsRtl="true"
3131
android:theme="@style/AppTheme">
32+
<service
33+
android:name=".lib.BridgeUpdateService"
34+
android:enabled="true"></service>
3235

33-
<activity android:name=".BridgeActivity"
36+
<activity
37+
android:name=".BridgeActivity"
3438
android:launchMode="singleTask">
3539
<intent-filter>
36-
<action android:name="android.intent.action.MAIN"/>
37-
<category android:name="android.intent.category.LAUNCHER"/>
40+
<action android:name="android.intent.action.MAIN" />
41+
42+
<category android:name="android.intent.category.LAUNCHER" />
3843
</intent-filter>
3944
<intent-filter>
40-
<action android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED"/>
45+
<action android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED" />
4146
</intent-filter>
47+
4248
<meta-data
4349
android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED"
44-
android:resource="@xml/accessory_filter"/>
50+
android:resource="@xml/accessory_filter" />
51+
4552
<intent-filter>
46-
<action android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED"/>
53+
<action android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED" />
4754
</intent-filter>
55+
4856
<meta-data
4957
android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED"
50-
android:resource="@xml/accessory_filter"/>
58+
android:resource="@xml/accessory_filter" />
5159
</activity>
5260

53-
<meta-data
54-
android:name="io.fabric.ApiKey"
55-
android:value="94a29e4c3255533acef077ec360ef80fc50dce42"/>
61+
62+
<activity
63+
android:name=".SettingsActivity"
64+
android:label="@string/settings"
65+
android:theme="@android:style/Theme.Material.Dialog"></activity>
5666
</application>
5767

5868
</manifest>

0 commit comments

Comments
 (0)