mac
2023-11-06 54c202bd4867092fca2bc6f96bec0cfd1056a46a
HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
@@ -12,7 +12,7 @@
        /// <summary>
        /// 当前窗体
        /// </summary>
        static FrameLayout bodyView;
        public static FunctionPage bodyView;
        /// <summary>
        /// 楼层选择下拉图标
        /// </summary>
@@ -30,10 +30,32 @@
        List<Function> functionList;
        int titleId;
        public Action DelAction;
        public FunctionPage()
        {
            bodyView = this;
            functionList = new List<Function>();
        }
        /// <summary>
        /// 重载界面
        /// </summary>
        public void ReLoadPage()
        {
            if (bodyView != null)
            {
                try
                {
                    bodyView.RemoveAll();
                    LoadPage(this.titleId);
                    functionList = new List<Function>();
                }
                catch (Exception ex)
                {
                    MainPage.Log($"FunctionPage ReloadPage error :\r\n {ex.Message}");
                }
            }
        }
        public void LoadPage(int titleId_out)
@@ -143,12 +165,12 @@
            if (titleId == StringId.Lights)
            {
                functionList.AddRange(FunctionList.List.groupControls);
                //functionList.AddRange(FunctionList.List.groupControls);
                functionList.AddRange(FunctionList.List.GetLightList());
            }
            else if(titleId == StringId.HorseRaceLamp)
            {
                functionList.AddRange(FunctionList.List.GetSeries());
            }
            else if (titleId == StringId.AC)
            {
@@ -164,7 +186,9 @@
            }
            else if (titleId == StringId.Electric)
            {
                functionList.AddRange(FunctionList.List.GetElectricals());
            }
            else if (titleId == StringId.EnvironmentalScience)
            {
@@ -178,13 +202,17 @@
            {
                functionList.AddRange(FunctionList.List.GetAirFreshList());
            }
            else if(titleId == StringId.MechanicalArm)
            else if (titleId == StringId.MechanicalArm)
            {
                functionList.AddRange(FunctionList.List.GetMechanicalArmList());
            }
            else if(titleId == StringId.SecurityMonitoring)
            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();
@@ -250,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)
                                {
@@ -284,9 +312,38 @@
                                functionListView.AddChidren(functionDiv);
                            }
                            else if (function.spk == SPK.ElectricalTvHisense)
                            {
                                Action deviceDelAction = () =>
                                {
                                    //删除设备成功后更新UI
                                    if (functionListView==null) {
                                        return;
                                    }
                                    functionListView.RemoveAll();
                                    showList.Remove(function);//先移除
                                    ShowFunctionRow(showList,isAppend);
                                    this.DelAction?.Invoke();
                                };
                                var functionDiv = new FunctionControlZone(function, deviceDelAction)
                                {
                                    Gravity = Gravity.CenterHorizontal,
                                    Width = Application.GetRealWidth(343),
                                    Height = Application.GetRealHeight(96),
                                    Radius = (uint)Application.GetMinRealAverage(12),
                                    BorderColor = 0x00FFFFFF,
                                    BorderWidth = 1,
                                    BackgroundColor = CSS_Color.MainBackgroundColor,
                                    Tag = function.spk + function.sid
                                };
                                functionDiv.LoadFunctionDiv();
                                functionDiv.OrderEvent = OrderEvent;
                                functionListView.AddChidren(functionDiv);
                            }
                            else
                            {
                                var functionDiv = new FunctionControlZone(function,null)
                                var functionDiv = new FunctionControlZone(function, null)
                                {
                                    Gravity = Gravity.CenterHorizontal,
                                    Width = Application.GetRealWidth(343),