新云端Ver1.3

黄学彪

2020-12-17 9f326f4000847e6167d8166fa2f6a66f53cb3734

 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)

                {

@@ -290,9 +290,9 @@
                    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, ref unSelectPath, ref selectPath);

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

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

                    {

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