合并了代码

黄学彪

2020-12-31 fe3b2466c68b5db70d38e78039703add3b8b1dfe

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

@@ -7,6 +7,9 @@
using static ZigBee.Device.Panel;
namespace Shared.Phone.UserCenter.Device.Bind
{
    /// <summary>
    /// 特殊面板的绑定界面【只能绑定特定类型，每种类型只有一个目标】
    /// </summary>
    public class PaneTargetsBaseForm : BindCommonLayout
    {
        #region  构造函数
@@ -299,8 +302,8 @@

            btnFinifh = new Button()
            {
                Width = Application.GetRealWidth(907),

                Height = Application.GetRealHeight(127),

                Width = Application.GetRealWidth(907),
                Height = Application.GetRealHeight(127),
                Y = Application.GetRealHeight(49 + 35),
                Gravity = Gravity.CenterHorizontal,
                Radius = (uint)Application.GetRealHeight(127) / 2,
@@ -553,13 +556,13 @@
                {
                    line2.Visible = false;
                }
                if (Common.LocalDevice.Current.CheckDeviceIsOnline(device) == true)

                {

                    btnBindName.TextColor = Shared.Common.ZigbeeColor.Current.TextBlack;

                }

                else

                {

                    btnBindName.TextColor = Shared.Common.ZigbeeColor.Current.XMGray3;

                if (Common.LocalDevice.Current.CheckDeviceIsOnline(device) == true)
                {
                    btnBindName.TextColor = Shared.Common.ZigbeeColor.Current.TextBlack;
                }
                else
                {
                    btnBindName.TextColor = Shared.Common.ZigbeeColor.Current.XMGray3;
                }
                switch (curDeviceBindType)
                {
@@ -841,10 +844,10 @@
                                    {
                                        curControlDev.currentSelectRoomId = tempDevRoom.Id;
                                        curControlDev.currentSelectFloorId = tempDevRoom.FloorId;
                                    }

                                    else

                                    {

                                        curControlDev.currentSelectRoomId = "UndistributedId";

                                    }
                                    else
                                    {
                                        curControlDev.currentSelectRoomId = "UndistributedId";
                                    }
                                }