From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码

---
 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs |  741 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 679 insertions(+), 62 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
old mode 100755
new mode 100644
index fda6ee2..20b9eea
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
@@ -2,6 +2,8 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Shared.Common;
+using Shared.Phone.UserCenter.Device.Bind;
+using Shared.Phone.UserCenter.DeviceBind;
 using ZigBee.Device;
 
 namespace Shared.Phone.UserCenter.Device
@@ -33,8 +35,34 @@
         /// 涓ぎ绌鸿皟鐨勭増鏈帶浠�
         /// </summary>
         private NormalViewControl btnAirConditionerVersion = null;
-
-        #endregion
+        /// <summary>
+        /// 绠�绾﹀鍔熻兘闈㈡澘缁戝畾鐨勬俯搴︾洰鏍囧悕瀛�
+        /// </summary>
+        private string bindTemperatureName = string.Empty;
+        /// <summary>
+        /// 绠�绾﹀鍔熻兘闈㈡澘缁戝畾鐨勬箍搴︾洰鏍囧悕瀛�
+        /// </summary>
+        private string bindHumidityName = string.Empty;
+        /// <summary>
+        /// 绠�绾﹀鍔熻兘闈㈡澘缁戝畾琚粦鐩爣鏄俯搴�
+        /// </summary>
+        private CommonDevice bindTemperatureDev;
+        /// <summary>
+        /// 绠�绾﹀鍔熻兘闈㈡澘缁戝畾琚粦鐩爣鏄箍搴�
+        /// </summary>
+        private CommonDevice bindHumidityDev;
+        /// <summary>
+        ///  绠�绾﹂潰鏉垮綋鍓峂ac
+        /// </summary>
+        private string deviceMacTemp = string.Empty;
+        // <summary>
+        /// 绠�绾﹀鍔熻兘闈㈡澘涓缁戝畾鐨勬俯婀垮害鐩爣鍒楄〃
+        /// </summary>
+        private List<BindObj.BindListResponseObj> bindList = new List<BindObj.BindListResponseObj>();
+        /// <summary>
+        /// 绠�绾﹀鍔熻兘闈㈡澘鐨勬帴杩戞劅搴旀暟鎹� 
+        private Panel.PanelProximitySensorInfo proximitySensorsInfo = new Panel.PanelProximitySensorInfo();
+         #endregion
 
         #region 鈻� 鍒濆鍖朹____________________________
 
@@ -50,8 +78,8 @@
                 //閽堝鍗曠函鍙湁涓�涓�200绔偣鐨勮澶�
                 listNewDevice.Add(Common.LocalDevice.Current.GetOTADevice(deviceMac));
             }
-
             this.listDeviceType.Clear();
+            deviceMacTemp = deviceMac;
             foreach (var device in listNewDevice)
             {
                 //鏀堕泦璁惧绫诲瀷
@@ -71,6 +99,20 @@
 
             //閲嶆柊鑾峰彇纭欢淇℃伅
             this.RefreshHardFirmwareInfo();
+
+            //绠�绾﹀鍔熻兘闈㈡澘鑾峰彇缁戝畾鐩爣鐨勬樉绀�
+            if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
+            {
+                //绠�绾﹂潰鏉块殢渚夸竴涓洖璺潵鑾峰彇璁惧淇℃伅
+                var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62);
+                if (dev != null)
+                {
+                    var key = new ZigBee.Device.Panel();
+                    key.DeviceAddr = deviceMac;
+                    key.CurrentGateWayId = dev.CurrentGateWayId;
+                    InitBindInfo(key); 
+                }
+            }
         }
 
         /// <summary>
@@ -100,6 +142,7 @@
             string caption = Language.StringByID(R.MyInternationalizationString.uDeviceNote);
             string deviceName = Common.LocalDevice.Current.GetDeviceMacName(listNewDevice[0]);
             var btnNote = new FrameCaptionInputControl(caption, deviceName, listview.rowSpace / 2);
+            btnNote.txtInput.MaxByte = 48;//闄愬埗鍙兘杈撳叆48涓瓧鑺�
             listview.AddChidren(btnNote);
             btnNote.InitControl();
             //鍒掔嚎
@@ -113,6 +156,11 @@
                 }
                 if (oldName != btnNote.Text)
                 {
+                    //鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈�
+                    if (Common.Config.Instance.Home.IsShowTemplate == true)
+                    {
+                        return;
+                    }
                     //淇敼鍚嶅瓧
                     this.DeviceReName(btnNote.Text, false);
                 }
@@ -134,6 +182,11 @@
             rowBeloneArea.InitControl(Language.StringByID(R.MyInternationalizationString.uInstallationLocation), this.listNewDevice);
             //搴曠嚎
             rowBeloneArea.AddBottomLine();
+            //鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈�
+            if (Common.Config.Instance.Home.IsShowTemplate == true)
+            {
+                rowBeloneArea.CanClick = false;
+            }
 
             var listCheck = new List<string>();
             rowBeloneArea.SelectRoomEvent += (roomKeys) =>
@@ -174,7 +227,7 @@
                     }
                 }
                 //淇濆瓨璁惧鎴块棿绱㈠紩
-                Common.LocalDevice.Current.SaveRealDeviceRoomId(this.listNewDevice, roomKeys);
+                HdlRoomLogic.Current.SaveRealDeviceRoomId(this.listNewDevice, roomKeys);
             };
 
             //娣诲姞鍏ㄩ儴鑿滃崟
@@ -206,8 +259,8 @@
                     this.CloseForm();
                 }
             };
