代码合并

黄学彪

2019-12-20 23fb45dd846ed8b62304c408c6bbe64265d4ac8b

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

@@ -81,7 +81,6 @@
            var btnAddFrameLayout = new FrameLayout
            {
                X = Application.GetRealWidth(830),
                Width = Application.GetRealWidth(200),
            };
            this.titleFrameLayout.AddChidren(btnAddFrameLayout);

@@ -115,6 +114,14 @@
            {
                SideslipFramelayout();
            };
            if (Common.Config.Instance.Home.FloorDics.Count == 0)
            {
                btnAddFrameLayout.Width = 0;
            }
            else
            {
                btnAddFrameLayout.Width = Application.GetRealWidth(200);
            }
            MidFrameLayoutContent(btnFloorText);
        }

@@ -532,6 +539,7 @@
            int curIndex = 0;
            foreach (var device in curTypeDeviceList)
            {
                curIndex++;
                if (device.CommonDevice != null && device.CommonDevice.IsOnline == 0)
                {
                    continue;
@@ -651,8 +659,6 @@
                        btnChoose.Visible = true;
                    }
                }

                curIndex++;
            }
            if (targetList.Count == 0)
            {