合并了代码

黄学彪

2019-12-30 3dcbd186c42c598c0c08d1cd37034cf2baa09e54

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

@@ -156,7 +156,7 @@
            btnIconContr.ButtonClickEvent += (sender, e) =>

            {

                //楼层菜单

                var contr = new TopRightMenuControl(dicFloor.Count, 449, Language.StringByID(R.MyInternationalizationString.SelectFloor));

                var contr = new TopRightMenuControl(dicFloor.Count, 2, Language.StringByID(R.MyInternationalizationString.SelectFloor));

                foreach (var floorId in dicFloor.Keys)

                {

                    contr.AddRowMenu(dicFloor[floorId], "Floor/Floor.png", "Floor/FloorSelected.png", () =>

@@ -288,9 +288,9 @@
                    string unSelectPath = string.Empty;

                    string selectPath = string.Empty;



                    var typeInfo = Common.LocalDevice.Current.GetNotHdlMyDeviceEnumInfo(new List<CommonDevice>() { device });

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

                    //获取图片

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

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

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

                    {

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