-            //濡傛灉褰撳墠浣忓畢鏄櫄鎷熶綇瀹呯殑璇�,璁╂墍鏈夎彍鍗曢兘涓嶈兘鐐瑰嚮
-            if (Common.Config.Instance.Home.IsVirtually == true)
+            //鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈�
+            if (Common.Config.Instance.Home.IsShowTemplate == true)
             {
                 for (int i = 0; i < listview.ChildrenCount; i++)
                 {
@@ -247,6 +300,21 @@
             {
                 //娣诲姞銆愬鍐呮満璁剧疆銆戣(绌鸿皟涓撶敤)
                 this.AddIndoorUnitSettionRow();
+            }
+            else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
+            {
+                //绠�绾﹀鍔熻兘闈㈡澘                 
+                this.AddIBindRow(deviceMacTemp);
+                this.AddProximitySensorsRow(deviceMacTemp);
+                this.AddFunctionSettionRow(); 
+                this.AddHumiditySourceRow(deviceMacTemp);
+                this.AddTemperatureSensorRow(deviceMacTemp);
+                this.DataCorrectionRow(deviceMacTemp);
+            }
+            else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleEnvironment)
+            {
+                //娣诲姞銆愮粦瀹氱洰鏍囥�戣(绠�绾︾幆澧冮潰鏉跨敤) 
+                this.AddSimplePanelSettionRow();
             }
             else
             {
@@ -394,7 +462,13 @@
                 //搴曠嚎
                 btnRow.AddBottomLine();
 
-                var doorLock = (ZigBee.Device.DoorLock)listNewDevice[0];
+                var doorLock = (ZigBee.Device.DoorLock)listNewDevice[0];
+                ///鍊间负绌哄啀鍘昏鍙栨湰鍦�
+                if (string.IsNullOrEmpty(doorLock.RemoteUnlockPassword))
+                {
+                    ///璇诲彇鏈湴杩滅▼寮�閿佸瘑鐮侊紝鐪嬬湅涔嬪墠鏄惁閰嶇疆杩�
+                    doorLock.RemoteUnlockPassword = ReadLocalPassword();
+                }
                 if (string.IsNullOrEmpty(doorLock.RemoteUnlockPassword) == false)
                 {
                     btnswitch.IsSelected = true;
@@ -450,7 +524,24 @@
                  };
             }
         }
-
+        /// <summary>
+        /// 淇濆瓨杩滅▼闂ㄩ攣瀵嗙爜
+        /// </summary>
+        /// <param name="password">瀵嗙爜</param>
+        public void SaveLocalPassword(string password) {
+            var bytes = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(password));
+            IO.FileUtils.WriteFileByBytes(Config.Instance.HomeId + "_" + Config.Instance.Guid, bytes);
+        }
+        /// <summary>
+        /// 璇诲彇杩滅▼闂ㄩ攣瀵嗙爜
+        /// </summary>
+        /// <returns></returns>
+        public string ReadLocalPassword()
+        {
+            var str = System.Text.Encoding.UTF8.GetString(IO.FileUtils.ReadFile(Config.Instance.HomeId + "_" + Config.Instance.Guid));
+            //Newtonsoft.Json.JsonConvert.DeserializeObject<瀵瑰儚>(str);
+            return str;
+        }
         #endregion
 
         #region 鈻� 闂ㄩ攣鏃堕棿(闂ㄩ攣)_____________________
@@ -531,6 +622,32 @@
             };
         }
 
+        #region 鈻� 绠�绾︾幆澧�(闈㈡澘)_____________________
+
+        /// <summary>
+        /// 娣诲姞銆愭寜閿缃�戣绠�绾︾幆澧�(闈㈡澘)
+        /// </summary>
+        private void AddSimplePanelSettionRow()
+        {
+            //鎸夐敭璁剧疆
+            string caption = Language.StringByID(R.MyInternationalizationString.uPanelSettion);
+            var btnFunction = new FrameRowControl(listview.rowSpace / 2);
+            listview.AddChidren(btnFunction);
+            btnFunction.AddLeftCaption(caption, 600);
+            //鍚戝彸鍥炬爣
+            btnFunction.AddRightArrow();
+            //搴曠嚎
+            btnFunction.AddBottomLine();
+            btnFunction.ButtonClickEvent += (sender, e) =>
+            {
+                //绠�绾︾幆澧冮潰鏉跨殑鎸夐敭閰嶇疆
+                var form = new DevicePanel.PanelSettionWithSourceForm();
+                form.AddForm(listNewDevice[0]);
+            };
+        }
+
+        #endregion
+
         #endregion
 
         #region 鈻� 鎸夐敭璁剧疆(鏂规偊)_____________________
@@ -565,16 +682,15 @@
                         var form = new DevicePanel.PanelFangyueButtonSettionForm();
                         form.AddForm(listNewDevice[0]);
                     }
-                    else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment)
+                    else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir)
                     {
-                        //鏂规偊鐜闈㈡澘鐨勬寜閿厤缃�
-                        var form = new DevicePanel.PanelFangyueEnvironmentButtonSettionForm();
+                        //鏂规偊鐜闈㈡澘鐨勬寜閿厤缃�&鏂规偊鏂伴闈㈡澘鐨勬寜閿厤缃�
+                        var form = new DevicePanel.PanelSettionWithSourceForm();
                         form.AddForm(listNewDevice[0]);
                     }
                     else
                     {
-                        //鏂规偊鏂伴闈㈡澘鐨勬寜閿厤缃�
-                        var form = new DevicePanel.PanelFangyueFreshAirButtonSettionForm();
+                        var form = new DevicePanel.PanelFangyueButtonSettionForm();
                         form.AddForm(listNewDevice[0]);
                     }
                 };
