Skip to content

Commit fa8ac13

Browse files
authored
Merge pull request #8 from cslrfid/release-1.17
Bug fix on long EPC tag decoding
2 parents 0fe40ad + e960d5b commit fa8ac13

File tree

216 files changed

+4291
-776
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

216 files changed

+4291
-776
lines changed

.idea/caches/build_file_checksums.ser

597 Bytes
Binary file not shown.

.idea/caches/gradle_models.ser

216 KB
Binary file not shown.

.idea/codeStyles/Project.xml

Lines changed: 116 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gradle.xml

Lines changed: 23 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations.xml

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/vcs.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/.gitignore

100755100644
File mode changed.

app/build.gradle

100755100644
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 26
4+
compileSdkVersion 28
55
defaultConfig {
66
applicationId "com.csl.cs108ademoapp"
77
minSdkVersion 19
8-
targetSdkVersion 26
9-
versionCode 21
10-
versionName "1.16.0"
8+
targetSdkVersion 28
9+
versionCode 22
10+
versionName "1.17.0"
1111
}
1212
compileOptions {
1313
sourceCompatibility JavaVersion.VERSION_1_7
@@ -18,5 +18,5 @@ android {
1818
dependencies {
1919
compile fileTree(include: ['*.jar'], dir: 'libs')
2020
compile project(':cs108library4a')
21-
compile 'com.android.support:design:26.1.0'
21+
compile 'com.android.support:design:28.0.0'
2222
}

app/cs108ademo-180112-v1.3.0-app-release.apk

100755100644
File mode changed.

app/proguard-rules.pro

100755100644
File mode changed.

app/release/cs108ademo-190221-v1.15.0-app-release.apk

100755100644
File mode changed.

app/release/cs108ademo-190221-v1.15.0-app-release.zip

100755100644
File mode changed.

app/release/cs108ademo-190221-v1.15.0A-app-release.apk

100755100644
File mode changed.

app/release/cs108ademo-190221-v1.15.0A-app-release.zip

100755100644
File mode changed.

app/release/cs108ademo-190225-v1.15.1-app-release.apk

100755100644
File mode changed.

app/release/cs108ademo-190225-v1.15.1-app-release.zip

100755100644
File mode changed.

app/release/cs108ademo-190226-v1.15.2-app-release.apk

100755100644
File mode changed.

app/release/cs108ademo-190226-v1.15.2-app-release.zip

100755100644
File mode changed.

app/release/cs108ademo-190228-v1.16.0-app-release.apk

100755100644
File mode changed.

app/release/cs108ademo-190228-v1.16.0-app-release.zip

100755100644
File mode changed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

app/release/output.json

100755100644
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":21,"versionName":"1.16.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
1+
[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":22,"versionName":"1.17.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

app/src/main/AndroidManifest.xml

100755100644
File mode changed.

app/src/main/assets/beep3s1khz.mp3

100755100644
File mode changed.

app/src/main/assets/beep3s1khz.wav

100755100644
File mode changed.

app/src/main/assets/beephigh.mp3

100755100644
File mode changed.

app/src/main/assets/beeplow.mp3

100755100644
File mode changed.

app/src/main/assets/cslrfidcloudserver.crt

100755100644
File mode changed.

app/src/main/java/com/csl/cs108ademoapp/AccessTask.java

100755100644
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ else if (hostCommand == Cs108Connector.HostCommands.CMD_18K6CKILL) {
118118
if (repeat == false || nextNew) matchRep = 1;
119119
if (powerLevel < 0 || powerLevel > 330) invalidRequest = true;
120120
else if (skipSelect) { }
121-
else if (MainActivity.mCs108Library4a.setSelectedTag(null, selectMask, selectBank, selectOffset, powerLevel, qValue, matchRep) == false) {
121+
else if (MainActivity.mCs108Library4a.setSelectedTag(selectMask, selectBank, selectOffset, powerLevel, qValue, matchRep) == false) {
122122
invalidRequest = true; MainActivity.mCs108Library4a.appendToLog("setSelectedTag is failed with selectMask = " + selectMask + ", selectBank = " + selectBank + ", selectOffset = " + selectOffset + ", powerLevel = " + powerLevel);
123123
}
124124
}

app/src/main/java/com/csl/cs108ademoapp/CustomIME.java

100755100644
File mode changed.

app/src/main/java/com/csl/cs108ademoapp/CustomMediaPlayer.java

100755100644
Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import android.content.Context;
44
import android.content.res.AssetFileDescriptor;
5+
import android.media.AudioManager;
56
import android.media.MediaPlayer;
67
import android.support.annotation.Keep;
78
import android.support.annotation.NonNull;
@@ -12,6 +13,7 @@
1213
import java.util.ArrayList;
1314

1415
public class CustomMediaPlayer {
16+
final boolean DEBUG = false;
1517
Context context;
1618
MediaPlayer player; boolean starting = false;
1719

@@ -27,7 +29,7 @@ public CustomMediaPlayer(Context context, String file) {
2729
@Override
2830
public void onCompletion(MediaPlayer mp) {
2931
starting = false;
30-
MainActivity.mCs108Library4a.appendToLog("MediaPlayer is completed.");
32+
if (DEBUG) MainActivity.mCs108Library4a.appendToLog("MediaPlayer is completed.");
3133
}
3234
});
3335
} catch (IOException e) {
@@ -46,6 +48,17 @@ public void pause() {
4648
player.pause();
4749
}
4850
void setVolume(int volume1, int volume2) {
49-
player.setVolume(volume1, volume2);
51+
if (false) player.setVolume(volume1, volume2);
52+
else {
53+
AudioManager audioManager = ((AudioManager) context.getSystemService(Context.AUDIO_SERVICE));
54+
int iVolumeMax = audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC);
55+
int currentVolume = audioManager.getStreamVolume(AudioManager.STREAM_MUSIC);
56+
MainActivity.mCs108Library4a.appendToLog("Hello8: currentVolume = " + currentVolume);
57+
if (currentVolume > 0) {
58+
int volume12 = volume1 + volume2;
59+
volume12 = ( volume12 * iVolumeMax ) / 600;
60+
audioManager.setStreamVolume(AudioManager.STREAM_MUSIC, iVolumeMax, 0);
61+
}
62+
}
5063
}
5164
}

app/src/main/java/com/csl/cs108ademoapp/CustomPopupWindow.java

100755100644
File mode changed.

app/src/main/java/com/csl/cs108ademoapp/CustomProgressDialog.java

100755100644
File mode changed.

app/src/main/java/com/csl/cs108ademoapp/DrawerListContent.java

100755100644
Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public enum DrawerPositions {
2020
ABOUT, CONNECT,
2121
INVENTORY, SEARCH, MULTIBANK,
2222
SETTING, FILTER, READWRITE, SECURITY, REGISTER,
23-
COLDCHAIN, MICROTEMPERATURE, UCODE,
23+
COLDCHAIN, BAPCARD, AXZON, RFMICRON, UCODE, UCODE8,
2424
WEDGE, BLANK;
2525

2626
public static DrawerPositions toDrawerPosition(int x) {
@@ -35,10 +35,13 @@ public static DrawerPositions toDrawerPosition(int x) {
3535
case 7: return READWRITE;
3636
case 8: return SECURITY;
3737
case 9: return REGISTER;
38-
case 10: return COLDCHAIN;
39-
case 11: return MICROTEMPERATURE;
40-
case 12: return UCODE;
41-
case 13: return WEDGE;
38+
case 11: return COLDCHAIN;
39+
case 10: return BAPCARD;
40+
case 12: return AXZON;
41+
case 13: return RFMICRON;
42+
case 14: return UCODE;
43+
case 15: return UCODE8;
44+
case 16: return WEDGE;
4245
}
4346
return null;
4447
}
@@ -57,9 +60,12 @@ public static DrawerPositions toDrawerPosition(int x) {
5760
addItem(new DrawerItem("8", "Security", R.drawable.dl_access));
5861
addItem(new DrawerItem("9", "Register Tag", R.drawable.dl_rr));
5962
addItem(new DrawerItem("10", "Cold Chain CS8300", R.drawable.dl_loc));
60-
addItem(new DrawerItem("11", "RFMicron", R.drawable.dl_loc));
61-
addItem(new DrawerItem("12", "UCODE DNA", R.drawable.dl_loc));
62-
addItem(new DrawerItem("13", "Wedge", R.drawable.dl_rr));
63+
addItem(new DrawerItem("11", "CS9010 BAP ID Card", R.drawable.dl_loc));
64+
addItem(new DrawerItem("12", "Axzon", R.drawable.dl_loc));
65+
addItem(new DrawerItem("13", "Temperature / Humidity", R.drawable.dl_loc));
66+
addItem(new DrawerItem("14", "UCODE DNA", R.drawable.dl_loc));
67+
addItem(new DrawerItem("15", "UCODE 8", R.drawable.dl_loc));
68+
addItem(new DrawerItem("16", "Wedge", R.drawable.dl_rr));
6369
}
6470

6571
private static void addItem(DrawerItem item) {

app/src/main/java/com/csl/cs108ademoapp/GenericTextWatcher.java

100755100644
File mode changed.

app/src/main/java/com/csl/cs108ademoapp/InventoryBarcodeTask.java

100755100644
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,9 +189,9 @@ public void run() {
189189
requestSound = false;
190190
if (requestNewSound) {
191191
requestNewSound = false;
192-
playerN.start(); playerN.setVolume(300, 300);
192+
playerN.start(); //playerN.setVolume(300, 300);
193193
} else {
194-
playerO.start(); playerN.setVolume(30, 30);
194+
playerO.start(); //playerO.setVolume(30, 30);
195195
}
196196
}
197197
};

0 commit comments

Comments
 (0)