From dc8ae12444d1d887394eb525e2b80dd120dc4c87 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 20 二月 2024 13:43:56 +0800
Subject: [PATCH] Merge branch 'wjc' into dev-hxb
---
HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/common/event/EventDispatcher.java | 41 ++++++++++++++++++-----------------------
1 files changed, 18 insertions(+), 23 deletions(-)
diff --git a/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/common/event/EventDispatcher.java b/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/common/event/EventDispatcher.java
index 256bcb7..37f8b50 100644
--- a/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/common/event/EventDispatcher.java
+++ b/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/common/event/EventDispatcher.java
@@ -24,7 +24,7 @@
private static final LockList<EventListener> ALL_TOPICS_EVENT = new LockList<EventListener>();//鎵�鏈変富棰樻秷鎭�
- // private static final ArrayMap<String, List<EventListener>> EVENT = new ArrayMap<>();
+// private static final ArrayMap<String, List<EventListener>> EVENT = new ArrayMap<>();
private static final LockArrayMap<String, List<EventListener>> EVENT = new LockArrayMap<String, List<EventListener>>();
private static final ExecutorService ioThread = ThreadToolUtils.getInstance().newFixedThreadPool(2);
@@ -99,7 +99,7 @@
if (ev != null && !ev.isEmpty()) {
// TYPE.remove(listener);
ev.remove(listener);
- LogUtils.i(String.format("绉婚櫎璁㈤槄涓婚:%s,褰撳墠鍥炶皟鏁伴噺:%s", tag, ev.size()));
+ LogUtils.i(String.format("绉婚櫎璁㈤槄涓婚:%s,褰撳墠鍥炶皟鏁伴噺:%s",tag,ev.size()));
}
}
} catch (Exception e) {
@@ -112,12 +112,11 @@
/**
* 涓や釜涓婚鏄惁鍖归厤
- *
- * @param desString 瀛楀吀涓殑涓婚
+ * @param desString 瀛楀吀涓殑涓婚
* @param sourceString 鎺ユ敹鍒扮殑涓婚
* @return
*/
- boolean isMatch(String desString, String sourceString) {
+ boolean isMatch(String desString,String sourceString) {
String[] des = desString.split("/");
String[] source = sourceString.split("/");
if (des.length != source.length) {
@@ -136,11 +135,10 @@
/**
* 浜嬩欢鍒嗗彂鍣紝鍒嗗彂鎵�鏈夊湪鎺ュ彛鍒楄〃涓殑浜嬩欢
- *
- * @param topicTag -
- * @param o -
+ * @param topicTag
+ * @param o
*/
- public synchronized void post(String topicTag, final Object o) {
+ public synchronized void post(String topicTag, @NonNull Object o) {
try {
for (String key : EVENT.keySet()) {
if (!isMatch(key, topicTag)) {
@@ -170,16 +168,16 @@
}
//寮�鍙戝垎鍙戜簨浠�
for (EventListener listener : ALL_TOPICS_EVENT) {
-// ThreadToolUtils.getInstance().runOnUiThread(new Runnable() {
-// @Override
-// public void run() {
- if (listener != null) {
- listener.onMessage(o);
- }
-// }
-// });
+ ThreadToolUtils.getInstance().runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ if (listener != null) {
+ listener.onMessage(o);
+ }
+ }
+ });
}
- } catch (Exception e) {
+ }catch (Exception e){
LogUtils.e(e.getMessage());
}
@@ -191,10 +189,8 @@
public synchronized void filePost() {
//TODO
}
-
/**
* 娉ㄥ唽鎵�鏈変富棰樻秷鎭殑鐩戝惉
- *
* @param listener
*/
public synchronized void registerAllTopicsListener(EventListener listener) {
@@ -210,7 +206,6 @@
/**
* 鍙栨秷鎵�鏈変富棰樻秷鎭殑鐩戝惉
- *
* @param listener
*/
public synchronized void removeAllTopicsListener(EventListener listener) {
@@ -229,13 +224,13 @@
});
}
- private synchronized void clear() {
+ public synchronized void clear() {
ALL_TOPICS_EVENT.clear();
EVENT.clear();
// TYPE.clear();
}
- private synchronized void release() {
+ public synchronized void release() {
clear();
ioThread.shutdownNow();
}
--
Gitblit v1.8.0