@@ -691,8 +807,30 @@
             //鍙湁鍥炶矾鏁板ぇ浜�1鎵嶈兘鏈夎繖涓彍鍗�
             if (Common.LocalDevice.Current.GetDevicesCountByMac(listNewDevice[0].DeviceAddr) == 1)
             {
-                //鏂伴灏忔ā鍧楀彧鏈変竴涓洖璺紝浣嗚姹傛柊椋庡皬妯″潡鐨勬柊椋庢湁鍔熻兘璁剧疆
-                if (deviceEnumInfo.ConcreteType != DeviceConcreteType.Relay_FangyueFreshAirModul)
+                //绌烘皵璐ㄩ噺浼犳劅鍣ㄥ拰鏂伴灏忔ā鍧楀彧鏈変竴涓洖璺紝浣嗚姹傛柊椋庡皬妯″潡鐨勬柊椋庢湁鍔熻兘璁剧疆
+                //鏅捐。鏋堕粯璁ゅ彧瀛樺偍绗竴鍥炶矾锛屽叾浠栧洖璺杩囨护浜�
+                bool isSpecial = false;
+                if (deviceEnumInfo.ConcreteType == DeviceConcreteType.Relay_FangyueFreshAirModul ||
+                    deviceEnumInfo.ConcreteType == DeviceConcreteType.AirQualitySensor)
+                {
+                    isSpecial = true;
+                }
+                if (deviceEnumInfo.ConcreteType == DeviceConcreteType.Airer)
+                {
+                    isSpecial = true;
+                    var dev = listNewDevice[0];
+                    //鏅捐。鏋堕粯璁ゅ彧瀛樺偍绗竴鍥炶矾锛屽叾浠栧洖璺湪鍔熻兘鐣岄潰闇�瑕佽鍙栨椂闂达紝鎵�浠ユ彁鍓嶄竴涓晫闈㈣幏鍙�
+                    //绗竴鐗堟椂闂村姛鑳界敱浜庤澶囦笉鏀寔锛屾殏鏃跺幓鎺夛紝鍚庢湡鎵嶅姞涓�
+                    //for (int i = 3; i < 6; i++)
+                    //{
+                    //  //娉ㄦ剰锛岃。鏋朵腑鐨勭姸鎬佺敱涓嶅悓绔偣鑾峰彇
+                    //  //鍥炶矾3:璇诲彇椋庡共寮�鍏崇姸鎬佸拰鏃堕棿鍊� 
+                    //  //鍥炶矾4:璇诲彇鐑樺共寮�鍏崇姸鎬佸拰鏃堕棿鍊�
+                    //  //鍥炶矾5:璇诲彇娑堟瘨寮�鍏崇姸鎬佸拰鏃堕棿鍊�
+                    //  HdlDeviceAttributeLogic.Current.SendAirerComand(dev, i);
+                    //}
+                }
+                if (!isSpecial)
                 {
                     return;
                 }
@@ -736,7 +874,21 @@
                     || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEight)
                 {
                     var form = new DevicePanel.PanelFangyueFunctionSettionForm();
-                    form.AddForm(listNewDevice[0]);
+                    form.AddForm(listNewDevice[0], deviceEnumInfo);
+                }
+                //绠�绾﹀鍔熻兘闈㈡澘鐨勬寜閿厤缃�
+                else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
+                {
+                    foreach (var dev in listNewDevice)
+                    {
+                        if (dev.Type == DeviceType.OnOffOutput && dev.DeviceEpoint == 62)
+                        {
+                            var form = new DeviceFunctionSettionForm();
+                            form.AddForm(dev, true);
+                            break;
+                        }
+                    }
+
                 }
                 //娌充笢鐨勯潰鏉胯澶�
                 else if (deviceEnumInfo.BeloneType == DeviceBeloneType.A鎸夐敭闈㈡澘 && deviceEnumInfo.IsHdlDevice == true)
@@ -845,23 +997,31 @@
             btnFunction.AddLeftCaption(caption, 600);
             //寮�鍏冲浘鏍�
             var btnSwitch = btnFunction.AddMostRightSwitchIcon();
-            //濡傛灉褰撳墠浣忓畢鏄櫄鎷熶綇瀹呯殑璇�,璁╂墍鏈夎彍鍗曢兘涓嶈兘鐐瑰嚮
-            if (Common.Config.Instance.Home.IsVirtually == true)
-            {
-                btnSwitch.CanClick = false;
-            }
             //搴曠嚎
             btnFunction.AddBottomLine();
-            btnSwitch.ButtonClickEvent += async (sender, e) =>
+            btnSwitch.ButtonClickEvent += (sender, e) =>
             {
                 //鍒囨崲妯″紡
                 bool statu = !btnSwitch.IsSelected;
-                var result = await HdlDeviceCurtainLogic.Current.SetHandPullControl(deviceCurtain, statu);
+                var result = HdlDeviceCurtainLogic.Current.SetHandPullControl(deviceCurtain, statu);
                 if (result == true)
                 {
                     btnSwitch.IsSelected = statu;
                 }
             };
+            //鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈�
+            if (Common.Config.Instance.Home.IsShowTemplate == true)
+            {
+                btnSwitch.CanClick = false;
+                btnSwitch.IsSelected = TemplateData.TemplateDeviceDataLogic.Current.GetCurtainHandPullControl(deviceCurtain);
+                return;
+            }
+            //濡傛灉鏄櫄鎷熶綇瀹�
+            if (Common.Config.Instance.Home.IsVirtually == true)
+            {
+                btnSwitch.IsSelected = TemplateData.TemplateDeviceDataLogic.Current.GetCurtainHandPullControl(deviceCurtain);
+                return;
+            }
 
             //娣诲姞灞炴�т笂鎶ョ洃鍚�
             string mainkeys = LocalDevice.Current.GetDeviceMainKeys(this.listNewDevice[0]);
@@ -921,7 +1081,377 @@
                 form.AddForm(listNewDevice[0].DeviceAddr);
             };
         }
