Merge pull request #6 from cslrfid/release-1.15.0

Hotfixes on Long EPC Decoding

Author: ksclam

app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "com.csl.cs108ademoapp"
         minSdkVersion 19
         targetSdkVersion 26
-        versionCode 19
-        versionName "1.14.0"
+        versionCode 20
+        versionName "1.15.0"
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7

app/libs/cs108library4a-debug.aar

@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":19,"versionName":"1.14.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":20,"versionName":"1.15.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

app/libs/cs108library4a-release.aar

@@ -131,7 +131,8 @@ public void onActivityCreated(Bundle savedInstanceState) {
         buttonCSLServer.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                String serverLocation = "https://" + "www.convergence.com.hk:" + "29090/WebServiceRESTs/1.0/req/" + "create-update-delete/update-entity/" + "tagdata";
+                String serverLocation = "https://" + "democloud.convergence.com.hk:" + "29090/WebServiceRESTs/1.0/req/" + "create-update-delete/update-entity/" + "tagdata";
+                //String serverLocation = "https://" + "www.convergence.com.hk:" + "29090/WebServiceRESTs/1.0/req/" + "create-update-delete/update-entity/" + "tagdata";
                 //String serverLocation = "http://ptsv2.com/t/10i1t-1519143332/post";
                 editTextServer.setText(serverLocation);
             }

app/release/cs108ademo-190116-v1.13.1-app-release.apk

@@ -5,8 +5,8 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 26
-        versionCode 19
-        versionName "1.14.0"
+        versionCode 20
+        versionName "1.15.0"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 

app/release/cs108ademo-190116-v1.13.1-app-release.zip

@@ -4339,7 +4339,7 @@ void mRx000UplinkHandler() {
                     while (mRfidToReadingOffset > startIndex) {
                         int packageLengthRead = 0;
                         if (mRfidToReadingOffset - startIndex >= 8) {
-                            packageLengthRead = mRfidToReading[startIndex + 5] * 256 + mRfidToReading[startIndex + 4];
+                            packageLengthRead = (mRfidToReading[startIndex + 5] & 0xFF) * 256 + (mRfidToReading[startIndex + 4] & 0xFF);
                         }
                         int expectedLength = 8 + packageLengthRead * 4;
                         if (mRfidToReading[startIndex + 0] == 0x04) expectedLength = 8 + packageLengthRead;