上传合并后的代码

黄学彪

2020-04-28 e22fdb94322e6cec38e5e4a9aec13d431a133fde

 ZigbeeApp/Shared/Phone/Device/CommonForm/SceneCategoryView.cs

@@ -5,7 +5,7 @@

namespace Shared.Phone.Device.CommonForm
{
    public class SceneCategoryView : RowLayout
    public class SceneCategoryView : RowLayoutBase

    {

        #region ■ 变量声明___________________________

@@ -84,8 +84,8 @@
            };
            
            //延时时间
            this.btnDelayTime = new NormalViewControl(200, 58, true);
            btnDelayTime.X = Application.GetRealWidth(780);
            this.btnDelayTime = new NormalViewControl(400, 58, true);

            btnDelayTime.X = Application.GetRealWidth(580);

            btnDelayTime.Y = Application.GetRealHeight(317);
            btnDelayTime.Text = CommonFormResouce.GetTimeString(scene.SceneDelayTime);
            btnDelayTime.TextAlignment = TextAlignment.CenterRight;

@@ -97,8 +97,8 @@
            this.btnDelayIcon = new IconViewControl(52);

            btnDelayIcon.X = Application.GetRealWidth(900);

            btnDelayIcon.Y = Application.GetRealHeight(30);
            btnDelayIcon.Width = Application.GetMinRealAverage(52);
            btnDelayIcon.Height = Application.GetMinRealAverage(52);

            btnDelayIcon.Width = this.GetPictrueRealSize(52);

            btnDelayIcon.Height = this.GetPictrueRealSize(52);

            btnDelayIcon.UnSelectedImagePath = "Scene/Delaying.png";
            this.AddChidren(btnDelayIcon);

            btnDelayIcon.Visible = false;

@@ -169,6 +169,14 @@
                alert.Show();

                alert.ConfirmClickEvent += async () =>

                {

                    //如果当前住宅是虚拟住宅

                    if (Common.Config.Instance.Home.IsVirtually == true)

                    {

                        //移除缓存

                        HdlSceneLogic.Current.DeleteLocalScene(scene);

                        RemoveFromParent();

                        return;

                    }

                    //0 移除失败 1 移除成功 2 没有该场景

                    var removeSceneAllData = await ZigBee.Device.Scene.DeleteSceneAsync(scene.Id);

                    if (removeSceneAllData == null || removeSceneAllData.removeSceneData == null)

@@ -179,7 +187,7 @@
                    //1成功

                    if (removeSceneAllData.removeSceneData.Result == 1)

                    {

                        HdlSceneLogic.Current.RemoveScene(scene);

                        HdlSceneLogic.Current.DeleteLocalScene(scene);

                        RemoveFromParent();

                    }

                    //0 移除失败

@@ -191,7 +199,7 @@
                    //2 没有该场景

                    else if (removeSceneAllData.removeSceneData.Result == 2)

                    {

                        HdlSceneLogic.Current.RemoveScene(scene);

                        HdlSceneLogic.Current.DeleteLocalScene(scene);

                        RemoveFromParent();

                        return;

                    }