2022=03-18-01

wjc

2022-03-18 d44d009da78f96fe50e6dc7c1883e79ffb1aff58

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

@@ -61,8 +61,9 @@
            }
            LoadDiv();

            btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/{function.IconName}.png";

         
                btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/{function.IconName}.png";
            
            if (SPK.CurtainSpkList().Contains(function.spk))
            {//窗帘没有开关按钮
                CurtainFragment();
@@ -90,6 +91,10 @@
                        this.AddChidren(btnTipPowerLow);
                    }
                }
            }
            else if (function.spk == SPK.DoorLock)
            {
                btnIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/DoorLock.png";
            }
            else
            {
@@ -160,6 +165,8 @@

            LoadEvent_DivSkipEvent();
            LoadEvent_FunctionCollection();

   
        }

        /// <summary>
@@ -212,9 +219,27 @@
                UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
                IsSelected = function.collect
            };
            if ( !SPK.ArmSensorSpkList().Contains(function.spk) && !SPK.EnvironDeviceSpkList().Contains( function.spk))//!DB_ResidenceData.Instance.CurrentRegion.isOtherShare &&
            if ( !SPK.ArmSensorSpkList().Contains(function.spk)
                && function.spk != SPK.DoorLock
                && !SPK.EnvironDeviceSpkList().Contains( function.spk))//!DB_ResidenceData.Instance.CurrentRegion.isOtherShare &&
            {
                bodyDiv.AddChidren(btnCollectionIcon);
            }

            if (!function.online)
            {
                bodyDiv.BackgroundColor = CSS_Color.PromptingColor2;
                var btnOffline = new Button()
                {
                    X = Application.GetRealWidth(8 + 10 + 32),
                    Y = Application.GetRealHeight(28 + 24),
                    Height = Application.GetRealHeight(30),
                    TextID = StringId.DeviceOffline,
                    TextColor = CSS_Color.WarningColor,
                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                    TextAlignment = TextAlignment.CenterLeft
                };
                bodyDiv.AddChidren(btnOffline);
            }
        }

@@ -332,7 +357,7 @@
                btnCurtainOpen.UnSelectedImagePath = "FunctionIcon/Curtain/CurtainUpIcon.png";
                btnCurtainOpen.SelectedImagePath = "FunctionIcon/Curtain/CurtainUpIconOn.png";
            }
            LoadEvent_ControlCurtain(btnCurtainStop, btnCurtainOpen, btnCurtainClose, function);
            LoadEvent_ControlCurtain(btnCurtainStop, btnCurtainOpen, btnCurtainClose);
            #endregion
        }
        /// <summary>
@@ -437,5 +462,8 @@
            };
            bodyDiv.AddChidren(btnLastStates);
        }



    }
}