From 1026814d931de92f0da5f15a58870565a94100e0 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 11 一月 2021 14:37:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/NewFilePath' into WJC

---
 HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs |   94 ++++++++++++++++++++++++-----------------------
 1 files changed, 48 insertions(+), 46 deletions(-)

diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index 5aa2003..5bacc1d 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -1,6 +1,8 @@
 锘縰sing System;
 using Shared;
 using System.Collections.Generic;
+using HDL_ON.Entity;
+
 namespace HDL_ON.UI.UI2.Intelligence.Automation
 {
     public class InpOrOutLogicMethod
@@ -126,28 +128,28 @@
                             //鐢╯id鎵惧埌璁惧锛�
                             var device = LogicMethod.GetDevice(inputCondition.sid);
                             //鐢ㄨ澶囩殑functionType绫诲瀷鎵惧埌瀵瑰簲鍥炬爣锛�
-                            inputView.btnIcon.UnSelectedImagePath = LogicMethod.GetIconPath(device.functionType);
+                            inputView.btnIcon.UnSelectedImagePath = LogicMethod.GetIconPath(device.spk);
                             //鏄剧ず璁惧鍚嶇О
                             inputView.btnText.Text = device.name;
                             //鏀瑰彉璁惧鍚嶇О鏄剧ず鎺т欢瀹藉害
                             inputView.btnText.Width = Application.GetRealWidth(80);
                             //鍖哄埆涓嶅悓璁惧锛屾樉绀轰笉鍚岃澶囩姸鎬�
-                            switch (device.functionType)
+                            switch (device.spk)
                             {
                                 //寮�鍏崇伅鍏� light.Switch
-                                case FunctionType.Dimmer:
-                                case FunctionType.RGB:
-                                case FunctionType.RGBW:
-                                case FunctionType.ColorTemperature:
-                                case FunctionType.Relay:
+                                case SPK.LightDimming:
+                                case SPK.LightRGB:
+                                case SPK.LightRGBW:
+                                case SPK.LightCCT:
+                                case SPK.LightSwitch:
                                 //绐楀笜
-                                case FunctionType.Curtain:
-                                case FunctionType.RollingShutter:
-                                case FunctionType.MotorCurtain:
+                                case SPK.CurtainSwitch:
+                                case SPK.CurtainRoller:
+                                case SPK.CurtainTrietex:
                                 //绌鸿皟
-                                case FunctionType.AC:
+                                case SPK.AcStandard:
                                 //鍦扮儹
-                                case FunctionType.FloorHeating:
+                                case SPK.FloorHeatStandard:
                                     {//寮�鍏崇伅
                                         foreach (var dic in dicList)
                                         {
@@ -300,7 +302,7 @@
                             //鐢╯id鎵惧埌璁惧锛�
                             var device = LogicMethod.GetDevice(outputTarget.sid);
                             //鐢ㄨ澶囩殑functionType绫诲瀷鎵惧埌瀵瑰簲鍥炬爣锛�
-                            targetView.btnIcon.UnSelectedImagePath = LogicMethod.GetIconPath(device.functionType);
+                            targetView.btnIcon.UnSelectedImagePath = LogicMethod.GetIconPath(device.spk);
                             //鏄剧ず璁惧鍚嶇О
                             targetView.btnText.Text = device.name;
                             //鏀瑰彉璁惧鍚嶇О鏄剧ず鎺т欢瀹藉害
@@ -308,9 +310,9 @@
                             //绗竴涓彉閲忔樉绀虹姸鎬佸��
                             string stateStr = "";
                             //鍖哄埆涓嶅悓璁惧锛屾樉绀轰笉鍚岃澶囩姸鎬�
-                            switch (device.functionType)
+                            switch (device.spk)
                             {
-                                case FunctionType.Relay:
+                                case SPK.LightSwitch:
                                     {//寮�鍏崇伅
 
                                         foreach (var dic in dicList)
@@ -329,10 +331,10 @@
                                         targetView.btnState.Text = stateStr;
                                     }
                                     break;
-                                case FunctionType.RGB:
-                                case FunctionType.RGBW:
-                                case FunctionType.ColorTemperature:
-                                case FunctionType.Dimmer:
+                                case SPK.LightRGB:
+                                case SPK.LightRGBW:
+                                case SPK.LightCCT:
+                                case SPK.LightDimming:
                                     {
                                         string on_off = GetKeyValue("on_off", dicList);
                                         string brightness = GetKeyValue("brightness", dicList);
@@ -355,9 +357,9 @@
                                         targetView.btnState.Text = stateStr;
                                     }
                                     break;
-                                case FunctionType.Curtain:
-                                case FunctionType.MotorCurtain:
-                                case FunctionType.RollingShutter:
+                                case SPK.CurtainSwitch:
+                                case SPK.CurtainTrietex:
+                                case SPK.CurtainRoller:
                                     {
                                         foreach (var dic in dicList)
                                         {
@@ -384,7 +386,7 @@
                                         targetView.btnState.Text = stateStr;
                                     }
                                     break;
-                                case FunctionType.AC: {
+                                case SPK.AcStandard: {
                                         string on_off = GetKeyValue("on_off", dicList);
                                         string set_temp = GetKeyValue("set_temp", dicList);
                                         string mode = GetKeyValue("mode", dicList);
@@ -480,7 +482,7 @@
 
                                     }
                                     break;
-                                case FunctionType.FloorHeating:
+                                case SPK.FloorHeatStandard:
                                     {
                                         string on_off = GetKeyValue("on_off", dicList);
                                         string set_temp = GetKeyValue("set_temp", dicList);
@@ -666,10 +668,10 @@
         /// <param name="button4">鏄剧ずBtn</param>
         public static void EditState(Entity.Function device, List<Dictionary<string, string>> dicList, Button button1, Button button2, Button button3, Button button4)
         {
-            switch (device.functionType)
+            switch (device.spk)
             {
                 //寮�鍏崇伅鍏�
-                case FunctionType.Relay:
+                case SPK.LightSwitch:
                     {
                         foreach (var dic in dicList)
                         {
@@ -685,10 +687,10 @@
                         }
                     }
                     break;
-                case FunctionType.Dimmer:
-                case FunctionType.RGB:
-                case FunctionType.RGBW:
-                case FunctionType.ColorTemperature:
+                case SPK.LightDimming:
+                case SPK.LightRGB:
+                case SPK.LightRGBW:
+                case SPK.LightCCT:
                     {
                         foreach (var dic in dicList)
                         {
@@ -718,9 +720,9 @@
                         }
                     }
                     break;
-                case FunctionType.Curtain:
-                case FunctionType.MotorCurtain:
-                case FunctionType.RollingShutter:
+                case SPK.CurtainSwitch:
+                case SPK.CurtainTrietex:
+                case SPK.CurtainRoller:
                     {
                         foreach (var dic in dicList)
                         {
@@ -746,7 +748,7 @@
                         }
                     }
                     break;
-                case FunctionType.AC:
+                case SPK.AcStandard:
                     {
                         foreach (var dic in dicList)
                         {
@@ -842,7 +844,7 @@
 
                     }
                     break;
-                case FunctionType.FloorHeating:
+                case SPK.FloorHeatStandard:
                     {
 
                         foreach (var dic in dicList)
@@ -988,9 +990,9 @@
                             name += device.name;
                             string stateStr = "";
                             //鍖哄埆涓嶅悓璁惧锛屾樉绀轰笉鍚岃澶囩姸鎬�
-                            switch (device.functionType)
+                            switch (device.spk)
                             {
-                                case FunctionType.Relay:
+                                case SPK.LightSwitch:
                                     {//寮�鍏崇伅
 
                                         foreach (var dic in dicList)
@@ -1008,10 +1010,10 @@
                                         }
                                     }
                                     break;
-                                case FunctionType.RGB:
-                                case FunctionType.RGBW:
-                                case FunctionType.ColorTemperature:
-                                case FunctionType.Dimmer:
+                                case SPK.LightRGB:
+                                case SPK.LightRGBW:
+                                case SPK.LightCCT:
+                                case SPK.LightDimming:
                                     {
                                         string on_off = InpOrOutLogicMethod.GetKeyValue("on_off", dicList);
                                         string brightness = InpOrOutLogicMethod.GetKeyValue("brightness", dicList);
@@ -1033,9 +1035,9 @@
                                         }
                                     }
                                     break;
-                                case FunctionType.Curtain:
-                                case FunctionType.MotorCurtain:
-                                case FunctionType.RollingShutter:
+                                case SPK.CurtainSwitch:
+                                case SPK.CurtainTrietex:
+                                case SPK.CurtainRoller:
                                     {
                                         foreach (var dic in dicList)
                                         {
@@ -1061,8 +1063,8 @@
                                         }
                                     }
                                     break;
-                                case FunctionType.AC:
-                                case FunctionType.FloorHeating:
+                                case SPK.AcStandard:
+                                case SPK.FloorHeatStandard:
                                     {
                                         foreach (var dic in dicList)
                                         {

--
Gitblit v1.8.0