diff --git a/app/src/main/java/com/example/beijing_daxing/InActivity.java b/app/src/main/java/com/example/beijing_daxing/InActivity.java index fee8354..113add9 100644 --- a/app/src/main/java/com/example/beijing_daxing/InActivity.java +++ b/app/src/main/java/com/example/beijing_daxing/InActivity.java @@ -1,9 +1,14 @@ package com.example.beijing_daxing; +import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatActivity; import androidx.databinding.DataBindingUtil; +import androidx.databinding.ObservableBoolean; +import android.annotation.SuppressLint; import android.os.Bundle; +import android.os.Handler; +import android.os.Message; import android.util.Log; import android.view.View; import android.widget.Toast; @@ -32,7 +37,7 @@ public class InActivity extends BaseActivity implements AdapterClickCall { private InAdapter adapter; private List epcList; private ActivityInBinding binding; - + private ObservableBoolean checkState; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -46,6 +51,8 @@ public class InActivity extends BaseActivity implements AdapterClickCall { adapter.setAdapterClickCall(this); binding.setAdapter(adapter); setPower(33); + checkState=new ObservableBoolean(); + binding.setCheckState(checkState); } @Override @@ -56,7 +63,8 @@ public class InActivity extends BaseActivity implements AdapterClickCall { var epc = Tools.Bytes2HexString(t.EpcId,t.EpcId.length); if (!epcList.contains(epc)) { - if (epc.substring(0,8).equals("42574C44")){ + Log.e("TAG", "sanRfid:" + epc); + if (epc.substring(0,8).equals("53574C44")){ epcList.add(epc); } } @@ -105,4 +113,39 @@ public class InActivity extends BaseActivity implements AdapterClickCall { } }); } + + + @SuppressLint("HandlerLeak") + private Handler handler = new Handler() { + @Override + public void handleMessage(@NonNull Message msg) { + super.handleMessage(msg); + } + }; + private Runnable runnable = new Runnable() { + @Override + public void run() { + // Log.e("TAG", "发送广播,读取RFID"); + // sendBroadcast(broadcastIntent); + sanEpc(); + handler.postDelayed(runnable, 0); + } + }; + public void instore_check(View view) { + var b = checkState.get(); + if (b) { + handler.removeCallbacks(runnable); + } else { + handler.postDelayed(runnable, 100); + } + checkState.set(!b); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + handler.removeCallbacks(runnable); + handler = null; + runnable = null; + } } \ No newline at end of file diff --git a/app/src/main/java/com/example/beijing_daxing/OutActivity.java b/app/src/main/java/com/example/beijing_daxing/OutActivity.java index 25af8cc..4b5afb5 100644 --- a/app/src/main/java/com/example/beijing_daxing/OutActivity.java +++ b/app/src/main/java/com/example/beijing_daxing/OutActivity.java @@ -48,7 +48,7 @@ public class OutActivity extends BaseActivity implements AdapterClickCall { epcs.stream().forEach(t -> { var epc = Tools.Bytes2HexString(t.EpcId,t.EpcId.length); if (!epcList.contains(epc)) { - if (epc.substring(0,8).equals("42574C44")) { + if (epc.substring(0,8).equals("53574C44")) { epcList.add(epc); } } diff --git a/app/src/main/java/com/example/beijing_daxing/base/BaseActivity.java b/app/src/main/java/com/example/beijing_daxing/base/BaseActivity.java index ec974a1..2d6f0f7 100644 --- a/app/src/main/java/com/example/beijing_daxing/base/BaseActivity.java +++ b/app/src/main/java/com/example/beijing_daxing/base/BaseActivity.java @@ -96,9 +96,14 @@ public abstract class BaseActivity extends AppCompatActivity { } public void setPower(int power){ - Reader.READER_ERR readerErr = uhfLongerManager.setPower(power, power); - Log.e("TAG", "setPower:" + readerErr.name()); - Log.e("TAG", "readPower:" + uhfLongerManager.getPower()[0]); + try { + Reader.READER_ERR readerErr = uhfLongerManager.setPower(power, power); + Log.e("TAG", "setPower:" + readerErr.name()); + // Log.e("TAG", "readPower:" + uhfLongerManager.getPower()[0]); + }catch (Exception e){ + + } + } @Override diff --git a/app/src/main/res/layout/activity_in.xml b/app/src/main/res/layout/activity_in.xml index c116636..8f44a83 100644 --- a/app/src/main/res/layout/activity_in.xml +++ b/app/src/main/res/layout/activity_in.xml @@ -5,37 +5,44 @@ xmlns:tools="http://schemas.android.com/tools"> + + + + + + android:text="轮挡入库" /> + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:text="@={vm.binchCode}" /> + android:onItemSelected="@{vm.selectManus}" /> + android:onItemSelected="@{vm.selectLocation}" /> - -