20201218-6

wei

2020-12-18 d53f7315de145266e6465d9f95d11d1712b9a91b

 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
                {
@@ -522,18 +526,10 @@
            {
                sceneFunctionInfo += Language.StringByID(StringId.Open) + " " + sceneFunction.localFunction.attributes.Find((obj) => obj.key == "brightness").curValue.ToString() + "%";
            }
            else
            {
                sceneFunctionInfo += Language.StringByID(StringId.Open);
            }
            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);
            }

            //FunctionAttributes perTrait;
@@ -734,7 +730,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 +894,13 @@
                        return;
                    }
                }
                var result = scene.AddScene();
                if (result == StateCode.SUCCESS)
                string result = "";
                var addScene = FunctionList.List.AddScene(scene,out scene);
                if (addScene != null)
                {
                    FunctionList.List.scenes.Add(scene);
                    backAction();
                    this.RemoveFromParent();
                    RemoveFromParent();
                }
                else
                {