代码合并

黄学彪

2019-12-20 23fb45dd846ed8b62304c408c6bbe64265d4ac8b

 ZigbeeApp/Shared/Phone/Device/Category/SelectScene.cs

@@ -40,7 +40,10 @@
        /// sceneUI
        /// </summary>
        public SceneUI sceneUI;

        /// <summary>
        /// 当前场景本身，添加场景时使用
        /// </summary>
        public SceneUI currentSceneUI;

        #endregion

@@ -270,6 +273,10 @@
                for (int i = 0; i < sceneList.Count; i++)
                {
                    var scene = sceneList[i];
                    if (currentSceneUI?.Id == scene.Id)
                    {
                        continue;
                    }
                    if (beforeSceneTargetDeviceUIs.Find((obj) => obj.SceneUI.Id == scene.Id) != null)
                    {
                        continue;
@@ -286,7 +293,7 @@
                    sceneRowLayout.Init();
                    sceneRowLayout.SetTitle(scene.Name);
                    sceneRowLayout.ClickButton.Tag = scene;
                    if(sceneUI==null)
                    if (sceneUI == null)
                    {
                        if (i == 0)
                        {
@@ -297,7 +304,7 @@
                    }
                    else
                    {
                        if(sceneUI.Id==scene.Id)
                        if (sceneUI.Id == scene.Id)
                        {
                            tempSceneRow = sceneRowLayout;
                            sceneUI = scene;