合并代码

黄学彪

2020-01-10 985abd7ee6049147119518aa41fb2d08c0cfc40d

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

@@ -79,7 +79,7 @@
                Text = Language.StringByID(R.MyInternationalizationString.FirstFloor),
                TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
                TextSize = 14,
                IsBold =true,
                IsBold = true,
                TextAlignment = TextAlignment.CenterRight,
            };
            btnAddFrameLayout.AddChidren(btnFloorText);
@@ -146,7 +146,7 @@
                TextID = R.MyInternationalizationString.Save,
                BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack,
                TextColor = Shared.Common.ZigbeeColor.Current.XMWhite,
                IsBold =true,
                IsBold = true,
                TextSize = 16,
            };
            bottomFrameLayout.AddChidren(btnFinifh);
@@ -205,7 +205,6 @@
            Shared.Common.Room curRoom = roomList[0];
            int index = 0;
            RefreshRoomList(curRoom, ref index);
            //RefreshSceneList(roomList[index]);

            if (curRoom.SceneUIList.Count == 0)
            {
@@ -591,11 +590,11 @@

                var btnBindName = new Button()
                {
                    Width = Application.GetRealWidth(500 - 120),
                    Width = Application.GetRealWidth(790),
                    X = devicePic.Right + Application.GetRealWidth(20),
                    TextColor = Shared.Common.ZigbeeColor.Current.TextBlack,
                    TextAlignment = TextAlignment.CenterLeft,
                    TextSize =15,
                    TextSize = 15,
                };
                rowLayout.AddChidren(btnBindName);