备份

xm

2020-07-10 acb2b278663952ce555b06a2e821f359225f15e0

 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFunctionSettionForm.cs

old mode 100644
new mode 100755
File was renamed from Home0630/Shared/Phone/UserCenter/Device/DeviceFunctionSettionForm.cs
@@ -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;

@@ -426,17 +426,17 @@
                {

                    //只要同一种类型的

                    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;
                    }
                }



                //获取设备属于【简约多功能面板】

                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);

@@ -478,11 +478,11 @@
                listIcon.Insert(0, listTemp);

            }

            return listIcon;

        }
        }

        #endregion




        #region ■ 回路选择___________________________




        /// <summary>

        /// 回路选择事件

        /// </summary>