merge dev-wxw to Dev-Branch

Davin

2023-07-21 fed85eb8733eb50c459f2f75ad469598bd26f7b6

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

@@ -446,6 +446,7 @@
            };
            if ( !SPK.ArmSensorSpkList().Contains(function.spk)
                && function.spk != SPK.DoorLock
                && function.spk != SPK.GroupControl
                && !SPK.EnvironDeviceSpkList().Contains( function.spk))//!DB_ResidenceData.Instance.CurrentRegion.isOtherShare &&
            {
                bodyDiv.AddChidren(btnCollectionIcon);