diff --git a/app/release/app-release.apk b/app/release/app-release.apk index 3088027..9130642 100644 Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ diff --git a/app/src/main/java/com/example/writeepc/ShuangqianActivity.java b/app/src/main/java/com/example/writeepc/ShuangqianActivity.java index f1fe357..c4d7345 100644 --- a/app/src/main/java/com/example/writeepc/ShuangqianActivity.java +++ b/app/src/main/java/com/example/writeepc/ShuangqianActivity.java @@ -1,8 +1,8 @@ package com.example.writeepc; +import android.content.Intent; import android.content.IntentFilter; import android.os.Bundle; -import android.util.Log; import android.view.View; import androidx.databinding.DataBindingUtil; @@ -31,6 +31,13 @@ public class ShuangqianActivity extends BaseActivity implements MyScannerCall { super.onCreate(savedInstanceState); binding = DataBindingUtil.setContentView(this, R.layout.activity_shuangqian); + + String ACTION_SCAN_INIT = "com.rfid.SCAN_INIT"; + Intent intent = new Intent(); + intent.setAction(ACTION_SCAN_INIT); + sendBroadcast(intent); + + initUHFRManager1(); initDialog(); int powerBinding = Integer.parseInt(SharedPreferencesUtils.getstring("powerBinding", "22")); diff --git a/app/src/main/java/com/example/writeepc/ShuangqianActivity2.java b/app/src/main/java/com/example/writeepc/ShuangqianActivity2.java index 64d13df..e15fc96 100644 --- a/app/src/main/java/com/example/writeepc/ShuangqianActivity2.java +++ b/app/src/main/java/com/example/writeepc/ShuangqianActivity2.java @@ -7,6 +7,8 @@ import android.content.Intent; import android.content.IntentFilter; import android.os.Bundle; import android.os.Handler; +import android.text.Editable; +import android.text.TextWatcher; import android.util.Log; import android.view.View; import android.widget.Button; @@ -79,6 +81,26 @@ public class ShuangqianActivity2 extends BaseActivity { Intent toKillService = new Intent(); toKillService.setAction(ACTION_CLOSE_SCAN); sendBroadcast(toKillService); + + binding.dataEpc.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence s, int start, int count, int after) { + + } + + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) { + + } + + @Override + public void afterTextChanged(Editable s) { + if (s.length()==24){ + haohuaMesSelect(s.toString()); + } + + } + }); } @@ -110,7 +132,7 @@ public class ShuangqianActivity2 extends BaseActivity { if (readState) { dataReadRFID(null); // callWebService(buildSelectRequest(result)); - haohuaMesSelect(result); + // haohuaMesSelect(result); } diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml index 52c0abe..ce53892 100644 --- a/app/src/main/res/layout/activity_home.xml +++ b/app/src/main/res/layout/activity_home.xml @@ -66,7 +66,6 @@ android:drawableTop="@mipmap/ic_un" android:drawablePadding="10dp" android:gravity="center" - android:visibility="gone" android:text="解绑" android:textSize="20sp" /> diff --git a/app/src/main/res/layout/activity_shuangqian.xml b/app/src/main/res/layout/activity_shuangqian.xml index b70ada0..0109619 100644 --- a/app/src/main/res/layout/activity_shuangqian.xml +++ b/app/src/main/res/layout/activity_shuangqian.xml @@ -58,27 +58,27 @@ - + + + + + - + + + + + + - - + + + + + + + + - + android:orientation="horizontal" + android:visibility="gone"> + android:textAlignment="center" /> - + +