合并了代码

黄学彪

2020-12-31 fe3b2466c68b5db70d38e78039703add3b8b1dfe

 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionAddTargetsForm.cs

@@ -240,8 +240,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,
@@ -539,13 +539,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 (curBindType)
                {
@@ -1339,7 +1339,6 @@
                                curD.BindScenesId = dev.BindScenesId;
                                curD.BindMacAddr = dev.BindMacAddr;
                                curD.BindEpoint = dev.BindEpoint;
                                curD.ESName = dev.ESName;
                                curD.BindType = dev.BindType;
                                bList.Add(curD);