From f77a3add1e7ab266e473da9128bbe5758ba3a890 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期日, 20 十二月 2020 19:29:03 +0800
Subject: [PATCH] Merge branch 'NewFilePath' into CJL

---
 HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs |  102 +++++++-------------------------------------------
 1 files changed, 15 insertions(+), 87 deletions(-)

diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs
index 8651933..9a804fc 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs
@@ -196,7 +196,7 @@
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = CSS_Color.FirstLevelTitleColor,
                 TextSize = CSS_FontSize.TextFontSize,
-                TextID = StringId.BelongToZone,
+                TextID = StringId.LocationManagement,
             };
             belongToZoneRow.AddChidren(btnBelongToTitle);
 
@@ -217,7 +217,7 @@
                 TextAlignment = TextAlignment.CenterRight,
                 TextColor = CSS_Color.PromptingColor1,
                 TextSize = CSS_FontSize.TextFontSize,
-                Text = scene.GetRoomListName() == "" ? Language.StringByID(StringId.WholeHouseScene) : scene.GetRoomListName()
+                Text = scene.GetRoomListName() == "" ? Language.StringByID(StringId.WholeZone) : scene.GetRoomListName()
             };
             belongToZoneRow.AddChidren(btnZoneName);
 
@@ -255,7 +255,7 @@
                     TextAlignment = TextAlignment.CenterRight,
                     TextColor = CSS_Color.PromptingColor1,
                     TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
-                    Text = scene.delayText
+                    Text = FunctionList.List.GetDelayText(scene.delay.ToString())
                 };
                 sceneDelayRow.AddChidren(btnSceneDelayInfo);
 
@@ -273,7 +273,11 @@
 
                 btnSceneDelayTitle.MouseUpEventHandler = (sender, e) =>
                 {
-                    new PublicAssmebly().SetSceneDelayDialog(scene, btnSceneDelayInfo);
+                    Action<string> action = (obj) => {
+                        scene.delay = obj;
+                        btnSceneDelayInfo.Text = FunctionList.List.GetDelayText(obj);
+                    };
+                    new PublicAssmebly().SetSceneDelayDialog(action ,scene.delay);
                 };
 
                 contentView.AddChidren(new Button()
@@ -308,7 +312,7 @@
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = CSS_Color.MainColor,
                 TextSize = CSS_FontSize.SubheadingFontSize,
-                TextID = StringId.AddFunction,
+                TextID = StringId.FunctionManagement,
                 IsBold = true,
             };
             addFunctionRow.AddChidren(btnAddFunctionTitle);
@@ -419,7 +423,7 @@
 
                 if (Convert.ToInt32(scenefunction.delay) > 0)
                 {
-                    btnFunctionDelayInfo.Text = Language.StringByID(StringId.Delay) + " " + scenefunction.localFunction.delayText;
+                    btnFunctionDelayInfo.Text = Language.StringByID(StringId.Delay) + " " + FunctionList.List.GetDelayText(scenefunction.delay);
                 }
                 else
                 {
@@ -473,7 +477,6 @@
                 row.AddRightView(btnDelSceneFunction);
                 btnDelSceneFunction.MouseUpEventHandler = (sender, e) => {
                     scene.functions.Remove(scenefunction);
-                    scene.SaveSceneData(true);
                     row.RemoveFromParent();
                     functionListView.Height = Application.GetRealWidth(65 * scene.functions.Count);
                 };
@@ -520,89 +523,14 @@
             var briState = sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.Brightness);
             if (briState != null)
             {
-                sceneFunctionInfo += Language.StringByID(StringId.Open) + " " + sceneFunction.localFunction.attributes.Find((obj) => obj.key == "brightness").curValue.ToString() + "%";
-            }
-            else
-            {
-                sceneFunctionInfo += Language.StringByID(StringId.Open);
+                sceneFunctionInfo += sceneFunction.localFunction.attributes.Find((obj) => obj.key == "brightness").curValue.ToString() + "%";
             }
             var perState = sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.Percent);
             if (perState != null)
             {
-                sceneFunctionInfo += Language.StringByID(StringId.Open) + " " + sceneFunction.localFunction.attributes.Find((obj) => obj.key == "brightness").curValue.ToString() + "%";
-            }
-            else
-            {
-                sceneFunctionInfo += Language.StringByID(StringId.Open);
+                sceneFunctionInfo += sceneFunction.localFunction.attributes.Find((obj) => obj.key == "brightness").curValue.ToString() + "%";
             }
 
