修改 写入逻辑绑定成功自动写入

master
wangh 10 months ago
parent 4cad549e47
commit 644fb42674

Binary file not shown.

@ -39,7 +39,6 @@ public class Read2Activity extends BaseActivity implements DataReturnCall {
binding.setAdapter(adapter); binding.setAdapter(adapter);
// 名称 // 名称
stringArray = getResources().getStringArray(R.array.project_list); stringArray = getResources().getStringArray(R.array.project_list);
// rfidModel = new C5106Device(this,this);
rfidModel = new AutoID9UDevice(this, this); rfidModel = new AutoID9UDevice(this, this);
} }

@ -58,8 +58,8 @@ public class WriteUserActivity extends BaseActivity implements DataReturnCall, P
popupMenu = new PopupMenu(this, binding.writeMenu); popupMenu = new PopupMenu(this, binding.writeMenu);
popupMenu.setOnMenuItemClickListener(this); popupMenu.setOnMenuItemClickListener(this);
getMenuInflater().inflate(R.menu.activity_menu, popupMenu.getMenu()); getMenuInflater().inflate(R.menu.activity_menu, popupMenu.getMenu());
rfidModel = new C5106Device(this,this); // rfidModel = new C5106Device(this,this);
// rfidModel=new AutoID9UDevice(this,this); rfidModel=new AutoID9UDevice(this,this);
if (rfidModel instanceof C5106Device){ if (rfidModel instanceof C5106Device){
intent1 = new Intent(this, ReadActivity.class); intent1 = new Intent(this, ReadActivity.class);
}else { }else {
@ -124,25 +124,30 @@ public class WriteUserActivity extends BaseActivity implements DataReturnCall, P
if (body.getSaveFlag().equals("1")) { if (body.getSaveFlag().equals("1")) {
Toast.makeText(WriteUserActivity.this, getString(R.string.binding_success), Toast.LENGTH_SHORT).show(); Toast.makeText(WriteUserActivity.this, getString(R.string.binding_success), Toast.LENGTH_SHORT).show();
writeUserState = true; writeUserState = true;
writeUser(user,epcStr);
return; return;
} }
tipDialog.shouDialog(false, body.getSaveMessage()); 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)); private void writeUser(String user ,String epcStr){
if (writeState) { Log.e("TAG", "写入");
list.clear(); var writeState = rfidModel.writeUser(validateDataLength(user), epcStr);
adapter.notifyDataSetChanged(); tipDialog.shouDialog(writeState,getString(writeState ? R.string.write_success : R.string.write_failed));
binding.writeEpcCode.setText(null); if (writeState) {
binding.writeTire.setText(null); list.clear();
writeUserState=false; adapter.notifyDataSetChanged();
} binding.writeEpcCode.setText(null);
binding.writeTire.setText(null);
writeUserState=false;
} }
} }

@ -27,9 +27,9 @@
<string name="project_list_rim">rim diameter</string> <string name="project_list_rim">rim diameter</string>
<string name="project_list_flat">flat ratio</string> <string name="project_list_flat">flat ratio</string>
<string name="project_list_area">sales area</string> <string name="project_list_area">sales area</string>
<string name="write_failed">write failed</string> <string name="write_failed">Write failed, click the button again to write</string>
<string name="write_success">write success</string> <string name="write_success">write success</string>
<string name="binding_success">mes binding success</string> <string name="binding_success">MES binding successful, start writing, do not move</string>
<string name="work_model_select">working mode</string> <string name="work_model_select">working mode</string>
<string name="net_model">network mode</string> <string name="net_model">network mode</string>
<string name="standalone_mode">"standalone mode "</string> <string name="standalone_mode">"standalone mode "</string>

@ -28,9 +28,9 @@
<string name="project_list_rim">Đường kính vành</string> <string name="project_list_rim">Đường kính vành</string>
<string name="project_list_flat">Tỷ lệ phẳng</string> <string name="project_list_flat">Tỷ lệ phẳng</string>
<string name="project_list_area">Khu vực bán hàng</string> <string name="project_list_area">Khu vực bán hàng</string>
<string name="write_failed">Lỗi ghi</string> <string name="write_failed">Viết không thành công, nhấn lại nút để viết</string>
<string name="write_success">Viết thành công</string> <string name="write_success">Viết thành công</string>
<string name="binding_success">Kết nối MES thành công</string> <string name="binding_success">MES Binding thành công bắt đầu ghi Không di chuyển</string>
<string name="work_model_select">Chế độ làm việc</string> <string name="work_model_select">Chế độ làm việc</string>
<string name="net_model">Chế độ mạng</string> <string name="net_model">Chế độ mạng</string>
<string name="standalone_mode">Chế độ đơn</string> <string name="standalone_mode">Chế độ đơn</string>

@ -27,9 +27,9 @@
<string name="project_list_rim">轮辋直径</string> <string name="project_list_rim">轮辋直径</string>
<string name="project_list_flat">扁平比</string> <string name="project_list_flat">扁平比</string>
<string name="project_list_area">销售区域</string> <string name="project_list_area">销售区域</string>
<string name="write_failed">写入失败</string> <string name="write_failed">写入失败,重新点击按钮</string>
<string name="write_success">写入成功</string> <string name="write_success">写入成功</string>
<string name="binding_success">MES 绑定成功</string> <string name="binding_success">MES 绑定成功,开始写入请勿移动</string>
<string name="work_model_select">工作模式</string> <string name="work_model_select">工作模式</string>
<string name="net_model">网络模式</string> <string name="net_model">网络模式</string>
<string name="standalone_mode">单机模式</string> <string name="standalone_mode">单机模式</string>

Loading…
Cancel
Save