合并了晾衣架(非新云端)

黄学彪

2020-12-14 e90209beae6a4e822cecb18e6889f8bda23f630e

 ZigbeeApp/Shared/Phone/Category/AddOrEditorSceneForm.cs

@@ -233,7 +233,7 @@


            //信息编辑

            var btnTitle = new NormalViewControl(300, 60, true);

            btnTitle.X = HdlControlResourse.XXLeft;

            btnTitle.X = ControlCommonResourse.XXLeft;

            btnTitle.Y = Application.GetRealHeight(46);

            btnTitle.TextSize = 15;

            btnTitle.TextID = R.MyInternationalizationString.uInfoEditor;

@@ -353,7 +353,7 @@
                if (listAdjustTarget[i].Type == 0)

                {

                    //设备

                    var device = HdlDeviceCommonLogic.Current.GetDevice(listAdjustTarget[i].DeviceAddr, listAdjustTarget[i].Epoint);

                    var device = Common.LocalDevice.Current.GetDevice(listAdjustTarget[i].DeviceAddr, listAdjustTarget[i].Epoint);

                    if (device == null)

                    {

                        //不显示这个不存在本地的设备

@@ -414,12 +414,12 @@
        private void AddDeviceTargetRow(Scene.DeviceListData data, int index, bool addLine)

        {

            //设备

            var device = HdlDeviceCommonLogic.Current.GetDevice(data.DeviceAddr, data.Epoint);

            var device = Common.LocalDevice.Current.GetDevice(data.DeviceAddr, data.Epoint);

            var rowDevice = new DeviceRoomControl(device, frameTargetTableControl.rowSpace / 2);

            rowDevice.MainKeys = index.ToString();

            this.frameTargetTableControl.AddChidren(rowDevice);

            //控件向右偏移

            rowDevice.frameTable.LeftOffset = Application.GetRealWidth(104) - HdlControlResourse.XXLeft;

            rowDevice.frameTable.LeftOffset = Application.GetRealWidth(104) - ControlCommonResourse.XXLeft;

            rowDevice.InitControl();

            rowDevice.frameTable.UseClickStatu = false;



@@ -550,7 +550,7 @@
            rowScene.MainKeys = index.ToString();

            frameTargetTableControl.AddChidren(rowScene);

            //控件向右偏移

            rowScene.frameTable.LeftOffset = Application.GetRealWidth(104) - HdlControlResourse.XXLeft;

            rowScene.frameTable.LeftOffset = Application.GetRealWidth(104) - ControlCommonResourse.XXLeft;

            rowScene.InitControl();

            if (addLine == true)

            {

@@ -610,7 +610,7 @@
            rowDelay.MainKeys = index.ToString();

            frameTargetTableControl.AddChidren(rowDelay);

            //控件向右偏移

            rowDelay.frameTable.LeftOffset = Application.GetRealWidth(104) - HdlControlResourse.XXLeft;

            rowDelay.frameTable.LeftOffset = Application.GetRealWidth(104) - ControlCommonResourse.XXLeft;

            rowDelay.frameTable.UseClickStatu = false;

            //图标

            var btnIcon = rowDelay.frameTable.AddLeftIcon();

@@ -678,6 +678,10 @@
                };

            }

        }



        #endregion



        #region ■ 获取执行目标_______________________



        /// <summary>

        /// 从网关获取场景的执行目标

@@ -751,7 +755,7 @@
                    this.isAdjustTargetChanged = true;

                    foreach (var mainKey in dicData.Keys)

                    {

                        var device = HdlDeviceCommonLogic.Current.GetDevice(mainKey);

                        var device = LocalDevice.Current.GetDevice(mainKey);

                        var data = new Scene.DeviceListData();

                        data.Type = 0;

                        data.DeviceAddr = device.DeviceAddr;