From d87400af518ebc9274f4447f06476959c3aa5102 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 14 七月 2020 16:29:42 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into dev-2020xm
---
ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs b/ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs
old mode 100755
new mode 100644
index 002e5a4..2a5e850
--- a/ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs
@@ -7,7 +7,6 @@
using Shared.Common;
using ZigBee.Device;
-
namespace ZigBee.Common
{
public static class Application
@@ -393,7 +392,7 @@
{
busSocket.BeginSendTo(bytes, 0, bytes.Length, SocketFlags.None, iPEndPoint, new AsyncCallback(asyncEndSend), null);
}
-
+
}
catch (Exception ex)
{
@@ -415,7 +414,7 @@
{
int bytesSent = busSocket.EndSendTo(iar);
}
- catch(Exception ex)
+ catch(Exception ex)
{
//璋冭瘯鐢�
if (Shared.Phone.UserCenter.UserCenterResourse.HideOption.WriteSocketReceiveDataToFile == 1)
--
Gitblit v1.8.0