+        #endregion
 
+        #region 鈻� 绠�绾﹀鍔熻兘闈㈡澘鐢╛__________________
+        /// <summary>
+        /// 娣诲姞銆愮粦瀹氱洰鏍囥�戣
+        /// </summary>
+        private void AddIBindRow(string deviceMac)
+        {
+            string bindTargets = Language.StringByID(R.MyInternationalizationString.uBindTargets);
+            var btnBindTargets = new FrameRowControl(listview.rowSpace / 2);
+            listview.AddChidren(btnBindTargets);
+            btnBindTargets.AddLeftCaption(bindTargets, 600);
+            //鍚戝彸鍥炬爣
+            btnBindTargets.AddRightArrow();
+            //搴曠嚎
+            btnBindTargets.AddBottomLine();
+            btnBindTargets.ButtonClickEvent += (sender, e) =>
+            {
+                var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 32);//绠�绾﹂潰鏉块殢渚夸竴涓寜閿潵鑾峰彇璁惧
+                if (dev != null)
+                {
+                    var curControlDev = dev as Panel;
+                    var simpleMutilfunctionTargetsPage = new Shared.Phone.UserCenter.DeviceBind.PanelSimpleMutilfunctionTargetsForm(curControlDev);
+                    Shared.Phone.UserView.HomePage.Instance.AddChidren(simpleMutilfunctionTargetsPage);
+                    Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+                    simpleMutilfunctionTargetsPage.Show();
+                }
+            };
+        }
+
+        #region 鈻� 鎺ヨ繎鎰熷簲___________________________
+
+        /// <summary>
+        /// 鎺ヨ繎鎰熷簲琛�
+        /// </summary>
+        private void AddProximitySensorsRow(string deviceMac)
+        {
+            string proximity = Language.StringByID(R.MyInternationalizationString.ProximitySensors);
+            var proximitySensors = new FrameRowControl(listview.rowSpace / 2);
+            listview.AddChidren(proximitySensors);
+            proximitySensors.AddLeftCaption(proximity, 400);
+
+            //鎺ヨ繎鎰熷簲
+            proximitySensors.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.ProximitySensors), 400);
+            //寮�鍏虫帶浠�
+            var btnSwitch = proximitySensors.AddMostRightSwitchIcon();
+            //搴曠嚎
+            proximitySensors.AddBottomLine();
+
+            btnSwitch.ButtonClickEvent +=async (sender, e) =>
+            {
+                btnSwitch.IsSelected = !btnSwitch.IsSelected;
+                proximitySensorsInfo.enable = btnSwitch.IsSelected;
+
+                //绠�绾﹂潰鏉块殢渚夸竴涓洖璺潵鑾峰彇璁惧淇℃伅
+                var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62);
+                if (dev != null)
+                {
+                    var key = new ZigBee.Device.Panel();
+                    key.DeviceAddr = deviceMac;
+                    key.CurrentGateWayId = dev.CurrentGateWayId;
+                    SetProximitySensor(key); 
+                }
+            };
+            if (proximitySensorsInfo.enable == true)
+            {
+                btnSwitch.IsSelected = true;
+            }
+        }
+        #endregion
+
+        #region 鈻� 鏁版嵁鐭_________________________ 
+        /// <summary>
+        ///  鏁版嵁鐭琛�
+        /// </summary>
+        private void DataCorrectionRow(string deviceMac)
+        {
+            //鏁版嵁鐭
+            var rowLight = new FrameRowControl(listview.rowSpace / 2);
+            listview.AddChidren(rowLight);
+            rowLight.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.DataCorrection), 600);
+            //搴曠嚎
+            rowLight.AddBottomLine();
+            //鍙崇澶�
+            rowLight.AddRightArrow();
+            rowLight.ButtonClickEvent += (sender, e) =>
+            {
+                var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62);//绠�绾﹂潰鏉块殢渚夸竴涓洖璺潵鑾峰彇璁惧
+                var device = new CommonDevice();
+                if (dev != null)
+                {
+                    device.CurrentGateWayId = dev.CurrentGateWayId;
+                }
+                device.DeviceAddr = deviceMac;
+                device.DeviceEpoint = 65;
+                var form = new Shared.Phone.UserCenter.DevicePanel.DataCorrectionForm();
+                form.AddForm(device);
+            };
+        }
+        #endregion
+
+        /// <summary>
+        ///  婀垮害鏉ユ簮琛�
+        /// </summary>
+        private void AddHumiditySourceRow(string deviceMac)
+        {
+            //婀垮害
+            var rowHumidity = new FrameRowControl(listview.rowSpace / 2);
+            listview.AddChidren(rowHumidity);
+            rowHumidity.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.HumiditySource), 600);
+            //搴曠嚎
+            rowHumidity.AddBottomLine();
+            //鍙崇澶�
+            rowHumidity.AddRightArrow();
+            var msg = Language.StringByID(R.MyInternationalizationString.nothing);
+            if (!string.IsNullOrEmpty(bindHumidityName))
+            {
+                msg = bindHumidityName;
+            }
+            var btnHumidityStatu = rowHumidity.AddMostRightView(msg, 700);
+            rowHumidity.ButtonClickEvent += (sender, e) =>
+            {
+
+                var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62);//绠�绾﹂潰鏉块殢渚夸竴涓洖璺潵鑾峰彇璁惧
+                var device = new CommonDevice();
+                if (dev != null)
+                {
+                    device.CurrentGateWayId = dev.CurrentGateWayId;
+                }
+                device.Type = DeviceType.OnOffSwitch;
+                device.DeviceAddr = deviceMac;
+                device.DeviceEpoint = 1;//鑳界粦瀹氭箍搴︾殑鍥炶矾
+                var paneTargetsBaseFormp = new PaneTargetsBaseForm(device, bindHumidityDev, BindInfo.BindType.Humidity);
+                Shared.Phone.UserView.HomePage.Instance.AddChidren(paneTargetsBaseFormp);
+                Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+                paneTargetsBaseFormp.Show();
+                paneTargetsBaseFormp.actionHumidityTarget += (bindName) =>
+                {
+                    HdlThreadLogic.Current.RunMain(() =>
+                    {
+                        if (string.IsNullOrEmpty(bindName))
+                        {
+                            btnHumidityStatu.Text = Language.StringByID(R.MyInternationalizationString.nothing);
+                            bindHumidityDev = null;
+                        }
+                        else
+                        {
+                            btnHumidityStatu.Text = bindName;
+                        }
+                    });
+                };
+            };
+        }
+
+        /// <summary>
+        ///  娓╁害鏉ユ簮琛�
+        /// </summary>
+        private void AddTemperatureSensorRow(string deviceMac)
+        {
+            //娓╁害鏉ユ簮
+            var rowTemPerature = new FrameRowControl(listview.rowSpace / 2);
+            listview.AddChidren(rowTemPerature);
+            rowTemPerature.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.TemperatureSource), 600);
+            //搴曠嚎
+            rowTemPerature.AddBottomLine();
+            //鍙崇澶�
+            rowTemPerature.AddRightArrow();
+            var msg = Language.StringByID(R.MyInternationalizationString.nothing);
+            if (!string.IsNullOrEmpty(bindTemperatureName))
+            {
+                msg = bindTemperatureName;
+            }
+            var btnTemperatureStatu = rowTemPerature.AddMostRightView(msg, 700);
+            rowTemPerature.ButtonClickEvent += (sender, e) =>
+            {
+                var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62);//绠�绾﹂潰鏉块殢渚夸竴涓洖璺潵鑾峰彇璁惧
+                var device = new CommonDevice();
+                if (dev != null)
+                {
+                    device.CurrentGateWayId = dev.CurrentGateWayId;
+                }
+                device.Type = DeviceType.OnOffSwitch;
+                device.DeviceAddr = deviceMac;
+                device.DeviceEpoint = 1;//鑳界粦瀹氭俯搴︾殑鍥炶矾
+                var paneTargetsBaseFormp = new PaneTargetsBaseForm(device, bindTemperatureDev, BindInfo.BindType.Temperature);
+                Shared.Phone.UserView.HomePage.Instance.AddChidren(paneTargetsBaseFormp);
+                Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+                paneTargetsBaseFormp.Show();
+                paneTargetsBaseFormp.actionTemperatureTarget += (bindName) =>
+                {
+                    HdlThreadLogic.Current.RunMain(() =>
+                    {
+                        if (string.IsNullOrEmpty(bindName))
+                        {
+                            btnTemperatureStatu.Text = Language.StringByID(R.MyInternationalizationString.nothing);
+                            bindTemperatureDev = null;
+                        }
+                        else
+                        {
+                            btnTemperatureStatu.Text = bindName;
+                        }
+                    });
+                };
+            };
+        }
+
+        /// <summary>
+        ///鍒濆鍖栨暟鎹� 
+        /// </summary>
+        void InitBindInfo(CommonDevice curControlDev)
+        {
+            System.Threading.Tasks.Task.Run(async () =>
+            {
+                try
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        CommonPage.Loading.Start("");
+                    });
+                    //璇绘俯婀垮害鏁版嵁 
+                    curControlDev.DeviceEpoint = 1;
+                    var result = await GetBindName(curControlDev);
+                    if (!result)
+                    {
+                        Application.RunOnMainThread(() =>
+                        {
+                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5007_2" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+                        });
+                        return;
+                    }
+                     
+                    //2銆佽幏璁惧鎺ヨ繎鎰熷簲鍒濆鏁版嵁
+                    //鎺ヨ繎鎰熷簲(浠栦滑璇撮殢渚挎嬁涓�璺洖璺氨琛屼簡)
+                    proximitySensorsInfo = await HdlDevicePanelLogic.Current.GetDeviceProximitySensorsSettion(curControlDev);
+                    if (proximitySensorsInfo == null)
+                    {
+                        proximitySensorsInfo = new Panel.PanelProximitySensorInfo();
+                        //鍏抽棴杩涘害鏉�
+                        this.CloseProgressBar(ShowReLoadMode.YES);
+                        return ;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    var mess = ex.Message;
+                }
+                finally
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        //鍒濆鍖栧彸涓婅鑿滃崟
+                        this.InitTopRightMenu();
+                        //鍒濆鍖栦腑閮ㄦ帶浠�
+                        this.InitMiddleFrame();
+                        CommonPage.Loading.Hide();
+                    });
+                }
+            });
+        }
+
+        /// <summary>
+        /// 鑾峰彇缁戝畾鐨勬俯婀垮害鐩爣
+        /// </summary>
+        /// <param name="curControlDev"></param>
+        /// <returns></returns>
+        private async System.Threading.Tasks.Task<bool> GetBindName(CommonDevice curControlDev)
+        {
+            bool result = false;
+            var panelBindListRes = HdlDeviceBindLogic.Current.GetDeviceBindAsync(curControlDev);
+            if (panelBindListRes != null && panelBindListRes.getAllBindResponseData != null)
+            {
+                bindList = panelBindListRes.getAllBindResponseData.BindList;
+                foreach (var bDev in bindList)
+                {
+                    var device = Common.LocalDevice.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint);
+                    if (device == null)
+                    {
+                        continue;
+                    }
+                    //鑾峰彇璁惧绫诲瀷鐨�
+                    var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
+                    if (device.Type == DeviceType.TemperatureSensor)
+                    {
+                        var bD = device as TemperatureSensor;
+                        if (bD.SensorDiv == 1 && bDev.BindCluster == 1026)
+                        {
+                            bindTemperatureName = Common.LocalDevice.Current.GetDeviceEpointName(device);
+                            bindTemperatureDev = device;
+                        }
+                        if (bD.SensorDiv == 2 && bDev.BindCluster == 1029)
+                        {
+                            bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
+                            bindHumidityDev = device;
+                        }
+
+                        //绌烘皵璐ㄩ噺浼犳劅鍣�
+                        if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.AirQualitySensor)
+                        {
+                            if (bDev.BindCluster == 1026)
+                            {
+                                bindTemperatureName = Common.LocalDevice.Current.GetDeviceEpointName(device) + "-" + Language.StringByID(R.MyInternationalizationString.TemperatureSensor);
+                                bindTemperatureDev = device;
+                            }
+                            if (bDev.BindCluster == 1029)
+                            {
+                                bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device) + "-" + Language.StringByID(R.MyInternationalizationString.HumiditySensor);
+                                bindHumidityDev = device;
+                            }
+                        }
+                    }
+                    if (device.Type == DeviceType.FreshAirHumiditySensor)
+                    {
+                        bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
+                        bindHumidityDev = device;
+                    }
+                    else if (device.Type == DeviceType.PMSensor)
+                    {
+                        if (bDev.BindCluster == 1026)
+                        {
+                            bindTemperatureName = Common.LocalDevice.Current.GetDeviceEpointName(device) + "-" + Language.StringByID(R.MyInternationalizationString.TemperatureSensor);
+                            bindTemperatureDev = device;
+                        }
+                        if (bDev.BindCluster == 1029)
+                        {
+                            bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device) + "-" + Language.StringByID(R.MyInternationalizationString.HumiditySensor);
+                            bindHumidityDev = device;
+                        }
+                    }
+                }
+                result = true;
+            }
+            return result;
+        }
+         
+        #region 鈻� 璁剧疆鏁版嵁___________________________
+
+        /// <summary>
+        /// 璁剧疆闈㈡澘鎺ヨ繎鎰熷簲鏁版嵁
+        /// </summary>
+        private void SetProximitySensor(CommonDevice curControlDev)
+        {
+            System.Threading.Tasks.Task.Run(async () =>
+            {
+                try
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        CommonPage.Loading.Start("");
+                    });
+                    //鎺ヨ繎鎰熷簲(鎻愪緵璁惧鐨勫悓浜嬭闅忎究涓�涓洖璺氨琛�)
+                    var result = await HdlDevicePanelLogic.Current.SetProximitySensorStatus(curControlDev, proximitySensorsInfo.enable);
+                    if (result == false)
+                    { 
+                        return;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    var mess = ex.Message;
+                }
+                finally
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        CommonPage.Loading.Hide();
+                    });
+                }
+            });
+        }
+ 
+        #endregion
         #endregion
 
         #region 鈻� 鍔熻兘绫诲瀷(绌烘皵寮�鍏充笓鐢�)_____________
