From 98ceb6bd2021f9ff136cda27eef28676dd7b5d92 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 21 五月 2020 13:24:02 +0800
Subject: [PATCH] 最后的版本

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

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs
index 2a1b88a..672bc3f 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs
@@ -2152,35 +2152,35 @@
         #region 鈻� 涓婁紶璁惧澶囦唤鍒扮綉鍏砡________________
 
         /// <summary>
-        /// 涓婁紶璁惧澶囦唤鍒扮綉鍏�(鏈�濂戒笉瑕佸幓鐞嗗畠鐨勮繑鍥炵粨鏋�)
+        /// 涓婁紶璁惧澶囦唤鍒扮綉鍏�(搴熷純)
         /// </summary>
         /// <param name="device">璁惧瀵硅薄</param>
         /// <param name="backupEnum">澶囦唤绫诲瀷</param>
         /// <param name="upLaodData">澶囦唤鐨勬暟鎹�</param>
         /// <returns></returns>
-        public async Task<bool> UpLoadDeviceBackupDataToGateway(CommonDevice device, GatewayBackupEnum backupEnum, object upLaodData)
+        public async Task<bool> UpLoadDeviceBackupDataToGateway(CommonDevice device, object upLaodData)
         {
-            ZbGateway realWay = null;
-            if (HdlGatewayLogic.Current.GetRealGateway(ref realWay, device.CurrentGateWayId) == false)
-            {
-                //娌℃湁鎵惧埌鐪熷疄鐗╃悊缃戝叧
-                return false;
-            }
-            string fileName = device.FilePath + ((int)backupEnum).ToString().PadLeft(5, '0');
-            //鍒涘缓鏂囦欢瀵硅薄
-            var result = await realWay.CreateFileAsync(fileName);
-            if (result == null || result.Result != 0)
-            {
-                return false;
-            }
-            //鍙戦�佹暟鎹祦
-            var data = Newtonsoft.Json.JsonConvert.SerializeObject(upLaodData);
-            var byteData = System.Text.Encoding.UTF8.GetBytes(data);
-            var result2 = await realWay.SendFileAsync(byteData);
-            if (result2 == null || result2.Result != 0)
-            {
-                return false;
-            }
+            //ZbGateway realWay = null;
+            //if (HdlGatewayLogic.Current.GetRealGateway(ref realWay, device.CurrentGateWayId) == false)
+            //{
+            //    //娌℃湁鎵惧埌鐪熷疄鐗╃悊缃戝叧
+            //    return false;
+            //}
+            //string fileName = device.FilePath + ((int)backupEnum).ToString().PadLeft(5, '0');
+            ////鍒涘缓鏂囦欢瀵硅薄
+            //var result = await realWay.CreateFileAsync(fileName);
+            //if (result == null || result.Result != 0)
+            //{
+            //    return false;
+            //}
+            ////鍙戦�佹暟鎹祦
+            //var data = Newtonsoft.Json.JsonConvert.SerializeObject(upLaodData);
+            //var byteData = System.Text.Encoding.UTF8.GetBytes(data);
+            //var result2 = await realWay.SendFileAsync(byteData);
+            //if (result2 == null || result2.Result != 0)
+            //{
+            //    return false;
+            //}
             return true;
         }
 
@@ -2228,13 +2228,13 @@
                     waitCount++;
                     if (this.nowGwConnectMode == GatewayConnectMode.Remote)
                     {
-                        //杩滅▼姣�10绉掓娴嬩竴娆�
-                        if (waitCount < 10) { continue; }
+                        //杩滅▼姣�20绉掓娴嬩竴娆�
+                        if (waitCount < 20) { continue; }
                     }
                     else if (this.nowGwConnectMode == GatewayConnectMode.WIFI)
                     {
-                        //灞�鍩熺綉姣�3绉掓娴嬩竴娆�
-                        if (waitCount < 3) { continue; }
+                        //灞�鍩熺綉姣�5绉掓娴嬩竴娆�
+                        if (waitCount < 5) { continue; }
                     }
                     waitCount = 0;
 

--
Gitblit v1.8.0