Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ captures/

# Intellij
*.iml
**/.idea/
.idea/workspace.xml
.idea/tasks.xml
.idea/gradle.xml
Expand All @@ -51,4 +52,4 @@ google-services.json
#Freeline
freeline.py
freeline/
freeline_project_description.json
freeline_project_description.json
6 changes: 3 additions & 3 deletions NASDK2.0_Studio/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
apply plugin: 'com.android.library'
android {
compileSdkVersion 23
buildToolsVersion '27.0.3'
compileSdkVersion 28
buildToolsVersion '28.0.3'

defaultConfig {
minSdkVersion 16
targetSdkVersion 26
targetSdkVersion 28
}

buildTypes {
Expand Down
4 changes: 0 additions & 4 deletions NASDK2.0_Studio/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@
android:versionCode="5"
android:versionName="2.1.3" >

<uses-sdk
android:minSdkVersion="16"
android:targetSdkVersion="26" />

<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<!-- <uses-permission android:name="android.permission.INTERNET" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2243,7 +2243,11 @@ else if(prevPacket.getDotCode() == 3)
jsonObject.put( JsonTag.INT_TOTAL_SIZE, this.oTotalDataSize );
jsonObject.put( JsonTag.INT_RECEIVED_SIZE, this.oRcvDataSize );

btConnection.onCreateMsg( new PenMsg( PenMsgType.OFFLINE_DATA_SEND_STATUS, jsonObject ) );
// If all of the bytes have been received, then the download succeeded.
if ( this.oRcvDataSize < this.oTotalDataSize)
btConnection.onCreateMsg( new PenMsg( PenMsgType.OFFLINE_DATA_SEND_STATUS, jsonObject ) );
else
btConnection.onCreateMsg( new PenMsg( PenMsgType.OFFLINE_DATA_SEND_SUCCESS, jsonObject ) );
}
catch ( JSONException e )
{
Expand Down
228 changes: 0 additions & 228 deletions NASDK2.0_sample_code/.idea/codeStyleSettings.xml

This file was deleted.

22 changes: 0 additions & 22 deletions NASDK2.0_sample_code/.idea/compiler.xml

This file was deleted.

3 changes: 0 additions & 3 deletions NASDK2.0_sample_code/.idea/copyright/profiles_settings.xml

This file was deleted.

6 changes: 0 additions & 6 deletions NASDK2.0_sample_code/.idea/encodings.xml

This file was deleted.

19 changes: 0 additions & 19 deletions NASDK2.0_sample_code/.idea/gradle.xml

This file was deleted.

9 changes: 0 additions & 9 deletions NASDK2.0_sample_code/.idea/libraries/android_android_21.xml

This file was deleted.

9 changes: 0 additions & 9 deletions NASDK2.0_sample_code/.idea/libraries/android_android_24.xml

This file was deleted.

This file was deleted.

13 changes: 0 additions & 13 deletions NASDK2.0_sample_code/.idea/libraries/support_v4_24_0_0.xml

This file was deleted.

Loading