From 4b378188ce972df432b23d9cb73babb6cc0679c6 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 17 一月 2020 14:56:15 +0800
Subject: [PATCH] 合并代码 ver.10086

---
 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs |   54 ++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
index f988ccb..ebd4e39 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
@@ -45,6 +45,11 @@
         public void ShowForm(string deviceMac)
         {
             this.listNewDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceMac);
+            if (listNewDevice.Count == 0)
+            {
+                //閽堝鍗曠函鍙湁涓�涓�200绔偣鐨勮澶�
+                listNewDevice.Add(Common.LocalDevice.Current.GetOTADevice(deviceMac));
+            }
 
             this.listDeviceType.Clear();
             foreach (var device in listNewDevice)
@@ -131,6 +136,11 @@
             {
                 foreach (var device in this.listNewDevice)
                 {
+                    if (device is OTADevice)
+                    {
+                        //閽堝鍗曠函鍙湁涓�涓�200绔偣鐨勮澶�
+                        continue;
+                    }
                     var room = Room.CurrentRoom.GetRoomByDevice(device);
                     string mainKeys = LocalDevice.Current.GetDeviceMainKeys(device);
                     if (room == null)
@@ -462,8 +472,25 @@
             btnFunction.AddBottomLine();
             btnFunction.ButtonClickEvent += (sender, e) =>
             {
-                var form = new DevicePanel.PanelButtonSettionForm();
-                form.AddForm(listNewDevice[0]);
+                if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueTwo
+                || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFour
+                || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEight)
+                {
+                    //鏂规偊闈㈡澘鐨勬寜閿厤缃�
+                    var form = new DevicePanel.PanelFangyueButtonSettionForm();
+                    form.AddForm(listNewDevice[0]);
+                }
+                else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment)
+                {
+                    //鏂规偊鐜闈㈡澘鐨勬寜閿厤缃�
+                    var form = new DevicePanel.PanelFangyueEnvironmentButtonSettionForm();
+                    form.AddForm(listNewDevice[0]);
+                }
+                else
+                {
+                    var form = new DevicePanel.PanelButtonSettionForm();
+                    form.AddForm(listNewDevice[0]);
+                }
             };
         }
 
@@ -577,6 +604,11 @@
             {
                 return;
             }
+            if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment)
+            {
+                //鐜闈㈡澘娌℃湁鍔熻兘璁剧疆
+                return;
+            }
 
             //鍔熻兘璁剧疆
             string caption = Language.StringByID(R.MyInternationalizationString.uFunctionSettingUp);
@@ -589,8 +621,16 @@
             btnFunction.AddBottomLine();
             btnFunction.ButtonClickEvent += (sender, e) =>
             {
+                //鏂规偊闈㈡澘
+                if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueTwo
+                    || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFour
+                    || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEight)
+                {
+                    var form = new DevicePanel.PanelFangyueFunctionSettionForm();
+                    form.AddForm(listNewDevice[0]);
+                }
                 //娌充笢鐨勯潰鏉胯澶�
-                if (deviceEnumInfo.BeloneType == DeviceBeloneType.A鎸夐敭闈㈡澘 && deviceEnumInfo.IsHdlDevice == true)
+                else if (deviceEnumInfo.BeloneType == DeviceBeloneType.A鎸夐敭闈㈡澘 && deviceEnumInfo.IsHdlDevice == true)
                 {
                     var form = new DevicePanel.PanelFunctionSettionForm();
                     form.AddForm(listNewDevice[0]);
@@ -724,10 +764,12 @@
         /// </summary>
         private void AddIndoorUnitSettionRow()
         {
-            if (this.deviceEnumInfo.ConcreteType != DeviceConcreteType.AirConditioner_ZbGateway)
+            if (this.deviceEnumInfo.ConcreteType != DeviceConcreteType.AirConditioner_ZbGateway
+                || this.listNewDevice[0] is OTADevice)//杩藉姞锛氬崟绾彧鏈�200绔偣鐨勮瘽锛屼笉鏄剧ず杩欎釜鑿滃崟
             {
                 return;
             }
+
             //瀹ゅ唴鏈鸿缃�
             string caption = Language.StringByID(R.MyInternationalizationString.uIndoorUnitSettion);
             var btnFunction = new FrameRowControl(listview.rowSpace / 2);
@@ -937,7 +979,7 @@
                 {
                     //涓ぎ绌鸿皟鐨勫崌绾х殑璇濓紝鏄壒娈婄殑
                     var form = new DeviceAirConditioner.ACZbGatewayUpdateMenuForm();
-                    form.AddForm((AC)listNewDevice[0], btnNewVersion.Visible);
+                    form.AddForm(listNewDevice[0], btnNewVersion.Visible);
                 }
                 btnNewVersion.Visible = false;
             };
@@ -1196,7 +1238,7 @@
             HdlThreadLogic.Current.RunThread(async () =>
             {
                 //璇诲彇绌鸿皟妯″潡鐗堟湰
-                var result = await ((AC)listNewDevice[0]).ReadACFirewareVersionAsync();
+                var result = await HdlDeviceAirConditionerLogic.Current.ReadACFirewareVersionAsync(listNewDevice[0]);
                 if (result == null || result.readACFirewareVersionResponData == null || result.readACFirewareVersionResponData.Status != 0)
                 {
                     HdlThreadLogic.Current.RunMain(() =>

--
Gitblit v1.8.0