合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

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

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

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

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

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

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

                {

                    string unSelectPath = string.Empty;

@@ -291,7 +292,7 @@


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

                    //获取图片

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

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

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

                    {

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