@@ -948,6 +1478,11 @@
             rowFunction.InitControl();
             //搴曠嚎
             rowFunction.AddBottomLine();
+            //鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈�
+            if (Common.Config.Instance.Home.IsShowTemplate == true)
+            {
+                rowFunction.CanClick = false;
+            }
         }
 
         #endregion
@@ -994,7 +1529,11 @@
             listview.AddChidren(rowVersion);
             rowVersion.AddLeftCaption(caption, 600);
             //鐗堟湰
-            this.btnAirConditionerVersion = rowVersion.AddMostRightView("", 800);
+            this.btnAirConditionerVersion = rowVersion.AddMostRightView(string.Empty, 900);
+            if (this.listNewDevice[0] is AC)
+            {
+                this.btnAirConditionerVersion.Text = ((AC)this.listNewDevice[0]).AcModelVersion;
+            }
             //搴曠嚎
             rowVersion.AddBottomLine();
 
@@ -1034,7 +1573,7 @@
             btnNewVersion.Visible = false;
             btnNewVersion.X = Application.GetRealWidth(242);
             btnNewVersion.Y = Application.GetRealHeight(23);
-            rowUpDate.AddChidren(btnNewVersion, ChidrenBindMode.BindEventOnly);
+            rowUpDate.AddChidren(btnNewVersion, ChidrenBindMode.BindEvent);
 
             rowUpDate.ButtonClickEvent += (sender, e) =>
             {
@@ -1054,7 +1593,8 @@
             };
 
             //濡傛灉褰撳墠浣忓畢涓嶆槸铏氭嫙浣忓畢
