[代码完善](gitee-master): 不限制传输的Map数据类型，更新说明文档

eurigo · Aug 12, 2021 · 157f30e · 157f30e
1 parent 0eb1038
commit 157f30e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -37,7 +37,7 @@ dependencies {
 + #### 接收数据
 ```
 // 设置监听端口，不设置默认为9090
-UdpUtils.getInstance().setPort(9090);
+UdpUtils.getInstance().setUdpPort(9090);
 
 // 打开Socket
 UdpUtils.getInstance().startUDPSocket();
@@ -48,10 +48,10 @@ UdpUtils.getInstance().setReceiveListener(new OnUdpReceiveListener);
 + #### 发送数据
 ```
 // 设置数据接收方的端口
-UdpUtils.getInstance().setPort(9090);
+UdpUtils.getInstance().setUdpPort(9090);
 
 // 设置数据接收方的IP
-UdpUtils.getInstance().setHost(192.168.43.255);
+UdpUtils.getInstance().setUdpHost(192.168.43.255);
 
 // 不指定接收方IP，直接发送全局广播
 UdpUtils.getInstance().sendBroadcastMessage(String s)
@@ -69,4 +69,10 @@ UdpUtils.getInstance().sendMessage(Map map)
 ```
 // 获取广播地址
 UdpUtils.getInstance().getBroadcastHost(Context context)
+
+// 获取当前UDP发送地址
+UdpUtils.getInstance().getCurrentHost(Context context)
+
+// 获取当前UDP发送端口
+UdpUtils.getInstance().getCurrentPort(Context context)
 ```
diff --git a/udplibrary/src/main/java/com/eurigo/udplibrary/UdpUtils.java b/udplibrary/src/main/java/com/eurigo/udplibrary/UdpUtils.java
@@ -173,7 +173,7 @@ public void sendBroadcastMessage(Context context, String message) {
      *
      * @param map 数据Map
      */
-    public void sendBroadcastMessage(Context context, Map<String, String> map) {
+    public void sendBroadcastMessage(Context context, Map<String, Object> map) {
         getBroadcastHost(context);
         sendMessage(map);
     }
@@ -195,7 +195,7 @@ public void sendBroadcastMessageInAndroidHotspot(String message) {
      *
      * @param map 数据Map
      */
-    public void sendBroadcastMessageInAndroidHotspot(Map<String, String> map) {
+    public void sendBroadcastMessageInAndroidHotspot(Map<String, Object> map) {
         setUdpHost(DEFAULT_SOCKET_HOST);
         sendMessage(map);
     }
@@ -254,18 +254,19 @@ public void run() {
 
     /**
      * 发送json数据
+     *
      * @param map 数据Map
      */
-    public void sendMessage(Map<String, String> map){
+    public void sendMessage(Map<String, Object> map) {
         if (client == null) {
             startUdpSocket();
         }
         JsonObject object = new JsonObject();
         // 包装Json
-        for (String key : map.keySet()){
-            object.addProperty(key, map.get(key));
+        for (String key : map.keySet()) {
+            object.addProperty(key, String.valueOf(map.get(key)));
         }
-        Log.e(TAG, "发送的消息："+object.toString());
+        Log.e(TAG, "发送的消息：" + object.toString());
         executorService.execute(new Runnable() {
             @Override
             public void run() {