-            //FunctionAttributes perTrait;
-
-            //switch (sceneFunction.localFunction.functionType)
-            //{
-                //case FunctionType.AC:
-                    //var acMode = sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.Mode);
-                    //var acTemp = sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.SetTemp);
-                    //var acFan = sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.FanSpeed);
-                    //if (acMode != null)
-                    //{
-                    //    sceneFunctionInfo += FunctionList.List.GetValueText(acMode.key, acMode.value);
-                    //}
-                    //if (acTemp != null)
-                    //{
-                    //    sceneFunctionInfo += FunctionList.List.GetValueText(acTemp.key, acTemp.value);
-                    //    sceneFunctionInfo += FunctionList.List.GetUintString(acTemp.key);
-                    //}
-                    //if (acFan!=null)
-                    //{
-                    //    sceneFunctionInfo += FunctionList.List.GetValueText(acFan.key, acFan.value);
-                    //}
-                //    break;
-                //case FunctionType.FloorHeating:
-                    //sceneFunctionInfo += sceneFunction.localFunction.attributes.Find((obj) => obj.key == "mode").GetCurValueText();
-                    //sceneFunctionInfo += " " + sceneFunction.localFunction.attributes.Find((obj) => obj.key == "set_temp").curValue.ToString() +
-                    //     sceneFunction.localFunction.attributes.Find((obj) => obj.key == "set_temp").uintString;
-                    //break;
-                //case FunctionType.Dimmer:
-                    //perTrait = sceneFunction.localFunction.attributes.Find((obj) => obj.key == "brightness");
-                    //if (perTrait != null)
-                    //{
-                    //    sceneFunctionInfo += Language.StringByID(StringId.Open) + " " + sceneFunction.localFunction.attributes.Find((obj) => obj.key == "brightness").curValue.ToString() + "%";
-                    //}
-                    //else
-                    //{
-                    //    sceneFunctionInfo += Language.StringByID(StringId.Open);
-                    //}
-                    //break;
-                //case FunctionType.Relay:
-                //    sceneFunctionInfo += Language.StringByID(StringId.Open);
-                //    break;
-                //case FunctionType.RGB:
-                //    perTrait = sceneFunction.localFunction.attributes.Find((obj) => obj.key == "percent");
-                //    if (perTrait != null)
-                //    {
-                //        sceneFunctionInfo += Language.StringByID(StringId.Open) + " " + sceneFunction.localFunction.attributes.Find((obj) => obj.key == "brightness").curValue.ToString() + "%";
-                //    }
-                //    else
-                //    {
-                //        sceneFunctionInfo += Language.StringByID(StringId.Open);
-                //    }
-                //    break;
-                //case FunctionType.Curtain:
-                //    sceneFunctionInfo += Language.StringByID(StringId.Open);
-                //    break;
-                //case FunctionType.MotorCurtain:
-                //    perTrait = sceneFunction.localFunction.attributes.Find((obj) => obj.key == "percent");
-                //    if (perTrait != null)
-                //    {
-                //        sceneFunctionInfo += Language.StringByID(StringId.Open) + " " + sceneFunction.localFunction.attributes.Find((obj) => obj.key == "percent").curValue.ToString() + "%";
-                //    }
-                //    else
-                //    {
-                //        sceneFunctionInfo += Language.StringByID(StringId.Open);
-                //    }
-                //    break;
-            //}
             return sceneFunctionInfo;
         }
 
@@ -734,7 +662,7 @@
         void LoadEvent_ChangeFunctionList()
         {
             btnAddFunctionTitle.MouseUpEventHandler = (sender, e) => {
-                var sefp = new SceneFunctionListEditPage(scene, refreshFunctionRowAction);
+                var sefp = new SceneFunctionListChoosePage(scene, refreshFunctionRowAction);
                 MainPage.BasePageView.AddChidren(sefp);
                 sefp.LoadPage();
                 MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -898,12 +826,12 @@
                         return;
                     }
                 }
-                var result = scene.AddScene();
+                var result = FunctionList.List.AddScene(scene,out scene);
                 if (result == StateCode.SUCCESS)
                 {
                     FunctionList.List.scenes.Add(scene);
                     backAction();
-                    this.RemoveFromParent();
+                    RemoveFromParent();
                 }
                 else
                 {

--
Gitblit v1.8.0