From 0039220054537c28443625b5becc5355e74e6cf8 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 11 一月 2021 17:51:15 +0800
Subject: [PATCH] 2021-1-11-5

---
 HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs |  158 +++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 147 insertions(+), 11 deletions(-)

diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index c859bcb..47fb936 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -40,9 +40,75 @@
                             inputView.btnIcon.UnSelectedImagePath = "LogicIcon/time.png";
                             foreach (var dic in dicList)
                             {
+                                string keyValue = dic["key"];
                                 string value = dic["value"];
-                                inputView.btnText.Text = Language.StringByID(StringId.hour) + ": " + value;
-                                inputView.btnClick.AddTag("timepoint", value);
+                                if (keyValue == "timepoint")
+                                {
+                                    inputView.btnText.Text = Language.StringByID(StringId.hour) + ": " + value;
+                                }
+                                else
+                                {
+                                    string strtext = "";
+                                    string statetext = "";
+                                    switch (keyValue)
+                                    {
+                                        case "before_sunrise":
+                                            {
+                                                strtext = Language.StringByID(StringId.sunrise);
+                                                statetext = Language.StringByID(StringId.advanced);
+                                              
+                                            }
+                                            break;
+                                        case "before_sunset":
+                                            {
+
+                                                strtext = Language.StringByID(StringId.sunset);
+                                                statetext = Language.StringByID(StringId.advanced);
+                                              
+                                            } break;
+                                        case "before_noon":
+                                            {
+                                                strtext = Language.StringByID(StringId.at);
+                                                statetext = Language.StringByID(StringId.advanced);
+                                            }
+                                            break;
+                                        case "after_sunrise":
+                                            {
+                                                strtext = Language.StringByID(StringId.sunrise);
+                                                statetext = Language.StringByID(StringId.delayLogic);
+                                            } break;
+                                        case "after_sunset":
+                                            {
+                                                strtext = Language.StringByID(StringId.sunset);
+                                                statetext = Language.StringByID(StringId.delayLogic);
+                                            } break;
+                                        case "after_noon":
+                                            {
+                                                strtext = Language.StringByID(StringId.at);
+                                                statetext = Language.StringByID(StringId.delayLogic);
+                                            }
+                                            break;
+                                    }
+
+                                    if (value != "0")
+                                    {
+                                        if (value == "30")
+                                        {
+                                            statetext += value + Language.StringByID(StringId.s);
+                                        }
+                                        else
+                                        {
+                                            statetext += value + Language.StringByID(StringId.minute);
+                                        }
+                                    }
+                                    else
+                                    {
+                                        statetext = "";
+                                    }
+
+                                    inputView.btnText.Text = strtext;
+                                    inputView.btnState.Text = statetext;
+                                }
                             }
                         }
                         break;
@@ -53,7 +119,6 @@
                             {
                                 string value = dic["value"];
                                 inputView.btnText.Text = Language.StringByID(StringId.timeHorizon) + ": " + value;
-                                inputView.btnClick.AddTag("timeHorizon", value);
                             }
 
                         }
@@ -105,6 +170,40 @@
                             }
                         }
                         break;
+                    case "6":
+                        {
+                            inputView.btnIcon.UnSelectedImagePath = "LogicIcon/changesinoutdoor.png";
+                            foreach (var dic in dicList)
+                            {
+                                string strtext = "";
+                                string value = dic["value"];
+                                switch (value)
+                                {
+                                    case "sunny":
+                                        {
+                                            strtext = Language.StringByID(StringId.clearday);
+
+                                        }
+                                        break;
+                                    case "cloudy":
+                                        {
+
+                                            strtext = Language.StringByID(StringId.cloudy);
+
+                                        }
+                                        break;
+                                    case "rainy":
+                                        {
+                                            strtext = Language.StringByID(StringId.rain);
+                                        }
+                                        break;
+                                 
+                                }
+                                inputView.btnText.TextID =StringId.tianqibianhua;
+                                inputView.btnState.Text = strtext;
+                            }
+                        }
+                        break;
 
                 }
                 //鍐嶆缂栬緫鏉′欢鐘舵�佺偣鍑讳簨浠�
@@ -131,13 +230,44 @@
                     {
                         case "1":
                             {
-                                FrameLayout fLayout = new FrameLayout
+                                bool is_bool = false;
+                                Input _input = Logic.currlogic.input[indexVulae];
+                                if (_input.condition_type == "1")
                                 {
-                                    BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
-                                };
-                                thisView.AddChidren(fLayout);
-                                TimeTpye timeTpye = new TimeTpye();
-                                timeTpye.TimePoint(fLayout, edit, indexVulae);
+                                    var dicLists = _input.condition as List<Dictionary<string, string>>;
+                                    foreach (var dic in dicLists)
+                                    {
+                                        string keyValue = dic["key"];
+                                        if (keyValue != "timepoint")
+                                        {
+                                            //閫氳繃閿�兼煡鎵鹃敭鍊兼槸鍚︽槸
+                                            //锛堟棩鍑�/鏃ヨ惤/姝e崍锛�
+                                            is_bool = true;
+                                            break;
+                                        }
+
+                                    }
+
+                                }
+                                if (is_bool)
+                                {
+                                    //璺宠浆鍒帮紙鏃ュ嚭/鏃ヨ惤/姝e崍锛夌晫闈�
+                                    SpeciaTime speciaTime = new SpeciaTime();
+                                    MainPage.BasePageView.AddChidren(speciaTime);
+                                    speciaTime.Show(edit, indexVulae);
+                                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+                                }
+                                else
+                                {
+                                    //璺宠浆鍒帮紙鏃堕棿鐐癸級鐣岄潰
+                                    FrameLayout fLayout = new FrameLayout
+                                    {
+                                        BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
+                                    };
+                                    thisView.AddChidren(fLayout);
+                                    TimeTpye timeTpye = new TimeTpye();
+                                    timeTpye.TimePoint(fLayout, edit, indexVulae);
+                                }
                             }
                             break;
                         case "2":
@@ -161,8 +291,15 @@
                                 MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                             }
                             break;
+                        case "6":
+                            {
 
-
+                                WeatherCondition weatherCondition = new WeatherCondition();
+                                MainPage.BasePageView.AddChidren(weatherCondition);
+                                weatherCondition.Show();
+                                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+                            }
+                            break;
                     }
                 };
                 ///鍒犻櫎鎺т欢
@@ -846,7 +983,6 @@
             }
             return valueStr;
         }
-
         /// <summary>
         ///鑾峰彇鑷姩鍖栧悕绉�
         /// </summary>

--
Gitblit v1.8.0