简化封装

app/src/main/java/com/yanhangtec/app/MainActivity.java

@@ -15,7 +15,7 @@
 public class MainActivity extends AppCompatActivity
         implements InitializeListener, OnDebugListener,OnCardReaderListener {
 
-    CardReaderCenter<OnCardReaderListener> readerCenter;
+    private CardReaderCenter readerCenter;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {

sensorlibrary/src/main/java/com/yanhangtec/sensorlibrary/SensorFactory.java

@@ -4,7 +4,6 @@
 
 import com.yanhangtec.sensorlibrary.client.CardReaderClient;
 import com.yanhangtec.sensorlibrary.client.center.CardReaderCenter;
-import com.yanhangtec.sensorlibrary.client.listener.OnCardReaderListener;
 import com.yanhangtec.sensorlibrary.listener.InitializeListener;
 
 /**
@@ -103,7 +102,7 @@ public static int getBaudRate() {
      *
      * @return RFID中心的规范接口
      */
-    public static CardReaderCenter<OnCardReaderListener> getCardReaderCenter() {
+    public static CardReaderCenter getCardReaderCenter() {
         return CardReaderClient.getInstance();
     }
 

sensorlibrary/src/main/java/com/yanhangtec/sensorlibrary/client/CardReaderClient.java

@@ -14,8 +14,7 @@
  * @Email: sheedonsun@163.com
  * @Date: 12/14/20 3:00 PM
  */
-public class CardReaderClient extends BaseClient<OnCardReaderListener>
-        implements CardReaderCenter<OnCardReaderListener> {
+public class CardReaderClient implements CardReaderCenter {
 
     private static volatile CardReaderClient instance;
 

sensorlibrary/src/main/java/com/yanhangtec/sensorlibrary/client/RFIDClient.java

@@ -8,6 +8,8 @@
 import com.yanhangtec.sensorlibrary.model.RFIDModel;
 import com.yanhangtec.sensorlibrary.utils.TimerUtils;
 
+import java.util.LinkedHashSet;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
@@ -17,14 +19,15 @@
  * @Email: sheedonsun@163.com
  * @Date: 2020/4/15 14:25
  */
-class RFIDClient extends BaseClient<OnCardReaderListener>
-        implements DataSource.Callback<RFIDModel>, TimerUtils.OnTimeListener,
-        CardReaderCenter<OnCardReaderListener> {
+class RFIDClient implements DataSource.Callback<RFIDModel>, TimerUtils.OnTimeListener,
+        CardReaderCenter {
 
     private TimerUtils rfidTimer;
 
     private long lastTime = System.currentTimeMillis();
 
+    protected Set<OnCardReaderListener> listeners = new LinkedHashSet<>();
+
     private OnDebugListener debugListener;
 
     // 上一次RFID编号
@@ -52,6 +55,20 @@ public void initConfig() {
         lastRfidNum = "";
     }
 
+    /**
+     * 新增监听器
+     */
+    public synchronized void addListener(OnCardReaderListener listener) {
+        listeners.add(listener);
+    }
+
+    /**
+     * 移除监听器
+     */
+    public synchronized void removeListener(OnCardReaderListener listener) {
+        listeners.remove(listener);
+    }
+
     @Override
     public String getCurrentCard() {
         return lastRfidNum;

sensorlibrary/src/main/java/com/yanhangtec/sensorlibrary/client/RSClient.java

@@ -10,6 +10,8 @@
 import com.yanhangtec.sensorlibrary.model.RSModel;
 import com.yanhangtec.sensorlibrary.utils.TimerUtils;
 
+import java.util.LinkedHashSet;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
@@ -19,13 +21,14 @@
  * @Email: sheedonsun@163.com
  * @Date: 12/14/20 2:03 PM
  */
-class RSClient extends BaseClient<OnCardReaderListener>
-        implements DataSource.Callback<RSModel>,
+class RSClient implements DataSource.Callback<RSModel>,
         TimerUtils.OnTimeListener,
-        CardReaderCenter<OnCardReaderListener> {
+        CardReaderCenter {
 
     private static volatile RSClient instance;
 
+    protected Set<OnCardReaderListener> listeners = new LinkedHashSet<>();
+
     private OnDebugListener debugListener;
 
     private TimerUtils rsTimer;
@@ -57,6 +60,20 @@ public void initConfig() {
         lastRsNum = "";
     }
 
+    /**
+     * 新增监听器
+     */
+    public synchronized void addListener(OnCardReaderListener listener) {
+        listeners.add(listener);
+    }
+
+    /**
+     * 移除监听器
+     */
+    public synchronized void removeListener(OnCardReaderListener listener) {
+        listeners.remove(listener);
+    }
+
     private void startTimer() {
         createTimer();
 

sensorlibrary/src/main/java/com/yanhangtec/sensorlibrary/client/center/CardReaderCenter.java

@@ -1,7 +1,7 @@
 package com.yanhangtec.sensorlibrary.client.center;
 
+import com.yanhangtec.sensorlibrary.client.listener.OnCardReaderListener;
 import com.yanhangtec.sensorlibrary.client.listener.OnDebugListener;
-import com.yanhangtec.sensorlibrary.client.listener.OnHandleListener;
 
 /**
  * 读卡中心
@@ -10,7 +10,14 @@
  * @Email: sheedonsun@163.com
  * @Date: 12/14/20 2:22 PM
  */
-public interface CardReaderCenter<Listener extends OnHandleListener> extends BridgeCenter<Listener> {
+public interface CardReaderCenter {
+
+    // 初始化配置
+    void initConfig();
+
+    void addListener(OnCardReaderListener listener);
+
+    void removeListener(OnCardReaderListener listener);
 
     // 获取当前卡片编号
     String getCurrentCard();

sensorlibrary/src/main/java/com/yanhangtec/sensorlibrary/client/listener/OnCardReaderListener.java

@@ -7,7 +7,7 @@
  * @Email: sheedonsun@163.com
  * @Date: 12/14/20 2:19 PM
  */
-public interface OnCardReaderListener extends OnHandleListener {
+public interface OnCardReaderListener {
     void onCardInfo(String lblNum, boolean isContinuousSend);
 
     void onCardIsNormal(boolean isNormal);