请合并代码

xm

2020-04-16 6fa9d69da922c8049f5acfcbb9ce9fd26811024c

 ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs

@@ -2,7 +2,6 @@
using System.Collections.Generic;
using Microsoft.AppCenter.Crashes;
using Shared.Common;
using Shared.Phone.Device.Light;
using Shared.Phone.UserCenter.Device;
using ZigBee.Device;
using static ZigBee.Device.BindObj;
@@ -10,19 +9,8 @@

namespace Shared.Phone.UserCenter.DeviceBind
{
    public class AddScenePage : BindCommonLayout, ZigBee.Common.IStatus
    public class AddScenePage : BindCommonLayout
    {
        /// <summary>
        /// 按键模式接收
        /// </summary>
        /// <param name="common">Common.</param>
        public void Changed(CommonDevice common)
        {
            Shared.Application.RunOnMainThread(() =>
            {
            });
        }

        /// 构造函数
        /// </summary>
        /// <param name="doorLock"></param>
@@ -112,8 +100,8 @@

            var btnBindDown = new Button
            {
                Height = Application.GetRealHeight(69),
                Width = Application.GetRealWidth(69),
                Height = Application.GetMinReal(69),
                Width = Application.GetMinReal(69),
                X = Application.GetRealWidth(200 - 77),
                UnSelectedImagePath = "BindPic/BindDown.png",
                Gravity = Gravity.CenterVertical,
@@ -495,8 +483,8 @@

                var btnRoomFrameLayout = new FrameLayout
                {
                    Height = Application.GetRealHeight(159),
                    Width = Application.GetRealWidth(255),
                    Height = Application.GetMinReal(159),
                    Width = Application.GetMinReal(255),
                    Y = Application.GetRealHeight(23),
                    X = Application.GetRealWidth(5),
                    BackgroundImagePath = "Item/RoomIconBackground.png",
@@ -615,8 +603,8 @@
                {
                    X = Application.GetMinRealAverage(58),
                    Y = Application.GetMinRealAverage(46),
                    Width = Application.GetMinRealAverage(81),
                    Height = Application.GetMinRealAverage(81),
                    Width = Application.GetMinReal(81),
                    Height = Application.GetMinReal(81),
                    UnSelectedImagePath = "Scene/SceneIcon.png",// scene.IconPath,

                };
                rowLayout.AddChidren(devicePic);
@@ -633,8 +621,8 @@

                var btnChoose = new Button()
                {
                    Width = Application.GetRealWidth(60),
                    Height = Application.GetRealHeight(60),
                    Width = Application.GetMinReal(60),
                    Height = Application.GetMinReal(60),
                    X = Application.GetRealWidth(861 + 81),
                    Y = Application.GetRealHeight(35),
                    SelectedImagePath = "DoorLock/SelectedIcon.png",
@@ -773,8 +761,8 @@

            var sidelipFrameLayout = new FrameLayout()
            {
                Height = Application.GetRealHeight(783),
                Width = Application.GetRealWidth(449),
                Height = Application.GetMinReal(783),
                Width = Application.GetMinReal(449),
                Y = Application.GetRealHeight(161),
                X = Application.GetRealWidth(596),
                BackgroundImagePath = "DoorLock/SideslipPic.png",
@@ -816,8 +804,8 @@

                var btnAllMethod = new Button()
                {
                    Width = Application.GetRealWidth(81),
                    Height = Application.GetRealHeight(81),
                    Width = Application.GetMinReal(81),
                    Height = Application.GetMinReal(81),
                    Y = Application.GetRealHeight(55),
                    UnSelectedImagePath = "Floor/Floor.png",
                    SelectedImagePath = "Floor/FloorSelected.png",
@@ -968,18 +956,6 @@
                }
            }
            return tempSceneUIList;
        }

        public void DeviceInfoChange(CommonDevice common, string typeTag)
        {
        }

        public void ChangedILogicStatus(ZigBee.Device.Logic logic)
        {
        }

        public void ChangedISceneStatus(Scene scene)
        {
        }
    }
}