Commit 387f4f1d authored by hywang's avatar hywang

1.切掉扫到的rfid标签的第一位

parent 52860942
...@@ -9,8 +9,8 @@ android { ...@@ -9,8 +9,8 @@ android {
applicationId "com.phlx.anchorcollect" applicationId "com.phlx.anchorcollect"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 29 targetSdkVersion 29
versionCode 2 versionCode 3
versionName "1.0.1" versionName "1.0.2"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
......
...@@ -479,7 +479,7 @@ public class BasicsCollectVM extends BaseViewModel<Repository> implements OnInve ...@@ -479,7 +479,7 @@ public class BasicsCollectVM extends BaseViewModel<Repository> implements OnInve
if (msg.what == 0x333) { if (msg.what == 0x333) {
InventoryData inventoryData = (InventoryData) msg.obj; InventoryData inventoryData = (InventoryData) msg.obj;
if (inventoryData.getDataLength() > 0 && inventoryData.getEpcLength() > 0) { if (inventoryData.getDataLength() > 0 && inventoryData.getEpcLength() > 0) {
String epc = TextUtil.byteToHexString(inventoryData.getEPC_Data(), inventoryData.getEpcLength()); String epc = TextUtil.byteToHexString(inventoryData.getEPC_Data(), inventoryData.getEpcLength()).substring(1);
String tid = TextUtil.byteToHexString(inventoryData.getData(), inventoryData.getDataLength()); String tid = TextUtil.byteToHexString(inventoryData.getData(), inventoryData.getDataLength());
soundPool.play(musicId.get(1), 1, 1, 0, 0, 1); soundPool.play(musicId.get(1), 1, 1, 0, 0, 1);
App.getInstance().getLinkage().stopInventory(); App.getInstance().getLinkage().stopInventory();
......
...@@ -577,7 +577,7 @@ public class WeightManVM extends BaseViewModel<Repository> implements OnInventor ...@@ -577,7 +577,7 @@ public class WeightManVM extends BaseViewModel<Repository> implements OnInventor
if (msg.what == 0x333) { if (msg.what == 0x333) {
InventoryData inventoryData = (InventoryData) msg.obj; InventoryData inventoryData = (InventoryData) msg.obj;
if (inventoryData.getDataLength() > 0 && inventoryData.getEpcLength() > 0) { if (inventoryData.getDataLength() > 0 && inventoryData.getEpcLength() > 0) {
String epc = TextUtil.byteToHexString(inventoryData.getEPC_Data(), inventoryData.getEpcLength()); String epc = TextUtil.byteToHexString(inventoryData.getEPC_Data(), inventoryData.getEpcLength()).substring(1);
String tid = TextUtil.byteToHexString(inventoryData.getData(), inventoryData.getDataLength()); String tid = TextUtil.byteToHexString(inventoryData.getData(), inventoryData.getDataLength());
soundPool.play(musicId.get(1), 1, 1, 0, 0, 1); soundPool.play(musicId.get(1), 1, 1, 0, 0, 1);
App.getInstance().getLinkage().stopInventory(); App.getInstance().getLinkage().stopInventory();
......
...@@ -77,8 +77,8 @@ public class LoginVM extends BaseViewModel<Repository> { ...@@ -77,8 +77,8 @@ public class LoginVM extends BaseViewModel<Repository> {
// userName.set("dzy"); // userName.set("dzy");
// password.set("123456"); // password.set("123456");
userName.set("ewei"); // userName.set("ewei");
password.set("123456"); // password.set("123456");
} }
//清除用户名的点击事件 //清除用户名的点击事件
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment