HDL Home App 第二版本 旧平台金堂用 正在使用
xm
2020-05-29 ca233e3c6154859a17948d892fbc6bbf723b60a8
ZigbeeApp20200525/Shared/Phone/UserCenter/Device/DeviceFunctionSettionForm.cs
old mode 100755 new mode 100644
@@ -276,8 +276,8 @@
        private void InitDeviceEpointIcon(VerticalFrameControl listBackControl)
        {
            //获取按组分配的设备
            var listIcon = this.GetAllDeviceGroup();
            var listIcon = this.GetAllDeviceGroup();
            var frameBorder = new FrameLayout();
            frameBorder.Y = Application.GetRealHeight(147);
            frameBorder.Gravity = Gravity.CenterHorizontal;
@@ -355,7 +355,7 @@
                //计算真实高度
                int realHeight = this.GetPictrueRealSize(58 + 58);//上下间距
                realHeight += frameBack.ChildrenCount * this.GetPictrueRealSize(124);//圆圈高度
                realHeight += (frameBack.ChildrenCount-1) * this.GetPictrueRealSize(60);//圆圈间距
                realHeight += (frameBack.ChildrenCount - 1) * this.GetPictrueRealSize(60);//圆圈间距
                if (realHeight > frameBack.Height)
                {
                    //变更高度
@@ -426,7 +426,19 @@
                {
                    //只要同一种类型的
                    continue;
                }
                //获取设备属于【简约多功能面板】
                var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listDevice);
                if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_SimpleMultifunction)
                {
                    if (device.Type == DeviceType.TemperatureSensor && device.DeviceEpoint == 1)
                    {
                        //简约多功能面板第1回路是一个绑定温湿度传感器第类型,不是真的温湿度的传感器,需要屏蔽掉
                        continue;
                    }
                }
                listRelay.Add(device);
                if (device.DeviceEpoint == deviceObj.DeviceEpoint)
                {
@@ -466,12 +478,11 @@
                listIcon.Insert(0, listTemp);
            }
            return listIcon;
        }
        }
        #endregion
        #region ■ 回路选择___________________________
        /// <summary>
        /// 回路选择事件
        /// </summary>