合并代码 ver.10086

黄学彪

2020-01-17 4b378188ce972df432b23d9cb73babb6cc0679c6

 ZigbeeApp/Shared/Phone/Device/AC/ACControl.cs

@@ -237,14 +237,6 @@
                                        ac.CleanStatu = attList.AttriButeData == 42;
                                        cleanStatu.Visible = ac.CleanStatu;
                                        break;
                                    case 4099:
                                        var value = Convert.ToString(attList.AttriButeData, 2).PadLeft(16, '0');
                                        var modeStr = value.Substring(value.Length - 5, 5);
                                        for (int j = 0; j < modeStr.Length; j++)
                                        {
                                            ac.listSupportMode[j] = Convert.ToInt32(modeStr[j]) == 49 ? 1 : 0;
                                        }
                                        break;
                                }
                            }
                        }
@@ -500,7 +492,7 @@
                Width = Application.GetRealWidth(600),
                Height = Application.GetRealHeight(60),
                Gravity = Gravity.CenterHorizontal,
                Text = device.CommonDevice.DeviceEpointName,
                Text = Common.LocalDevice.Current.GetDeviceEpointName(device.CommonDevice),
                TextColor = ZigbeeColor.Current.GXCTextBlackColor,
                TextSize = 15,
                IsBold=true
@@ -621,7 +613,6 @@
                SelectedImagePath = ACControlBase.GetFanSwingModeSelectedImagePathByFanSwingModeId(ac.currentFanSwingMode),
                IsSelected = ACControlBase.IsOpen(ac)
            };
            itemView.AddChidren(FanSwingModeBtn);

            modeBtn = new Button()
            {
@@ -659,6 +650,18 @@
            };
            itemView.AddChidren(fanModeBtn);

            if (ac.UseSwingFunction)
            {
                itemView.AddChidren(FanSwingModeBtn);
            }
            else
            {
                modeBtn.X = Application.GetRealWidth(207);
                switchBtn.X = Application.GetRealWidth(444);
                fanModeBtn.X = Application.GetRealWidth(677);
            }


            var roomBG = new Button
            {
                Y = Application.GetRealHeight(1322 - 50),