From c1de48884fa145a16a0f8bcee93274dcfaa0ff82 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 07 五月 2020 10:40:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

---
 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs |   54 ++++++++++++++++++++++++++----------------------------
 1 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs
index fd741ba..17e06f4 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs
@@ -1,6 +1,5 @@
 锘縰sing System;
 using System.Collections.Generic;
-using Org.BouncyCastle.Bcpg.OpenPgp;
 using Shared.Common;
 using ZigBee.Common;
 using ZigBee.Device;
@@ -40,7 +39,7 @@
         private string bindPmName = string.Empty;
 
         #endregion
-
+
         #region 鈻� 鍒濆鍖朹____________________________
 
         /// <summary>
@@ -50,8 +49,8 @@
         public void ShowForm(CommonDevice i_device)
         {
             this.deviceObj = i_device;
-            //鑾峰彇鏁版嵁
-            ReadDoorLockUserInfo(deviceObj);
+            //鑾峰彇鏁版嵁
+            ReadDoorLockUserInfo(deviceObj);
 
             //璁剧疆澶撮儴淇℃伅
             base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uPanelSettion));
@@ -87,9 +86,9 @@
             this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uDeviceEditor), 1028);
 
             //鍒濆鍖栬彍鍗曡
-            this.InitMenuRow();
-
-            //鍒濆鍖栨甯冨畬鎴�
+            this.InitMenuRow();
+
+            //鍒濆鍖栨甯冨畬鎴�
             tableContr.FinishInitControl();
             tableContr = null;
 
@@ -101,14 +100,14 @@
             {
                 //鍏抽棴鑷韩
                 this.CloseForm();
-            };
+            };
         }
 
         /// <summary>
         /// 鍒濆鍖栬彍鍗曡
         /// </summary>
         private void InitMenuRow()
-        {
+        {
             this.listview.RemoveAll();
             //娣诲姞鏂伴鐩爣
             this.AddFreshAirRow();
@@ -123,7 +122,7 @@
         }
         #endregion
 
-        #region 鈻� 鍒濆鍖栨暟鎹甠________________________ 
+        #region 鈻� 鍒濆鍖栨暟鎹甠________________________
 
         /// <summary>
         /// 鍒濆鍖栨暟鎹�
@@ -164,8 +163,8 @@
             });
         }
         #endregion
-
-        #region 鈻� 鏂伴鐩爣_________________________ 
+
+        #region 鈻� 鏂伴鐩爣_________________________
         /// <summary>
         ///  鏂伴鐩爣琛�
         /// </summary>
@@ -178,15 +177,15 @@
             //搴曠嚎
             rowNewWind.AddBottomLine();
             //鍙崇澶�
-            rowNewWind.AddRightArrow();
+            rowNewWind.AddRightArrow();
 
-            var msg = Language.StringByID(R.MyInternationalizationString.nothing);
+            var msg = Language.StringByID(R.MyInternationalizationString.nothing);
             if (!string.IsNullOrEmpty(bindFreshAirName))
             {
                 msg = bindFreshAirName;
             }
             var btnNewWindStatu = rowNewWind.AddMostRightView(msg, 700);
-
+
             rowNewWind.ButtonClickEvent += (sender, e) =>
             {
                 var addDevicePage = new Shared.Phone.UserCenter.DeviceBind.PanelFangyueFreshAirTargetsForm(this.deviceObj, 1);
@@ -233,16 +232,15 @@
                     curControlDev.bindList.Add(bDev);
                     var device = Common.LocalDevice.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint);
 
-                    //鑾峰彇璁惧绫诲瀷鐨�
-                    var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
-                    //鏂伴闈㈡澘鐨勬柊椋庤澶囷紝鍒欎笉鏄剧ず
-                    if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_FangyueFreshAir)
-                    {
-                        continue;
-                    }
-
                     if (device.Type == DeviceType.FreshAir)
                     {
+                        //鑾峰彇璁惧绫诲瀷鐨�
+                        var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
+                        //鏂伴闈㈡澘鐨勬柊椋庤澶囷紝鍒欎笉鏄剧ず
+                        if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_FangyueFreshAir)
+                        {
+                            continue;
+                        }
                         bindFreshAirName = device.DeviceEpointName;
                     }
                     if (device.Type == DeviceType.TemperatureSensor)
@@ -263,7 +261,7 @@
             return result;
         }
 
-        #region 鈻� PM2.5鏉ユ簮_________________________ 
+        #region 鈻� PM2.5鏉ユ簮_________________________
         /// <summary>
         ///  PM2.5鏉ユ簮琛�
         /// </summary>
@@ -308,7 +306,7 @@
         }
         #endregion
 
-        #region 鈻� 娓╁害鏉ユ簮_________________________ 
+        #region 鈻� 娓╁害鏉ユ簮_________________________
         /// <summary>
         ///  娓╁害鏉ユ簮琛�
         /// </summary>
@@ -353,7 +351,7 @@
         }
         #endregion
 
-        #region 鈻� 婀垮害鏉ユ簮_________________________ 
+        #region 鈻� 婀垮害鏉ユ簮_________________________
         /// <summary>
         ///  婀垮害鏉ユ簮琛�
         /// </summary>
@@ -398,7 +396,7 @@
         }
         #endregion
 
-        #region 鈻� 浜害璋冭妭_________________________ 
+        #region 鈻� 浜害璋冭妭_________________________
         /// <summary>
         ///  浜害璋冭妭琛�
         /// </summary>
@@ -425,7 +423,7 @@
         }
         #endregion
 
-        #region 鈻� 鍙充笂瑙掕彍鍗昣________________________ 
+        #region 鈻� 鍙充笂瑙掕彍鍗昣________________________
         /// <summary>
         /// 鍒濆鍖栧彸涓婅鑿滃崟
         /// </summary>

--
Gitblit v1.8.0