新云端代码Ver1.2

黄学彪

2020-12-16 0d9f64668fd7350d6a21fd157e32009a96d98134

 ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetAddMenuForm.cs

@@ -274,7 +274,7 @@


            for (int j = 0; j < i_room.ListDevice.Count; j++)

            {

                var device = Common.LocalDevice.Current.GetDevice(i_room.ListDevice[j]);

                var device = HdlDeviceCommonLogic.Current.GetDevice(i_room.ListDevice[j]);

                //如果那个设备已经添加了，则不再显示

                if (device == null || HdlSafeguardLogic.Current.IsAlarmDeviceExist(this.zoonID, device) == true)

                {

@@ -284,14 +284,15 @@
                 || device.Type == DeviceType.DimmableLight//调光器

                 || device.Type == DeviceType.ColorDimmableLight//彩灯

                 || device.Type == DeviceType.OnOffOutput//继电器

                 || device.Type == DeviceType.ColorTemperatureLight//色温灯

                 || device.Type == DeviceType.WindowCoveringDevice)//窗帘

                {

                    string unSelectPath = string.Empty;

                    string selectPath = string.Empty;



                    var typeInfo = Common.LocalDevice.Current.GetDeviceBelongEnumInfo(device);

                    var typeInfo = HdlDeviceCommonLogic.Current.GetDeviceBelongEnumInfo(device);

                    //获取图片

                    Common.LocalDevice.Current.GetDeviceFunctionTypeMenuIcon(typeInfo.ConcreteType, ref unSelectPath, ref selectPath);

                    HdlDeviceCommonLogic.Current.GetDeviceFunctionTypeMenuIcon(typeInfo, ref unSelectPath, ref selectPath);

                    if (dicRoomData.ContainsKey(typeInfo.BeloneText) == false)

                    {

                        dicRoomData[typeInfo.BeloneText] = new uRowInformation();