From d6fb0646531172f23648441c224cdcccd721b894 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期一, 14 十二月 2020 09:59:01 +0800
Subject: [PATCH] 请合并代码，完成晾衣架最终功能。

---
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/DeviceFunctionTypeRowControl.cs |   37 +++++++++++++++++++++++++++----------
 1 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/DeviceFunctionTypeRowControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/DeviceFunctionTypeRowControl.cs
old mode 100755
new mode 100644
index b0bca1d..ffdd535
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/DeviceFunctionTypeRowControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/DeviceFunctionTypeRowControl.cs
@@ -30,7 +30,7 @@
         /// </summary>
         public bool SetCanSelect
         {
-            set 
+            set
             {
                 m_SetCanSelect = value;
             }
@@ -74,7 +74,7 @@
                 || this.device.Type == DeviceType.OnOffOutput)
             {
                 //娌¤寮哄埗骞叉秹鐨勮瘽
-                if (m_SetCanSelect == true)
+                if (m_SetCanSelect == true && Common.Config.Instance.Home.IsShowTemplate == false)
                 {
                     this.UseClickStatu = true;
                     //鍙崇澶�
@@ -111,7 +111,7 @@
 
             var form = new BottomItemSelectForm();
             form.CancelCallEvent = true;//鍏佽鍙栨秷
-            form.AddForm(title, listText, nowSelectNo - 1);
+            form.AddForm(title, listText, null, nowSelectNo - 1);
             form.FinishSelectEvent += (selectNo) =>
             {
                 if (selectNo == nowSelectNo - 1)
@@ -127,8 +127,8 @@
                 HdlThreadLogic.Current.RunThread(() =>
                 {
                     //璁剧疆鍔熻兘绫诲瀷鍒扮綉鍏�
-                    var result = Common.LocalDevice.Current.SendDeviceFunctionTypeToGateway(this.device, (DeviceFunctionType)nowSelectNo);
-                    
+                    var result = Common.LocalDevice.Current.SendDeviceFunctionTypeToGateway(this.device, (DeviceFunctionType)nowSelectNo);
+
                     HdlThreadLogic.Current.RunMain(() =>
                     {
                         if (result == true)
@@ -137,7 +137,7 @@
                             this.RefreshDfunctionType();
 
                             //璁惧鏀瑰彉鍔熻兘绫诲瀷鐨勮瘽,涓婚〉闇�瑕侀噸鏂板埛鏂�
-                            UserView.UserPage.Instance.RefreshForm = true;
+                            UserView.UserPage.Instance.RefreshAllForm = true;
 
                             //璋冪敤鍥炶皟鍑芥暟
                             this.FinishSelectEvent?.Invoke(nowSelectNo);
@@ -194,25 +194,29 @@
                 || this.device.Type == DeviceType.DimmableLight)
             {
                 //鐏厜绫诲浐瀹氫负 鐏厜
-                strType = Language.StringByID(R.MyInternationalizationString.uLight);
+                var infoContent = Common.LocalDevice.Current.GetDeviceModelIdNameInfo("A418");
+                strType = infoContent != null ? infoContent.A瀹樻柟鍚嶅瓧 : string.Empty;
                 nowSelectNo = 2;
             }
             else if (this.device.Type == DeviceType.WindowCoveringDevice)
             {
                 //绐楀笜鍥哄畾涓� 閬槼
-                strType = Language.StringByID(R.MyInternationalizationString.uDeviceBelongId100);
+                var infoContent = Common.LocalDevice.Current.GetDeviceModelIdNameInfo("A400");
+                strType = infoContent != null ? infoContent.A瀹樻柟鍚嶅瓧 : string.Empty;
                 nowSelectNo = -1;
             }
             else if (this.device.Type == DeviceType.Thermostat)
             {
                 //绌鸿皟鍥哄畾涓� 绌鸿皟
-                strType = Language.StringByID(R.MyInternationalizationString.uDeviceBelongId3600);
+                var infoContent = Common.LocalDevice.Current.GetDeviceModelIdNameInfo("A406");
+                strType = infoContent != null ? infoContent.A瀹樻柟鍚嶅瓧 : string.Empty;
                 nowSelectNo = -1;
             }
             else if (this.device.Type == DeviceType.DoorLock)
             {
                 //闂ㄩ攣鍥哄畾涓� 闂ㄩ攣
-                strType = Language.StringByID(R.MyInternationalizationString.uDeviceBelongId2800);
+                var infoContent = Common.LocalDevice.Current.GetDeviceModelIdNameInfo("A405");
+                strType = infoContent != null ? infoContent.A瀹樻柟鍚嶅瓧 : string.Empty;
                 nowSelectNo = -1;
             }
             else if (this.device.Type == DeviceType.FreshAir)
@@ -225,6 +229,18 @@
             {
                 //PM2.5浼犳劅鍣ㄥ浐瀹氫负 绌烘皵璐ㄩ噺
                 strType = Language.StringByID(R.MyInternationalizationString.AirQuality);
+                nowSelectNo = -1;
+            }
+            else if (this.device.Type == DeviceType.Airer)
+            {
+                //鏅捐。鏋�
+                strType = Language.StringByID(R.MyInternationalizationString.AirerFun);
+                nowSelectNo = -1;
+            }
+            else if (this.device.Type == DeviceType.PMSensor)
+            {
+                //绌烘皵璐ㄩ噺浼犳劅鍣� 鐜  
+                strType = Language.StringByID(R.MyInternationalizationString.Envoronment);
                 nowSelectNo = -1;
             }
 
@@ -252,6 +268,7 @@
                 || this.device.Type == DeviceType.Thermostat//绌鸿皟
                 || this.device.Type == DeviceType.FreshAir//鏂伴
                 || this.device.Type == DeviceType.PMSensor //PM2.5
+                || this.device.Type == DeviceType.Airer//鏅捐。鏋�
                 || this.device.Type == DeviceType.ColorTemperatureLight //鑹叉俯鐏�
                 || this.device.Type == DeviceType.WindowCoveringDevice)//绐楀笜
             {

--
Gitblit v1.8.0