Merge pull request #8 from cslrfid/release-1.17

Bug fix on long EPC tag decoding

Author: ksclam

.idea/caches/build_file_checksums.ser

@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 28
     defaultConfig {
         applicationId "com.csl.cs108ademoapp"
         minSdkVersion 19
-        targetSdkVersion 26
-        versionCode 21
-        versionName "1.16.0"
+        targetSdkVersion 28
+        versionCode 22
+        versionName "1.17.0"
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7
@@ -18,5 +18,5 @@ android {
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     compile project(':cs108library4a')
-    compile 'com.android.support:design:26.1.0'
+    compile 'com.android.support:design:28.0.0'
 }

.idea/caches/gradle_models.ser

@@ -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":{}}]
+[{"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":{}}]

.idea/codeStyles/Project.xml

@@ -118,7 +118,7 @@ else if (hostCommand == Cs108Connector.HostCommands.CMD_18K6CKILL) {
             if (repeat == false || nextNew) matchRep = 1;
             if (powerLevel < 0 || powerLevel > 330) invalidRequest = true;
             else if (skipSelect) { }
-            else if (MainActivity.mCs108Library4a.setSelectedTag(null, selectMask, selectBank, selectOffset, powerLevel, qValue, matchRep) == false) {
+            else if (MainActivity.mCs108Library4a.setSelectedTag(selectMask, selectBank, selectOffset, powerLevel, qValue, matchRep) == false) {
                 invalidRequest = true; MainActivity.mCs108Library4a.appendToLog("setSelectedTag is failed with selectMask = " + selectMask + ", selectBank = " + selectBank + ", selectOffset = " + selectOffset + ", powerLevel = " + powerLevel);
             }
         }

.idea/gradle.xml

@@ -2,6 +2,7 @@
 
 import android.content.Context;
 import android.content.res.AssetFileDescriptor;
+import android.media.AudioManager;
 import android.media.MediaPlayer;
 import android.support.annotation.Keep;
 import android.support.annotation.NonNull;
@@ -12,6 +13,7 @@
 import java.util.ArrayList;
 
 public class CustomMediaPlayer {
+    final boolean DEBUG = false;
     Context context;
     MediaPlayer player; boolean starting = false;
 
@@ -27,7 +29,7 @@ public CustomMediaPlayer(Context context, String file) {
                 @Override
                 public void onCompletion(MediaPlayer mp) {
                     starting = false;
-                    MainActivity.mCs108Library4a.appendToLog("MediaPlayer is completed.");
+                    if (DEBUG) MainActivity.mCs108Library4a.appendToLog("MediaPlayer is completed.");
                 }
             });
         } catch (IOException e) {
@@ -46,6 +48,17 @@ public void pause() {
         player.pause();
     }
     void setVolume(int volume1, int volume2) {
-        player.setVolume(volume1, volume2);
+        if (false) player.setVolume(volume1, volume2);
+        else {
+            AudioManager audioManager = ((AudioManager) context.getSystemService(Context.AUDIO_SERVICE));
+            int iVolumeMax = audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC);
+            int currentVolume = audioManager.getStreamVolume(AudioManager.STREAM_MUSIC);
+            MainActivity.mCs108Library4a.appendToLog("Hello8: currentVolume = " + currentVolume);
+            if (currentVolume > 0) {
+                int volume12 = volume1 + volume2;
+                volume12 = ( volume12 * iVolumeMax ) / 600;
+                audioManager.setStreamVolume(AudioManager.STREAM_MUSIC, iVolumeMax, 0);
+            }
+        }
     }
 }

.idea/misc.xml

@@ -20,7 +20,7 @@ public enum DrawerPositions {
         ABOUT, CONNECT,
         INVENTORY, SEARCH, MULTIBANK,
         SETTING, FILTER, READWRITE, SECURITY, REGISTER,
-        COLDCHAIN, MICROTEMPERATURE, UCODE,
+        COLDCHAIN, BAPCARD, AXZON, RFMICRON, UCODE, UCODE8,
         WEDGE, BLANK;
 
         public static DrawerPositions toDrawerPosition(int x) {
@@ -35,10 +35,13 @@ public static DrawerPositions toDrawerPosition(int x) {
                 case 7: return READWRITE;
                 case 8: return SECURITY;
                 case 9: return REGISTER;
-                case 10: return COLDCHAIN;
-                case 11: return MICROTEMPERATURE;
-                case 12: return UCODE;
-                case 13: return WEDGE;
+                case 11: return COLDCHAIN;
+                case 10: return BAPCARD;
+                case 12: return AXZON;
+                case 13: return RFMICRON;
+                case 14: return UCODE;
+                case 15: return UCODE8;
+                case 16: return WEDGE;
             }
             return null;
         }
@@ -57,9 +60,12 @@ public static DrawerPositions toDrawerPosition(int x) {
         addItem(new DrawerItem("8", "Security", R.drawable.dl_access));
         addItem(new DrawerItem("9", "Register Tag", R.drawable.dl_rr));
         addItem(new DrawerItem("10", "Cold Chain CS8300", R.drawable.dl_loc));
-        addItem(new DrawerItem("11", "RFMicron", R.drawable.dl_loc));
-        addItem(new DrawerItem("12", "UCODE DNA", R.drawable.dl_loc));
-        addItem(new DrawerItem("13", "Wedge", R.drawable.dl_rr));
+        addItem(new DrawerItem("11", "CS9010 BAP ID Card", R.drawable.dl_loc));
+        addItem(new DrawerItem("12", "Axzon", R.drawable.dl_loc));
+        addItem(new DrawerItem("13", "Temperature / Humidity", R.drawable.dl_loc));
+        addItem(new DrawerItem("14", "UCODE DNA", R.drawable.dl_loc));
+        addItem(new DrawerItem("15", "UCODE 8", R.drawable.dl_loc));
+        addItem(new DrawerItem("16", "Wedge", R.drawable.dl_rr));
     }
 
     private static void addItem(DrawerItem item) {

.idea/modules.xml

@@ -189,9 +189,9 @@ public void run() {
             requestSound = false;
             if (requestNewSound) {
                 requestNewSound = false;
-                playerN.start(); playerN.setVolume(300, 300);
+                playerN.start(); //playerN.setVolume(300, 300);
             } else {
-                playerO.start(); playerN.setVolume(30, 30);
+                playerO.start(); //playerO.setVolume(30, 30);
             }
         }
     };