2.3版本

wxr

2023-10-23 18c8ba14183bf72fd01e595124a9614bc4c7d6a3

 HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs

@@ -32,7 +32,7 @@
            
            bodyView = this;
            scene = s;
            sceneFunction = fc.localFunction.ConvertSceneFunction(); 
            sceneFunction = fc;//.localFunction.ConvertSceneFunction(); 
            foreach (var ll in sceneFunction.status)
            {
                try
@@ -229,6 +229,7 @@
                        {
                            sceneFunction.status.Clear();
                            sceneFunction.status.Add(new SceneFunctionStatus() { key = FunctionAttributeKey.OnOff, value = "off" });
                            sceneFunction.status.Add(new SceneFunctionStatus() { key = FunctionAttributeKey.Delay, value = sceneFunction.delay });
                        }
                    }
                }
@@ -238,16 +239,6 @@
                {
                    if (temp != null)
                    {
                        //temp.delay = sceneFunction.delay;
                        //foreach (var attr in sceneFunction.status)
                        //{
                        //    var keva = temp.status.Find((obj) => obj.key == attr.key);
                        //    if (keva != null)
                        //    {
                        //        keva.value = attr.value;
                        //    }
                        //}
                        //temp = sceneFunction;
                        scene.functions.Remove(temp);
                    }
                    //else
@@ -292,7 +283,14 @@

        void UpdataFunctionRow()
        {
            try
            {
            contentView.RemoveAll();
            }
            catch (Exception ex)
            {
                MainPage.Log(ex.Message);
            }
            for (var i = 0; i < functionRowList.Count; i++)
            {
                try
@@ -304,11 +302,12 @@
                        {
                            if (view.Tag != null)
                            {
                                if (view.Tag.ToString() == FunctionAttributeKey.OnOff)
                                if (view.Tag.ToString() == FunctionAttributeKey.OnOff || view.Tag.ToString() == "delay")
                                {
                                    contentView.AddChidren(view);

                                }
                                else
                                {
                                if (isOnStatus)
                                {
                                    if (view.Tag.ToString() != FunctionAttributeKey.OnOff)
@@ -332,9 +331,10 @@
                                }
                                else
                                {
                                    if (view.Tag.ToString() != FunctionAttributeKey.OnOff)
                                        if (view.Tag.ToString() != FunctionAttributeKey.OnOff && view.Tag.ToString() != "delay")
                                    {
                                        view.RemoveFromParent();
                                        }
                                    }
                                }
                            }
@@ -674,43 +674,6 @@
            btnFunctionName.MouseUpEventHandler = (sender, e) =>
            {
                LoadEditDialog_OnOff(sceneStatus, btnFunctionText);
                //var colorfulModePage = new SetSceneRgbColorfulModePage();
                //colorfulModePage.backAction = (selectedSerise,status) => {
                //    if (selectedSerise == null)
                //    {
                //        if (status == "on")
                //        {
                //            isColorful = true;
                //        }
                //        else
                //        {
                //            isColorful = false;
                //        }
                //    }
                //    else
                //    {
                //        isColorful = true;
                //        rgbColorful = selectedSerise.ConvertSceneFunction();
                //    }
                //    if (isColorful)
                //    {
                //        btnFunctionText.TextID = StringId.On;
                //        if (selectedSerise != null)
                //        {
                //            btnFunctionText.Text = selectedSerise.name;
                //        }
                //    }
                //    else
                //    {
                //        btnFunctionText.TextID = StringId.OFF;
                //    }
                //    UpdataFunctionRow();
                //};
                //MainPage.BasePageView.AddChidren(colorfulModePage);
                //colorfulModePage.LoadPage(sceneFunction.localFunction.sid.Substring(0,16));
                //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;


            };

            #endregion