先上传一个版本

黄学彪

2020-04-08 4dce704aaf8587cf3f91cf88f2208315a03c4cbb

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

@@ -124,21 +124,29 @@
            //划线

            btnType.AddBottomLine();



            //所属区域

            //安装位置

            var rowBeloneArea = new BelongAreaControl(listview.rowSpace / 2);

            listview.AddChidren(rowBeloneArea);

            rowBeloneArea.InitControl(Language.StringByID(R.MyInternationalizationString.uBelongArea), this.listNewDevice);

            rowBeloneArea.InitControl(Language.StringByID(R.MyInternationalizationString.uInstallationLocation), this.listNewDevice);

            //底线

            rowBeloneArea.AddBottomLine();



            var listCheck = new List<string>();

            rowBeloneArea.SelectRoomEvent += (roomKeys) =>

            {

                //选择未分配时,清空

                if (roomKeys == string.Empty) { listCheck = new List<string>(); }

                foreach (var device in this.listNewDevice)

                {

                    if (device is OTADevice)

                    {

                        //针对单纯只有一个200端点的设备

                        continue;

                    }

                    if (roomKeys == string.Empty)

                    {

                        //如果选择的是未分配，则它的全部回路无条件全部清空房间

                        HdlRoomLogic.Current.ChangedRoom(device, roomKeys);

                        continue;

                    }

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

@@ -1176,18 +1184,8 @@
        {

            //检测此回路是否拥有定位功能(拿端点最小的那个回路去定位)

            bool canTest = Common.LocalDevice.Current.DeviceIsCanFixedPosition(listNewDevice[0]);

            if (this.deviceEnumInfo.BeloneType == DeviceBeloneType.A智能门锁)

            {

                canTest = false;

            }

            else if (this.deviceEnumInfo.BeloneType == DeviceBeloneType.A传感器

                && this.deviceEnumInfo.ConcreteType != DeviceConcreteType.Sensor_Pir)

            {

                //传感器除了Pir都没有定位功能

                canTest = false;

            }

            
            var frame = new TopRightMenuControl(canTest == true ? 2 : 1, 1);



            string deviceMenu = string.Empty;

            if (canTest == true)

            {