From e9f90558271aa9ba88057e3148cb79cfeb79e22f Mon Sep 17 00:00:00 2001
From: Sheedon <sheedonsun@163.com>
Date: Wed, 6 Jan 2021 17:42:08 +0800
Subject: [PATCH] =?UTF-8?q?bug=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/yanhangtec/app/MainActivity.java    | 8 ++++----
 sensorlibrary/build.gradle                                | 4 ++--
 .../com/yanhangtec/sensorlibrary/client/RSClient.java     | 5 +++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/yanhangtec/app/MainActivity.java b/app/src/main/java/com/yanhangtec/app/MainActivity.java
index f5d42a3..6f5da22 100644
--- a/app/src/main/java/com/yanhangtec/app/MainActivity.java
+++ b/app/src/main/java/com/yanhangtec/app/MainActivity.java
@@ -13,7 +13,7 @@
 import com.yanhangtec.sensorlibrary.listener.InitializeListener;
 
 public class MainActivity extends AppCompatActivity
-        implements InitializeListener, OnDebugListener,OnCardReaderListener {
+        implements InitializeListener, OnDebugListener, OnCardReaderListener {
 
     private CardReaderCenter readerCenter;
 
@@ -22,7 +22,7 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        SensorFactory.init(SensorConstant.TYPE_RFID, this);
+        SensorFactory.init(SensorConstant.TYPE_RS485, SensorConstant.PORT, 9600, this);
 
         readerCenter = SensorFactory.getCardReaderCenter();
         readerCenter.bindDebug(this);
@@ -37,7 +37,7 @@ public void OnInitializeComplete() {
 
     @Override
     public int onSensorType() {
-        return SensorConstant.TYPE_RFID;
+        return SensorConstant.TYPE_RS485;
     }
 
     @Override
@@ -47,7 +47,7 @@ public String onPort() {
 
     @Override
     public int onBaudRate() {
-        return 115200;
+        return 9600;
     }
 
     @Override
diff --git a/sensorlibrary/build.gradle b/sensorlibrary/build.gradle
index e3053a9..2a0a719 100644
--- a/sensorlibrary/build.gradle
+++ b/sensorlibrary/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "1.0.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
diff --git a/sensorlibrary/src/main/java/com/yanhangtec/sensorlibrary/client/RSClient.java b/sensorlibrary/src/main/java/com/yanhangtec/sensorlibrary/client/RSClient.java
index 67e9213..22a2268 100644
--- a/sensorlibrary/src/main/java/com/yanhangtec/sensorlibrary/client/RSClient.java
+++ b/sensorlibrary/src/main/java/com/yanhangtec/sensorlibrary/client/RSClient.java
@@ -121,8 +121,9 @@ public void onDataNotAvailable(String message) {
 
     @Override
     public void onTimeBack(Long aLong) {
-        long nowTimer = System.currentTimeMillis();
-        if (nowTimer - lastTime >= 1500) {
+        long nowTime = System.currentTimeMillis();
+        if (nowTime - lastTime >= 1500) {
+            lastTime = nowTime;
             RSHelper.setAutoReadCard(voidCallback);
             noticeRFIDIsNormal(false);
         }