diff --git a/app/build.gradle b/app/build.gradle index 35ab697..6fdc9fc 100755 --- a/app/build.gradle +++ b/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 diff --git a/app/libs/cs108library4a-debug.aar b/app/libs/cs108library4a-debug.aar deleted file mode 100755 index 7c15cc5..0000000 Binary files a/app/libs/cs108library4a-debug.aar and /dev/null differ diff --git a/app/libs/cs108library4a-release.aar b/app/libs/cs108library4a-release.aar deleted file mode 100755 index 79f4daa..0000000 Binary files a/app/libs/cs108library4a-release.aar and /dev/null differ diff --git a/app/release/cs108ademo-190116-v1.13.1-app-release.apk b/app/release/cs108ademo-190116-v1.13.1-app-release.apk deleted file mode 100755 index d914bc4..0000000 Binary files a/app/release/cs108ademo-190116-v1.13.1-app-release.apk and /dev/null differ diff --git a/app/release/cs108ademo-190116-v1.13.1-app-release.zip b/app/release/cs108ademo-190116-v1.13.1-app-release.zip deleted file mode 100755 index 8e134b8..0000000 Binary files a/app/release/cs108ademo-190116-v1.13.1-app-release.zip and /dev/null differ diff --git a/app/release/cs108ademo-190117-v1.13.2-app-release.apk b/app/release/cs108ademo-190117-v1.13.2-app-release.apk deleted file mode 100755 index cf1f04d..0000000 Binary files a/app/release/cs108ademo-190117-v1.13.2-app-release.apk and /dev/null differ diff --git a/app/release/cs108ademo-190117-v1.13.2-app-release.zip b/app/release/cs108ademo-190117-v1.13.2-app-release.zip deleted file mode 100755 index 3279e2d..0000000 Binary files a/app/release/cs108ademo-190117-v1.13.2-app-release.zip and /dev/null differ diff --git a/app/release/cs108ademo-190118-v1.13.3-app-release.zip b/app/release/cs108ademo-190118-v1.13.3-app-release.zip deleted file mode 100755 index 0570b0f..0000000 Binary files a/app/release/cs108ademo-190118-v1.13.3-app-release.zip and /dev/null differ diff --git a/app/release/cs108ademo-190122-v1.13.4-app-release.apk b/app/release/cs108ademo-190122-v1.13.4-app-release.apk deleted file mode 100755 index 2825c9e..0000000 Binary files a/app/release/cs108ademo-190122-v1.13.4-app-release.apk and /dev/null differ diff --git a/app/release/cs108ademo-190122-v1.13.4-app-release.zip b/app/release/cs108ademo-190122-v1.13.4-app-release.zip deleted file mode 100755 index f671c6b..0000000 Binary files a/app/release/cs108ademo-190122-v1.13.4-app-release.zip and /dev/null differ diff --git a/app/release/cs108ademo-190124-v1.13.5-app-release.apk b/app/release/cs108ademo-190124-v1.13.5-app-release.apk deleted file mode 100755 index d6b3489..0000000 Binary files a/app/release/cs108ademo-190124-v1.13.5-app-release.apk and /dev/null differ diff --git a/app/release/cs108ademo-190124-v1.13.5-app-release.zip b/app/release/cs108ademo-190124-v1.13.5-app-release.zip deleted file mode 100755 index 9925909..0000000 Binary files a/app/release/cs108ademo-190124-v1.13.5-app-release.zip and /dev/null differ diff --git a/app/release/cs108ademo-190124-v1.13.6-app-release.apk b/app/release/cs108ademo-190124-v1.13.6-app-release.apk deleted file mode 100755 index 79aea29..0000000 Binary files a/app/release/cs108ademo-190124-v1.13.6-app-release.apk and /dev/null differ diff --git a/app/release/cs108ademo-190124-v1.13.6-app-release.zip b/app/release/cs108ademo-190124-v1.13.6-app-release.zip deleted file mode 100755 index 1f046ac..0000000 Binary files a/app/release/cs108ademo-190124-v1.13.6-app-release.zip and /dev/null differ diff --git a/app/release/cs108ademo-190125-v1.13.7-app-release.zip b/app/release/cs108ademo-190125-v1.13.7-app-release.zip deleted file mode 100755 index b817e79..0000000 Binary files a/app/release/cs108ademo-190125-v1.13.7-app-release.zip and /dev/null differ diff --git a/app/release/cs108ademo-190214-v1.13.7A-app-release.apk b/app/release/cs108ademo-190214-v1.13.7A-app-release.apk deleted file mode 100755 index ce3e6aa..0000000 Binary files a/app/release/cs108ademo-190214-v1.13.7A-app-release.apk and /dev/null differ diff --git a/app/release/cs108ademo-190214-v1.13.7A-app-release.zip b/app/release/cs108ademo-190214-v1.13.7A-app-release.zip deleted file mode 100755 index 73769bb..0000000 Binary files a/app/release/cs108ademo-190214-v1.13.7A-app-release.zip and /dev/null differ diff --git a/app/release/cs108ademo-190215-v1.13.8-app-release.zip b/app/release/cs108ademo-190215-v1.13.8-app-release.zip deleted file mode 100755 index f41aa81..0000000 Binary files a/app/release/cs108ademo-190215-v1.13.8-app-release.zip and /dev/null differ diff --git a/app/release/cs108ademo-190215-v1.13.8-app-release.apk b/app/release/cs108ademo-190220A-v1.14.0A-app-release.apk similarity index 63% rename from app/release/cs108ademo-190215-v1.13.8-app-release.apk rename to app/release/cs108ademo-190220A-v1.14.0A-app-release.apk index abdd720..4cb52e6 100755 Binary files a/app/release/cs108ademo-190215-v1.13.8-app-release.apk and b/app/release/cs108ademo-190220A-v1.14.0A-app-release.apk differ diff --git a/app/release/cs108ademo-190220A-v1.14.0A-app-release.zip b/app/release/cs108ademo-190220A-v1.14.0A-app-release.zip new file mode 100755 index 0000000..1fc1a48 Binary files /dev/null and b/app/release/cs108ademo-190220A-v1.14.0A-app-release.zip differ diff --git a/app/release/cs108ademo-190125-v1.13.7-app-release.apk b/app/release/cs108ademo-190221-v1.14.1-app-release.apk similarity index 58% rename from app/release/cs108ademo-190125-v1.13.7-app-release.apk rename to app/release/cs108ademo-190221-v1.14.1-app-release.apk index 0e11de9..5691a1a 100755 Binary files a/app/release/cs108ademo-190125-v1.13.7-app-release.apk and b/app/release/cs108ademo-190221-v1.14.1-app-release.apk differ diff --git a/app/release/cs108ademo-190221-v1.14.1-app-release.zip b/app/release/cs108ademo-190221-v1.14.1-app-release.zip new file mode 100755 index 0000000..d35665a Binary files /dev/null and b/app/release/cs108ademo-190221-v1.14.1-app-release.zip differ diff --git a/app/release/cs108ademo-190118-v1.13.3-app-release.apk b/app/release/cs108ademo-190221-v1.15.0-app-release.apk similarity index 58% rename from app/release/cs108ademo-190118-v1.13.3-app-release.apk rename to app/release/cs108ademo-190221-v1.15.0-app-release.apk index c948546..3ed7efd 100755 Binary files a/app/release/cs108ademo-190118-v1.13.3-app-release.apk and b/app/release/cs108ademo-190221-v1.15.0-app-release.apk differ diff --git a/app/release/cs108ademo-190221-v1.15.0-app-release.zip b/app/release/cs108ademo-190221-v1.15.0-app-release.zip new file mode 100755 index 0000000..5718441 Binary files /dev/null and b/app/release/cs108ademo-190221-v1.15.0-app-release.zip differ diff --git a/app/release/output.json b/app/release/output.json index ee83254..8d76adf 100755 --- a/app/release/output.json +++ b/app/release/output.json @@ -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":{}}] \ No newline at end of file +[{"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":{}}] \ No newline at end of file diff --git a/app/src/main/java/com/csl/cs108ademoapp/fragments/SettingAdminFragment.java b/app/src/main/java/com/csl/cs108ademoapp/fragments/SettingAdminFragment.java index 57e1108..faf3363 100755 --- a/app/src/main/java/com/csl/cs108ademoapp/fragments/SettingAdminFragment.java +++ b/app/src/main/java/com/csl/cs108ademoapp/fragments/SettingAdminFragment.java @@ -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); } diff --git a/cs108library4a/build.gradle b/cs108library4a/build.gradle index 97a7163..54667d9 100755 --- a/cs108library4a/build.gradle +++ b/cs108library4a/build.gradle @@ -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" diff --git a/cs108library4a/src/main/java/com/csl/cs108library4a/Cs108Connector.java b/cs108library4a/src/main/java/com/csl/cs108library4a/Cs108Connector.java index e2f1388..83a5617 100755 --- a/cs108library4a/src/main/java/com/csl/cs108library4a/Cs108Connector.java +++ b/cs108library4a/src/main/java/com/csl/cs108library4a/Cs108Connector.java @@ -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;