diff --git a/app/release/海威PDA.apk b/app/release/海威PDA.apk new file mode 100644 index 0000000..df7d145 Binary files /dev/null and b/app/release/海威PDA.apk differ diff --git a/app/src/main/java/com/example/jinyu_rfid/Read2Activity.java b/app/src/main/java/com/example/jinyu_rfid/Read2Activity.java index ddf9e25..9377987 100644 --- a/app/src/main/java/com/example/jinyu_rfid/Read2Activity.java +++ b/app/src/main/java/com/example/jinyu_rfid/Read2Activity.java @@ -39,7 +39,6 @@ public class Read2Activity extends BaseActivity implements DataReturnCall { binding.setAdapter(adapter); // 名称 stringArray = getResources().getStringArray(R.array.project_list); - // rfidModel = new C5106Device(this,this); rfidModel = new AutoID9UDevice(this, this); } diff --git a/app/src/main/java/com/example/jinyu_rfid/WriteUserActivity.java b/app/src/main/java/com/example/jinyu_rfid/WriteUserActivity.java index 356ce35..46a707f 100644 --- a/app/src/main/java/com/example/jinyu_rfid/WriteUserActivity.java +++ b/app/src/main/java/com/example/jinyu_rfid/WriteUserActivity.java @@ -58,8 +58,8 @@ public class WriteUserActivity extends BaseActivity implements DataReturnCall, P popupMenu = new PopupMenu(this, binding.writeMenu); popupMenu.setOnMenuItemClickListener(this); getMenuInflater().inflate(R.menu.activity_menu, popupMenu.getMenu()); - rfidModel = new C5106Device(this,this); - // rfidModel=new AutoID9UDevice(this,this); + // rfidModel = new C5106Device(this,this); + rfidModel=new AutoID9UDevice(this,this); if (rfidModel instanceof C5106Device){ intent1 = new Intent(this, ReadActivity.class); }else { @@ -124,25 +124,30 @@ public class WriteUserActivity extends BaseActivity implements DataReturnCall, P if (body.getSaveFlag().equals("1")) { Toast.makeText(WriteUserActivity.this, getString(R.string.binding_success), Toast.LENGTH_SHORT).show(); writeUserState = true; + writeUser(user,epcStr); return; } tipDialog.shouDialog(false, body.getSaveMessage()); } }); + }else { + writeUser(user,epcStr); } - //writeUserState = true; - if (writeUserState){ - Log.e("TAG", "写入"); - var writeState = rfidModel.writeUser(validateDataLength(user), epcStr); - tipDialog.shouDialog(writeState,getString(writeState ? R.string.write_success : R.string.write_failed)); - if (writeState) { - list.clear(); - adapter.notifyDataSetChanged(); - binding.writeEpcCode.setText(null); - binding.writeTire.setText(null); - writeUserState=false; - } + + + + } + private void writeUser(String user ,String epcStr){ + Log.e("TAG", "写入"); + var writeState = rfidModel.writeUser(validateDataLength(user), epcStr); + tipDialog.shouDialog(writeState,getString(writeState ? R.string.write_success : R.string.write_failed)); + if (writeState) { + list.clear(); + adapter.notifyDataSetChanged(); + binding.writeEpcCode.setText(null); + binding.writeTire.setText(null); + writeUserState=false; } } diff --git a/app/src/main/res/values-en-rUS/strings.xml b/app/src/main/res/values-en-rUS/strings.xml index df9252e..2504ec3 100644 --- a/app/src/main/res/values-en-rUS/strings.xml +++ b/app/src/main/res/values-en-rUS/strings.xml @@ -27,9 +27,9 @@ rim diameter flat ratio sales area - write failed + Write failed, click the button again to write write success - mes binding success + MES binding successful, start writing, do not move working mode network mode "standalone mode " diff --git a/app/src/main/res/values-vi-rVN/strings.xml b/app/src/main/res/values-vi-rVN/strings.xml index 18dca19..4c1ddda 100644 --- a/app/src/main/res/values-vi-rVN/strings.xml +++ b/app/src/main/res/values-vi-rVN/strings.xml @@ -28,9 +28,9 @@ Đường kính vành Tỷ lệ phẳng Khu vực bán hàng - Lỗi ghi + Viết không thành công, nhấn lại nút để viết Viết thành công - Kết nối MES thành công + MES Binding thành công bắt đầu ghi Không di chuyển Chế độ làm việc Chế độ mạng Chế độ đơn diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 37c9cdf..0ff65a4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -27,9 +27,9 @@ 轮辋直径 扁平比 销售区域 - 写入失败 + 写入失败,重新点击按钮 写入成功 - MES 绑定成功 + MES 绑定成功,开始写入请勿移动 工作模式 网络模式 单机模式