diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6111f56..cdef0a1 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -70,11 +70,11 @@ - - + + - - + + diff --git a/app/src/main/java/com/example/writeepc/HomeActivity.java b/app/src/main/java/com/example/writeepc/HomeActivity.java index c52a460..9cf7067 100644 --- a/app/src/main/java/com/example/writeepc/HomeActivity.java +++ b/app/src/main/java/com/example/writeepc/HomeActivity.java @@ -22,9 +22,17 @@ public class HomeActivity extends BaseActivity { MyApplication.getApplication().setUhfrManager(uhfrManager); RadioButton button1 = this.findViewById(R.id.home_1); RadioButton button2 = this.findViewById(R.id.home_2); + RadioButton button1_1 = this.findViewById(R.id.home_1_1); + Intent intent = new Intent(this, ShuangqianActivity.class); button1.setOnClickListener(v -> { - startActivity(new Intent(this, ShuangqianActivity.class)); + intent.putExtra("type",true); + startActivity(intent); }); + button1_1.setOnClickListener(v -> { + intent.putExtra("type",false); + startActivity(intent); + }); + button2.setOnClickListener(v -> { startActivity(new Intent(this, ShuangqianActivity2.class)); }); diff --git a/app/src/main/java/com/example/writeepc/ShuangqianActivity.java b/app/src/main/java/com/example/writeepc/ShuangqianActivity.java index 0e15355..bb58ef4 100644 --- a/app/src/main/java/com/example/writeepc/ShuangqianActivity.java +++ b/app/src/main/java/com/example/writeepc/ShuangqianActivity.java @@ -21,7 +21,7 @@ public class ShuangqianActivity extends BaseActivity implements MyScannerCall { private ActivityShuangqianBinding binding; private MyScannerReceiver myReceiver; - + private String uriLastStr; @Override protected void onCreate(Bundle savedInstanceState) { @@ -35,8 +35,10 @@ public class ShuangqianActivity extends BaseActivity implements MyScannerCall { IntentFilter intentFilter = new IntentFilter(); intentFilter.addAction("com.rfid.SCAN"); registerReceiver(myReceiver, intentFilter); - - + boolean type = getIntent().getBooleanExtra("type", true); + binding.setTitle(type ? "MES轮胎绑定" : "解绑"); + binding.setType(type); + uriLastStr = type ? "barcodeAndRFIDBinding" : "unBinding"; } // 读取 @@ -65,30 +67,38 @@ public class ShuangqianActivity extends BaseActivity implements MyScannerCall { // callWebService(buildSoapRequest(epc, code));//双钱 } - private void haohuaSubmit(String epc, String code) { - OkGo.post("http://192.168.26.26:5050/UMInterface/RFID/barcodeAndRFIDBinding") - .params("rfid", epc).params("barCode", code).execute(new MyRecultCall(dialog, this) { - @Override - public void onSuccess(Response response) { - super.onSuccess(response); - MyResult body = response.body(); - try { - if (body.getCode() == 200) { - tipsDialog.setTip(true, body.getInfo()); - tipsDialog.show(); - binding.socketBarcode.setText(null); - binding.socketEpc.setText(null); - } else { - tipsDialog.setTip(false, body.getInfo()); - tipsDialog.show(); - } - } catch (Exception e) { - tipsDialog.setTip(false, "接口返回信息异常"); - tipsDialog.show(); - } + // 解绑 + public void unBindingSubmit(View view) { + String epc = binding.socketEpc.getText().toString(); + String code = binding.socketBarcode.getText().toString(); - } - }); + haohuaSubmit(epc, code); + } + + private void haohuaSubmit(String epc, String code) { + OkGo.post("http://192.168.26.26:5050/UMInterface/RFID/" + uriLastStr) + .params("rfid", epc).params("barCode", code).execute(new MyRecultCall(dialog, this) { + @Override + public void onSuccess(Response response) { + super.onSuccess(response); + MyResult body = response.body(); + try { + if (body.getCode() == 200) { + tipsDialog.setTip(true, body.getInfo()); + tipsDialog.show(); + binding.socketBarcode.setText(null); + binding.socketEpc.setText(null); + } else { + tipsDialog.setTip(false, body.getInfo()); + tipsDialog.show(); + } + } catch (Exception e) { + tipsDialog.setTip(false, "接口返回信息异常"); + tipsDialog.show(); + } + + } + }); } diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml index fc1fc65..ea11f3d 100644 --- a/app/src/main/res/layout/activity_home.xml +++ b/app/src/main/res/layout/activity_home.xml @@ -55,9 +55,39 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="20dp" - android:visibility="gone" android:orientation="horizontal"> + + + + + + + + + + + + @@ -40,7 +48,7 @@ android:layout_gravity="center" android:text="扫描条码:" /> - +