diff --git a/README.md b/README.md index 37d5448..6205f72 100644 --- 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 index 72559be..806aa18 100644 --- 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 map) { + public void sendBroadcastMessage(Context context, Map map) { getBroadcastHost(context); sendMessage(map); } @@ -195,7 +195,7 @@ public void sendBroadcastMessageInAndroidHotspot(String message) { * * @param map 数据Map */ - public void sendBroadcastMessageInAndroidHotspot(Map map) { + public void sendBroadcastMessageInAndroidHotspot(Map map) { setUdpHost(DEFAULT_SOCKET_HOST); sendMessage(map); } @@ -254,18 +254,19 @@ public void run() { /** * 发送json数据 + * * @param map 数据Map */ - public void sendMessage(Map map){ + public void sendMessage(Map 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() {