请合并最新多功能面板代码

xm

2020-07-21 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d

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

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

            {

                //楼层菜单

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

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

                foreach (var floorId in dicFloor.Keys)

                {

                    contr.AddRowMenu(floorId, () =>

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


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

                    //获取图片

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

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

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

                    {

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