-            if (Common.Config.Instance.Home.IsVirtually == false)
+            if (Config.Instance.Home.IsVirtually == false
+                && Config.Instance.Home.IsShowTemplate == false)
             {
                 //璁剧疆璁惧鐨勭増鏈俊鎭�
                 this.SetDeviceVersionInfo(btnNewVersion, oTADevice);
@@ -1068,45 +1608,57 @@
         /// <param name="oTADevice">ota璁惧</param>
         private void SetDeviceVersionInfo(PicViewControl btnNewVersion, OTADevice oTADevice)
         {
-            HdlThreadLogic.Current.RunThread(async () =>
+            HdlThreadLogic.Current.RunThread(() =>
             {
                 bool receiveImageInfo = false;
                 //璁剧疆璁惧鍏ㄩ儴鐨勯暅鍍忎俊鎭�
-                HdlDeviceImageInfoLogic.Current.SetAllImageInfoToOtaDevice(oTADevice, (device, reportData) =>
+                string checkKey = LocalDevice.Current.GetDeviceMainKeys(oTADevice.DeviceAddr, oTADevice.DeviceEpoint);
+                HdlGatewayReceiveLogic.Current.AddAttributeEvent("SetDeviceVersionInfo", ReceiveComandDiv.A璁惧灞炴�т笂鎶�, (report) =>
                 {
-                    receiveImageInfo = true;
+                    if (report.DeviceStatusReport.CluterID == (int)Cluster_ID.Ota)
+                    {
+                        string mainKey = LocalDevice.Current.GetDeviceMainKeys(report.DeviceAddr, report.DeviceEpoint);
+                        if (checkKey == mainKey)
+                        {
+                            //宸茬粡鎺ユ敹寰楀埌
+                            receiveImageInfo = true;
+                        }
+                    }
                 });
+                //鍙戦�佸懡浠�
+                HdlDeviceImageInfoLogic.Current.SetFirmwareVersionComand(oTADevice);
+
                 int count = 5;
                 while (receiveImageInfo == false && count > 0)
                 {
                     //绛夊緟璁惧闀滃儚鐨勫弽棣�
-                    await Task.Delay(300);
+                    System.Threading.Thread.Sleep(300);
                     count--;
                 }
                 //绉婚櫎浜嬩欢
-                HdlDeviceImageInfoLogic.Current.RemoveDeviceFirmwareVersionThread(oTADevice);
+                HdlGatewayReceiveLogic.Current.RemoveEvent("SetDeviceVersionInfo");
 
                 oTADevice = Common.LocalDevice.Current.GetOTADevice(listNewDevice[0].DeviceAddr);
                 //娣诲姞鍗囩骇鍥轰欢淇℃伅(鎴愪笉鎴愬姛閮芥棤鎵�璋�)
-                var result = await HdlFirmwareUpdateLogic.AddFirmwareVersionInfo(FirmwareLevelType.ZigbeeDevice, oTADevice.HwVersion.ToString(), oTADevice.ImgTypeId.ToString());
+                var result = HdlFirmwareUpdateLogic.AddFirmwareVersionInfo(FirmwareLevelType.A璁惧, oTADevice.HwVersion.ToString(), oTADevice.ImgTypeId.ToString());
 
                 //鑾峰彇璁惧鏈�鏂扮増鏈�
-                var deviceFirmware = HdlFirmwareUpdateLogic.GetFirmwareMostVersionInfo(FirmwareLevelType.ZigbeeDevice,
+                var deviceFirmware = HdlFirmwareUpdateLogic.GetFirmwareMostVersionInfo(FirmwareLevelType.A璁惧,
                     oTADevice.HwVersion.ToString(),
                     oTADevice.ImgTypeId.ToString(),
                     oTADevice.ImgVersion);
 
                 if (deviceFirmware != null && deviceFirmware.FirmwareVersion > oTADevice.ImgVersion)
                 {
-                    Application.RunOnMainThread(() =>
+                    HdlThreadLogic.Current.RunMain(() =>
                     {
                         if (btnNewVersion != null)
                         {
                             btnNewVersion.Visible = true;
                         }
-                    });
+                    }, ShowErrorMode.NO);
                 }
-            });
+            }, ShowErrorMode.NO);
         }
 
         #endregion
@@ -1117,11 +1669,11 @@
         /// 璁惧閲嶅懡鍚�
         /// </summary>
         /// <param name="i_deviceName">deviceName.</param>
-        private async void DeviceReName(string i_deviceName, bool closeForm)
+        private void DeviceReName(string i_deviceName, bool closeForm)
         {
             //淇敼MAC鍚�
             string deviceName = i_deviceName.Trim();
-            var result = await Common.LocalDevice.Current.ReMacName(this.listNewDevice, deviceName);
+            var result = Common.LocalDevice.Current.ReMacName(this.listNewDevice, deviceName);
             if (result == false)
             {
                 return;
@@ -1148,6 +1700,11 @@
         /// </summary>
         private void InitTopRightMenu()
         {
+            //鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈�
+            if (Common.Config.Instance.Home.IsShowTemplate == true)
+            {
+                return;
+            }
             var btnIcon = new MostRightIconControl(69, 69);
             btnIcon.UnSelectedImagePath = "Item/More.png";
             topFrameLayout.AddChidren(btnIcon);
@@ -1167,7 +1724,17 @@
             //妫�娴嬫鍥炶矾鏄惁鎷ユ湁瀹氫綅鍔熻兘(鎷跨鐐规渶灏忕殑閭d釜鍥炶矾鍘诲畾浣�)
             bool canTest = Common.LocalDevice.Current.DeviceIsCanFixedPosition(listNewDevice[0]);
 
-            var frame = new TopRightMenuControl(canTest == true ? 2 : 1, 1);
+            TopRightMenuControl frame = null;
+
+            if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
+            {
+                frame = new TopRightMenuControl(3, 1);
+            }
+            else
+            {
+                frame = new TopRightMenuControl(canTest == true ? 2 : 1, 1);
+            }
+
             string deviceMenu = string.Empty;
             if (canTest == true)
             {
@@ -1176,7 +1743,7 @@
                 frame.AddRowMenu(deviceMenu, "Item/FixedPosition.png", "Item/FixedPositionSelected.png", () =>
                 {
                     //鍙戦�佸畾浣嶅姛鑳�
-                    Common.LocalDevice.Current.SetFixedPositionCommand(listNewDevice[0]);
+                    Common.LocalDevice.Current.SetFixedPositionCommand(listNewDevice[0], true);
                 });
             }
 
@@ -1197,6 +1764,23 @@
                     this.DoDeleteDevice();
                 });
             });
