Skip to content

Commit 3cac3be

Browse files
committed
add SDK version title.
1 parent 6a0e924 commit 3cac3be

4 files changed

Lines changed: 5 additions & 5 deletions

File tree

android-videostreamdecodingsample/app/build/intermediates/manifests/full/debug/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
android:theme="@style/AppTheme" >
6161
<meta-data
6262
android:name="com.dji.sdk.API_KEY"
63-
android:value="d66596de3dbde9ce38fe7d01" />
63+
android:value="Please enter your App Key here." />
6464

6565
<activity
6666
android:name="com.dji.videostreamdecodingsample.ConnectionActivity"

android-videostreamdecodingsample/app/build/outputs/logs/manifest-merger-debug-report.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,9 @@ MERGED from [android.arch.lifecycle:runtime:1.0.0] /Users/zlinoliver/.gradle/cac
151151
android:name
152152
ADDED from /Users/zlinoliver/Documents/DJI-SDK-Github/Android-Tutorial-Projects/Android-VideoStreamDecodingSample/android-videostreamdecodingsample/app/src/main/AndroidManifest.xml:31:9-49
153153
meta-data#com.dji.sdk.API_KEY
154-
ADDED from /Users/zlinoliver/Documents/DJI-SDK-Github/Android-Tutorial-Projects/Android-VideoStreamDecodingSample/android-videostreamdecodingsample/app/src/main/AndroidManifest.xml:37:9-39:55
154+
ADDED from /Users/zlinoliver/Documents/DJI-SDK-Github/Android-Tutorial-Projects/Android-VideoStreamDecodingSample/android-videostreamdecodingsample/app/src/main/AndroidManifest.xml:37:9-39:62
155155
android:value
156-
ADDED from /Users/zlinoliver/Documents/DJI-SDK-Github/Android-Tutorial-Projects/Android-VideoStreamDecodingSample/android-videostreamdecodingsample/app/src/main/AndroidManifest.xml:39:13-53
156+
ADDED from /Users/zlinoliver/Documents/DJI-SDK-Github/Android-Tutorial-Projects/Android-VideoStreamDecodingSample/android-videostreamdecodingsample/app/src/main/AndroidManifest.xml:39:13-60
157157
android:name
158158
ADDED from /Users/zlinoliver/Documents/DJI-SDK-Github/Android-Tutorial-Projects/Android-VideoStreamDecodingSample/android-videostreamdecodingsample/app/src/main/AndroidManifest.xml:38:13-47
159159
activity#com.dji.videostreamdecodingsample.ConnectionActivity

android-videostreamdecodingsample/app/src/main/java/com/dji/videostreamdecodingsample/ConnectionActivity.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,8 +244,7 @@ private void initUI() {
244244
mBtnOpen = (Button) findViewById(R.id.btn_open);
245245
mBtnOpen.setOnClickListener(this);
246246
mBtnOpen.setEnabled(false);
247-
((TextView)findViewById(R.id.textView2)).setText(DJISDKManager.getInstance().getSDKVersion());
248-
247+
((TextView)findViewById(R.id.textView2)).setText(getResources().getString(R.string.sdk_version, DJISDKManager.getInstance().getSDKVersion()));
249248
}
250249

251250
private void updateTitleBar() {

android-videostreamdecodingsample/app/src/main/res/values/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
<string name="product_information">Product Information</string>
55
<string name="connection_loose">Status: No Product Connected</string>
66
<string name="model_not_available">Model Not Available</string>
7+
<string name="sdk_version">DJI SDK Version: %1$s</string>
78
</resources>

0 commit comments

Comments
 (0)