上传一个版本

黄学彪

2020-03-11 06802250b4b9041d39d568c1dbe77684075006b2

 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs

@@ -61,7 +61,7 @@
            this.deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listNewDevice);



            //设置标题信息

            base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uDeviceInfo));

            base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uDeviceSettion));



            //初始化右上角菜单

            this.InitTopRightMenu();

@@ -141,18 +141,18 @@
                        //针对单纯只有一个200端点的设备

                        continue;

                    }

                    var room = Room.CurrentRoom.GetRoomByDevice(device);

                    var room = HdlRoomLogic.Current.GetRoomByDevice(device);

                    string mainKeys = LocalDevice.Current.GetDeviceMainKeys(device);

                    if (room == null)

                    {

                        //这里有点特殊,如果回路没有设置有区域的时候,才设置

                        listCheck.Add(mainKeys);

                        Room.CurrentRoom.ChangedRoom(device, roomKeys);

                        HdlRoomLogic.Current.ChangedRoom(device, roomKeys);

                    }

                    else if (listCheck.Contains(mainKeys) == true)

                    {

                        //如果这个回路之前都还没有区域,在本界面还没有关闭之前,可以无条件随便变更

                        Room.CurrentRoom.ChangedRoom(device, roomKeys);

                        HdlRoomLogic.Current.ChangedRoom(device, roomKeys);

                    }

                }

                //保存设备房间索引

@@ -648,6 +648,21 @@
                return;

            }



            //2020.03.06新追加：如果全部都是干接点的话,也不能有这个东西

            int dryContactCount = 0;

            for (int i = 0; i < listNewDevice.Count; i++)

            {

                if (listNewDevice[i].Type == DeviceType.OnOffSwitch)

                {

                    dryContactCount++;

                }

            }

            if (listNewDevice.Count == dryContactCount)

            {

                //这个设备全是干接点

                return;

            }



            //功能设置

            string caption = Language.StringByID(R.MyInternationalizationString.uFunctionSettingUp);

            var btnFunction = new FrameRowControl(listview.rowSpace / 2);