+
+            //鍚屾
+            deviceMenu = Language.StringByID(R.MyInternationalizationString.Synchronization);
+            if (Common.LocalDevice.Current.DeviceIsCanFixedPosition(listNewDevice[0]))
+            {
+                frame.AddRowMenu(deviceMenu, "", "Item/SynchronizationSelected.png", () =>
+                {
+                    //濡傛灉褰撳墠浣忓畢鏄櫄鎷熶綇瀹�,姝ゅ姛鑳芥棤鏁�
+                    if (Common.Config.Instance.Home.IsVirtually == true)
+                    {
+                        return;
+                    }
+
+                    //鍚屾鎸囧畾璁惧
+                    this.SynchronizationDevice();
+                });
+            }
 
         }
 
@@ -1225,6 +1809,27 @@
                 });
             });
         }
+
+        /// <summary>
+        /// 鍚屾鎸囧畾璁惧
+        /// </summary>
+        private void SynchronizationDevice()
+        {
+            HdlThreadLogic.Current.RunThread(async () =>
+            {
+                //鎵撳紑杩涘害鏉�
+                this.ShowProgressBar();
+
+                //鍚屾璁惧
+                bool result = await Common.LocalDevice.Current.SynchronizationDevice(listNewDevice);
+                //鍏抽棴杩涘害鏉�
+                this.CloseProgressBar();
+                if (result == false)
+                {
+                    return;
+                }
+            });
+        }
         #endregion
 
         #region 鈻� 鍏抽棴鐣岄潰___________________________
