优化代码，更改门锁需求接口

xm

2020-04-29 07466c19110693e3e439a7d7c8ad0bc21d9b3287

 ZigbeeApp/Shared/Phone/Category/SelectFloorForm.cs

File was renamed from ZigbeeApp/Shared/Phone/Device/Category/SelectFloor.cs
@@ -2,9 +2,9 @@
using System.Collections.Generic;
using Shared.Common;

namespace Shared.Phone.Device.Category
namespace Shared.Phone.Category
{
    public class SelectFloor : FrameLayout
    public class SelectFloorForm : UserCenter.FrameLayoutBase
    {

        public Action<string> FloorAction;
@@ -22,7 +22,7 @@
        /// <summary>
      /// Init
      /// </summary>
      public void Init(int x, int y, CommonForm.Direction direction = CommonForm.Direction.Left)
      public void Init(int x, int y, Device.CommonForm.Direction direction = Device.CommonForm.Direction.Left)
        {
            dialogBackground = new Dialog
            {
@@ -43,8 +43,8 @@
            {
                X = Application.GetRealWidth(x),
                Y = Application.GetRealHeight(y),
                Width = Application.GetMinRealAverage(449),
                Height = Application.GetMinRealAverage(773),
                Width = this.GetPictrueRealSize(449),
                Height = this.GetPictrueRealSize(773),
                UnSelectedImagePath = "Floor/SelectFloor_Left_4.png"
            };
            dialog.AddChidren(bg);
@@ -53,16 +53,16 @@
            {
                X = Application.GetRealWidth(x),
                Y = Application.GetRealHeight(y + 23),
                Width = Application.GetMinRealAverage(449),
                Height = Application.GetMinRealAverage(773 - 23)
                Width = this.GetPictrueRealSize(449),
                Height = this.GetPictrueRealSize(773 - 23)
            };
            dialog.AddChidren(backgroundFL);

            var tip = new Button
            {
                X = Application.GetRealWidth(80),
                Width = Application.GetMinRealAverage(350),
                Height = Application.GetMinRealAverage(150),
                Width = this.GetPictrueRealSize(350),
                Height = this.GetPictrueRealSize(150),
                TextColor = ZigbeeColor.Current.GXCTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                TextID = R.MyInternationalizationString.SelectFloor,
@@ -74,8 +74,8 @@
            var floorLayout = new VerticalScrolViewLayout
            {
                Y = tip.Bottom,
                Width = Application.GetMinRealAverage(449),
                Height = Application.GetMinRealAverage(600),
                Width = this.GetPictrueRealSize(449),
                Height = this.GetPictrueRealSize(600),
                VerticalScrollBarEnabled = false
            };
            backgroundFL.AddChidren(floorLayout);
@@ -85,7 +85,7 @@
            if (floorCount > 0)
            {
                string directStr = string.Empty;
                if (direction == CommonForm.Direction.Right)
                if (direction == Device.CommonForm.Direction.Right)
                {
                    directStr = "Right";
                }
@@ -97,16 +97,16 @@
                if (floorCount > 5)
                {
                    bg.UnSelectedImagePath = $"Floor/SelectFloor_{directStr}_5.png";
                    bg.Height = Application.GetMinRealAverage(150*6+23);
                    backgroundFL.Height = Application.GetMinRealAverage(150 * 6);
                    floorLayout.Height = Application.GetMinRealAverage(150 * 5);
                    bg.Height = this.GetPictrueRealSize(150*6+23);
                    backgroundFL.Height = this.GetPictrueRealSize(150 * 6);
                    floorLayout.Height = this.GetPictrueRealSize(150 * 5);
                }
                else
                {
                    bg.UnSelectedImagePath = $"Floor/SelectFloor_{directStr}_{floorCount}.png";
                    bg.Height = Application.GetMinRealAverage(150 * (floorCount + 1)+23);
                    backgroundFL.Height = Application.GetMinRealAverage(150 * (floorCount + 1));
                    floorLayout.Height = Application.GetMinRealAverage(150 * floorCount);
                    bg.Height = this.GetPictrueRealSize(150 * (floorCount + 1)+23);
                    backgroundFL.Height = this.GetPictrueRealSize(150 * (floorCount + 1));
                    floorLayout.Height = this.GetPictrueRealSize(150 * floorCount);
                }

                foreach (var floor in Config.Instance.Home.FloorDics)
@@ -122,9 +122,9 @@
        /// <param name="verticalScrolView"></param>
        private void AddFloor(VerticalScrolViewLayout verticalScrolView, KeyValuePair<string, string> floor,bool isLast=false)
        {
            var frow = new CommonForm.LeftIconButtonRow(449, 150);
            frow.Width = Application.GetMinRealAverage(449);
            frow.Height = Application.GetMinRealAverage(150);
            var frow = new Device.CommonForm.LeftIconButtonRow(449, 150);
            frow.Width = this.GetPictrueRealSize(449);
            frow.Height = this.GetPictrueRealSize(150);
            frow.Tag = floor.Key;
            frow.Init("Floor/Floor.png", "Floor/FloorSelected.png", floor.Value);
            verticalScrolView.AddChidren(frow);
@@ -154,15 +154,15 @@
        /// <param name="mouseEventArgs"></param>
        private void SelectFloor_MouseUpEvent(object sender, MouseEventArgs mouseEventArgs)
        {
            (sender as CommonForm.LeftIconButtonRow).IsSelected = true;
            (sender as Device.CommonForm.LeftIconButtonRow).IsSelected = true;
            if (changeFloor)
            {
                Config.Instance.Home.CurrentFloorId = (sender as CommonForm.LeftIconButtonRow).Tag.ToString();
                Config.Instance.Home.CurrentFloorId = (sender as Device.CommonForm.LeftIconButtonRow).Tag.ToString();
                Config.Instance.Home.Save(false);
                UserCenter.HdlRoomLogic.Current.RefreshRoomListView();
            }
            RemoveView();
            FloorAction?.Invoke((sender as CommonForm.LeftIconButtonRow).Tag.ToString());
            FloorAction?.Invoke((sender as Device.CommonForm.LeftIconButtonRow).Tag.ToString());

        }