2019.12.20

gxc

2019-12-20 a2b0218c104808fc686a40f258b48dc70bdd7170

 ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs

@@ -117,14 +117,21 @@
        {
            devList = Shared.Common.Room.CurrentRoom.GetUnalloctedDeviceUIs();
            sceneList = Shared.Common.Room.CurrentRoom.GetUnalloctedScenes();
            var sameDevList = new List<DeviceUI> { };
            typeDeviceDic.Clear();
            typeIdDic.Clear();
            foreach (var device in devList)
            {
                var info = Common.LocalDevice.Current.GetNotHdlMyDeviceEnumInfo(new List<CommonDevice> { device.CommonDevice });
                sameDevList.Add(device);
                typeDeviceDic[info.BeloneTextId] = sameDevList;
                if (typeDeviceDic.ContainsKey(info.BeloneTextId) == false)
                {
                    var sameDevList = new List<DeviceUI> { };
                    sameDevList.Add(device);
                    typeDeviceDic[info.BeloneTextId] = sameDevList;
                }
                else
                {
                    typeDeviceDic[info.BeloneTextId].Add(device);
                }
                typeIdDic[info.BeloneTextId] = info.ConcreteType;
            }
        }
@@ -377,7 +384,7 @@

                    functionTypeIMG.ClickBtn.MouseUpEventHandler += ShowSameTypeFunction;

                    if (typeRowLayout.ChildrenCount == 1)
                    if (functionTypeScrowView.ChildrenCount == 1)
                    {
                        ShowSameTypeFunction(functionTypeIMG.ImageBtn, null);
                    }