@@ -1235,8 +1840,7 @@
         public override void CloseFormBefore()
         {
             HdlGatewayReceiveLogic.Current.RemoveEvent("HandPullControl");
-            //绉婚櫎鑾峰彇璁惧纭欢淇℃伅鐨勭洃鍚嚎绋�
-            HdlDeviceHardInfoLogic.Current.RemoveDeviceHardInfoThread(listNewDevice[0]);
+            HdlGatewayReceiveLogic.Current.RemoveEvent("SetDeviceVersionInfo");
 
             //璁惧鏂板叆缃�
             if (UserCenterResourse.DicActionForm.ContainsKey("AddDeviceTypeListForm") == true)
@@ -1256,21 +1860,13 @@
         /// </summary>
         private void RefreshHardFirmwareInfo()
         {
-            if (listNewDevice[0].DriveCode > 0)
+            if (listNewDevice[0].DriveCode > 0 || Common.Config.Instance.Home.IsShowTemplate == true)
             {
                 //铏氭嫙璁惧娌℃湁杩欑鎿嶄綔
                 return;
             }
             //閲嶆柊鑾峰彇纭欢淇℃伅
-            HdlDeviceHardInfoLogic.Current.SetAllHardFirmwareInfoToDevice(listNewDevice[0], (device, reportData) =>
-            {
-                for (int i = 1; i < listNewDevice.Count; i++)
-                {
-                    //鍏ㄩ儴鍥炶矾鐨勪俊鎭兘鏄竴鑷寸殑
-                    HdlDeviceHardInfoLogic.Current.SetHardFirmwareInfo(device.DeviceStatusReport, listNewDevice[i]);
-                    listNewDevice[i].ReSave();
-                }
-            });
+            HdlDeviceHardInfoLogic.Current.SetAllHardFirmwareInfoToDevice(listNewDevice[0]);
         }
 
         #endregion
@@ -1301,27 +1897,48 @@
             {
                 return;
             }
-            //鑾峰彇涓�....
-            this.btnAirConditionerVersion.TextID = R.MyInternationalizationString.uGetting;
+            //濡傛灉鏄櫄鎷熶綇瀹呮垨鑰呭睍绀烘ā鏉跨殑璇�
+            if (Config.Instance.Home.IsShowTemplate == true || Config.Instance.Home.IsVirtually == true)
+            {
+                return;
+            }
+
+            bool notVersion = true;
+            if (this.listNewDevice[0] is AC)
+            {
+                notVersion = ((AC)this.listNewDevice[0]).AcModelVersion == string.Empty;
+            }
+            if (notVersion == true)
+            {
+                //鑾峰彇涓�
+                btnAirConditionerVersion.Text = Language.StringByID(R.MyInternationalizationString.uGetting);
+            }
             HdlThreadLogic.Current.RunThread(async () =>
             {
                 //璇诲彇绌鸿皟妯″潡鐗堟湰
                 var result = await HdlDeviceAirConditionerLogic.Current.ReadACFirewareVersionAsync(listNewDevice[0]);
                 if (result == null || result.readACFirewareVersionResponData == null || result.readACFirewareVersionResponData.Status != 0)
                 {
-                    HdlThreadLogic.Current.RunMain(() =>
+                    if (notVersion == true)
                     {
                         //鑾峰彇澶辫触
-                        btnAirConditionerVersion.TextID = R.MyInternationalizationString.uGettingFail;
-                    });
+                        HdlThreadLogic.Current.RunMain(() =>
+                        {
+                            btnAirConditionerVersion.Text = Language.StringByID(R.MyInternationalizationString.uGettingFail);
+                        });
+                    }
+                    return;
                 }
-                else
+                HdlThreadLogic.Current.RunMain(() =>
                 {
-                    HdlThreadLogic.Current.RunMain(() =>
+                    string strVersion = result.readACFirewareVersionResponData.FirewareVersion.Replace("-", string.Empty);
+                    if (this.listNewDevice[0] is AC)
                     {
-                        btnAirConditionerVersion.Text = result.readACFirewareVersionResponData.FirewareVersion.Replace("-", string.Empty);
-                    });
-                }
+                        ((AC)this.listNewDevice[0]).AcModelVersion = strVersion;
+                        this.listNewDevice[0].ReSave();
+                    }
+                    btnAirConditionerVersion.Text = strVersion;
+                });
             });
         }
 

--
Gitblit v1.8.0