From 45e4e387f3ef259b9e225fdd543e20be285a5112 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期二, 29 十月 2019 13:42:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc

---
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs
index fd35796..999f1d2 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs
@@ -625,7 +625,7 @@
             }
 
             //鑾峰彇鍏ㄩ儴璁惧
-            bool result = await LocalDevice.Current.SetDeviceToMemmoryByGateway(realWay);
+            bool result = LocalDevice.Current.SetDeviceToMemmoryByGateway(realWay);
             //鍏抽棴杩涘害鏉�
             ProgressBar.Close();
             if (result == false)
@@ -1042,7 +1042,7 @@
             }
             else
             {
-                //鑾峰彇鏈湴鐨勫睘鎬� 
+                //鑾峰彇鏈湴鐨勫睘鎬�
                 objValue = localWay.getGwInfo.GetType().InvokeMember(attributeName, System.Reflection.BindingFlags.GetField, null, localWay.getGwInfo, null);
             }
 
@@ -1080,7 +1080,7 @@
             }
             else
             {
-                //鑾峰彇鏈湴灞炴�� 
+                //鑾峰彇鏈湴灞炴��
                 objValue = localWay.getGatewayBaseInfo.GetType().InvokeMember(attributeName, System.Reflection.BindingFlags.GetField, null, localWay.getGatewayBaseInfo, null);
             }
 

--
Gitblit v1.8.0