新云端代码Ver1.2

黄学彪

2020-12-16 0d9f64668fd7350d6a21fd157e32009a96d98134

 ZigbeeApp/Shared/Phone/Category/AddOrEditorSceneForm.cs

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


            //信息编辑

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

            btnTitle.X = ControlCommonResourse.XXLeft;

            btnTitle.X = HdlControlResourse.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 = Common.LocalDevice.Current.GetDevice(listAdjustTarget[i].DeviceAddr, listAdjustTarget[i].Epoint);

                    var device = HdlDeviceCommonLogic.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 = Common.LocalDevice.Current.GetDevice(data.DeviceAddr, data.Epoint);

            var device = HdlDeviceCommonLogic.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) - ControlCommonResourse.XXLeft;

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

            rowDevice.InitControl();

            rowDevice.frameTable.UseClickStatu = false;



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

            frameTargetTableControl.AddChidren(rowScene);

            //控件向右偏移

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

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

            rowScene.InitControl();

            if (addLine == true)

            {

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

            frameTargetTableControl.AddChidren(rowDelay);

            //控件向右偏移

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

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

            rowDelay.frameTable.UseClickStatu = false;

            //图标

            var btnIcon = rowDelay.frameTable.AddLeftIcon();

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

            }

        }



        #endregion



        #region ■ 获取执行目标_______________________



        /// <summary>

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

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

                    foreach (var mainKey in dicData.Keys)

                    {

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

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

                        var data = new Scene.DeviceListData();

                        data.Type = 0;

                        data.DeviceAddr = device.DeviceAddr;

@@ -867,7 +863,7 @@
                var fileName = $"SceneIcon_{tradeTime}.png";

                //生成文件图片

                IO.FileUtils.WriteFileByBytes(System.IO.Path.Combine(Config.Instance.FullPath, fileName), this.btnScenePic.ImageBytes);

                HdlAutoBackupLogic.AddOrEditorFile(fileName);

                HdlBackupLogic.Current.AddOrEditorAutoBackFileStatu(fileName);

                this.cloneScene.IconPath = fileName;

            }

            //转移属性

@@ -937,7 +933,7 @@
                {

                    //删除自定义图片

                    HdlFileLogic.Current.DeleteFile(System.IO.Path.Combine(Config.Instance.FullPath, this.editorScene.IconPath));

                    HdlAutoBackupLogic.DeleteFile(this.editorScene.IconPath);

                    HdlBackupLogic.Current.DeleteAutoBackFileStatu(this.editorScene.IconPath);

                }

                if (this.cloneScene.IconPathType != 0)

                {

@@ -946,7 +942,7 @@
                    var fileName = $"SceneIcon_{tradeTime}.png";

                    //生成文件图片

                    IO.FileUtils.WriteFileByBytes(System.IO.Path.Combine(Config.Instance.FullPath, fileName), this.btnScenePic.ImageBytes);

                    HdlAutoBackupLogic.AddOrEditorFile(fileName);

                    HdlBackupLogic.Current.AddOrEditorAutoBackFileStatu(fileName);

                    this.cloneScene.IconPath = fileName;

                }

            }