2023年11月06日11:23:46

mac

2023-11-06 54c202bd4867092fca2bc6f96bec0cfd1056a46a

 HDL_ON/UI/UI2/2-Classification/FunctionPage.cs

@@ -30,6 +30,7 @@
        List<Function> functionList;
        int titleId;

        public Action DelAction;
        public FunctionPage()
        {
            bodyView = this;
@@ -185,7 +186,9 @@
            }
            else if (titleId == StringId.Electric)
            {
               
                functionList.AddRange(FunctionList.List.GetElectricals());

            }
            else if (titleId == StringId.EnvironmentalScience)
            {
@@ -206,6 +209,10 @@
            else if (titleId == StringId.SecurityMonitoring)
            {
                functionList.AddRange(FunctionList.List.GetIpCamImouList());
            }
            else if(titleId == StringId.EnergyMonitoring)
            {
                functionList.AddRange(FunctionList.List.GetEnergyList());
            }
            functionList = functionList.OrderByDescending(o => o.controlCounter).ToList();

@@ -271,7 +278,7 @@
                            {
                                continue;
                            }
                            if (function.spk == SPK.LightRGBW || function.spk == SPK.LightRGB || function.spk == SPK.LightDimming)
                            if (function.spk == SPK.LightCCT || function.spk == SPK.LightRGBW || function.spk == SPK.LightRGB || function.spk == SPK.LightDimming)
                            {
                                var functionDiv = new FunctionControlZone(function,null)
                                {
@@ -316,6 +323,7 @@
                                    functionListView.RemoveAll();
                                    showList.Remove(function);//先移除
                                    ShowFunctionRow(showList,isAppend);
                                    this.DelAction?.Invoke();

                                };
                                var functionDiv = new FunctionControlZone(function, deviceDelAction)