diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index cdef0a1..d563155 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -23,6 +23,7 @@ android:label="@string/title_activity_settings" /> 2025-08-04T00:00:002025-08-04T10:55:31.5171L403张磊HL49691000YC250804L403204511P24084188832025-08-04T10:55:31.5170100S2045-0500"; // jiexi(msg); @@ -63,17 +108,18 @@ private MyMesInfoAdapter adapter; binding.dataEpc.setText(result); if (readState) { + dataReadRFID(null); // callWebService(buildSelectRequest(result)); haohuaMesSelect(result); - - + + } } private void haohuaMesSelect(String result) { OkGo.post("http://192.168.26.26:5050/UMInterface/RFID/tyreTracingBack") - .params("rfid",result) - .execute(new MyRecultCall(dialog,this) { + .params("rfid", result) + .execute(new MyRecultCall(dialog, this) { @SuppressLint("NotifyDataSetChanged") @Override public void onSuccess(Response response) { @@ -81,16 +127,18 @@ private MyMesInfoAdapter adapter; MyResult body = response.body(); try { if (body.getCode() == 200) { - List list=gson.fromJson(body.getDataJson(),new TypeToken>(){}.getType()); - if (list.isEmpty()){ + List list = + gson.fromJson(body.getDataJson(), new TypeToken>() { + }.getType()); + if (list.isEmpty()) { tipsDialog.setTip(false, "未返回信息"); tipsDialog.show(); return; } - List mesInfos=new ArrayList<>(list.size()); - list.forEach(item->{ + List mesInfos = new ArrayList<>(list.size()); + list.forEach(item -> { String[] split = item.split(":"); - MESInfo mesInfo=new MESInfo(); + MESInfo mesInfo = new MESInfo(); mesInfo.setTitle(split[0]); mesInfo.setInfo(split[1]); mesInfos.add(mesInfo); @@ -133,21 +181,25 @@ private MyMesInfoAdapter adapter; String str = ""; int faultstringIndex = result.indexOf(str); if (faultstringIndex > -1) { - String faultstring = result.substring(faultstringIndex + str.length(), result.indexOf("")); + String faultstring = + result.substring(faultstringIndex + str.length(), result.indexOf("")); tipsDialog.setTip(false, faultstring); tipsDialog.show(); return; } int codeIndex = result.indexOf(""); if (codeIndex > -1) { - String resultCode = result.substring(codeIndex + 6, result.indexOf("")); + String resultCode = + result.substring(codeIndex + 6, result.indexOf("")); if (resultCode.equals("200")) { - String resultMsg = result.substring(result.indexOf("") + 8, result.indexOf("")); + String resultMsg = + result.substring(result.indexOf("") + 8, result.indexOf("")); jiexi(resultMsg); return; } - String resultMsg = result.substring(result.indexOf("") + 5, result.indexOf("")); + String resultMsg = + result.substring(result.indexOf("") + 5, result.indexOf("")); tipsDialog.setTip(false, resultMsg); tipsDialog.show(); } @@ -166,7 +218,6 @@ private MyMesInfoAdapter adapter; }); } - // 创建验证信息 private String buildSelectRequest(String epcid) { StringBuilder soapRequest = new StringBuilder(); @@ -256,4 +307,21 @@ private MyMesInfoAdapter adapter; e.printStackTrace(); } } + + private class MyKeyReceiver extends BroadcastReceiver { + + @Override + public void onReceive(Context context, Intent intent) { + var keydown = intent.getBooleanExtra("keydown", false); + if (!keydown) { + dataReadRFID(null); + } + } + } + + @Override + protected void onDestroy() { + super.onDestroy(); + unregisterReceiver(keyReceiver); + } } \ No newline at end of file diff --git a/app/src/main/java/com/example/writeepc/base/BaseActivity.java b/app/src/main/java/com/example/writeepc/base/BaseActivity.java index 7cf4fdb..58566cf 100644 --- a/app/src/main/java/com/example/writeepc/base/BaseActivity.java +++ b/app/src/main/java/com/example/writeepc/base/BaseActivity.java @@ -73,7 +73,7 @@ public class BaseActivity extends AppCompatActivity { music.start(); readTidReault(true, Tools.Bytes2HexString(rdata, 12), rdata); } else { - Toast.makeText(this, "读取失败", Toast.LENGTH_SHORT).show(); + // Toast.makeText(this, "读取失败", Toast.LENGTH_SHORT).show(); readTidReault(false, null, null); } diff --git a/app/src/main/res/drawable/button_bg1.xml b/app/src/main/res/drawable/button_bg1.xml new file mode 100644 index 0000000..3e48206 --- /dev/null +++ b/app/src/main/res/drawable/button_bg1.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/button_bg2.xml b/app/src/main/res/drawable/button_bg2.xml new file mode 100644 index 0000000..cbd4f83 --- /dev/null +++ b/app/src/main/res/drawable/button_bg2.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_shuangqian2.xml b/app/src/main/res/layout/activity_shuangqian2.xml index eab0efb..0c24502 100644 --- a/app/src/main/res/layout/activity_shuangqian2.xml +++ b/app/src/main/res/layout/activity_shuangqian2.xml @@ -75,11 +75,13 @@ app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />