2020-09-03 1.修改风扇默认为关状态。2.Alexa添加设备时，去掉空调和通用开关选择添加支持。 3.场景增加通用开关添加和发送控制支持，A...

JLChen

2020-09-03 d8545fbd1b36a6766c57c987e5d89862b470fed9

 Crabtree/SmartHome/UI/SimpleControl/Phone/Light/UserDeviceToSocket.cs

@@ -67,11 +67,13 @@
                                            if (btn.Tag.ToString () == DeviceType.LightEnergySocket.ToString () + "_Voltage" || btn.Tag.ToString () == DeviceType.LightEnergySwitch.ToString () + "_Voltage") {
                                                btn.Text = energy.ToString () + " W";
                                            }
                                        } else if (updataType == 11) {
                                            if (btn.Tag.ToString () == DeviceType.LightEnergySocket.ToString () + "_Electric" || btn.Tag.ToString () == DeviceType.LightEnergySwitch.ToString () + "_Electric") {
                                                btn.Text = ((double)(Convert.ToDouble (energy) / 10)).ToString () + " kw.h";
                                            }
                                        }
                                        ////2020-07-01 客户提出隐藏kwh
                                        //else if (updataType == 11) {
                                        //    if (btn.Tag.ToString () == DeviceType.LightEnergySocket.ToString () + "_Electric" || btn.Tag.ToString () == DeviceType.LightEnergySwitch.ToString () + "_Electric") {
                                        //        btn.Text = ((double)(Convert.ToDouble (energy) / 10)).ToString () + " kw.h";
                                        //    }
                                        //}
                                    }
                                }
                            }
@@ -482,21 +484,21 @@
                        };
                        lightView.AddChidren (btnEnergy);
                        EnergtLightList.Add (common);

                        //if (common.Type == DeviceType.LightEnergySwitch) {
                            Button btnElectric = new Button () {
                                Width = Application.GetRealWidth (200),
                                Height = Application.GetRealHeight (35),
                                X = Application.GetRealWidth (320),
                                Y = tempSwitch.Bottom,
                                TextColor = SkinStyle.Current.TextColor1,
                                SelectedTextColor = SkinStyle.Current.TextColor1,
                                TextAlignment = TextAlignment.CenterRight,
                                Tag = common.Type.ToString () + "_Electric",
                                Text = "0 kw.h"
                            };
                            lightView.AddChidren (btnElectric);
                        //}
                        //2020-07-01 客户提出隐藏kwh
                        ////if (common.Type == DeviceType.LightEnergySwitch) {
                        //Button btnElectric = new Button () {
                        //        Width = Application.GetRealWidth (200),
                        //        Height = Application.GetRealHeight (35),
                        //        X = Application.GetRealWidth (320),
                        //        Y = tempSwitch.Bottom,
                        //        TextColor = SkinStyle.Current.TextColor1,
                        //        SelectedTextColor = SkinStyle.Current.TextColor1,
                        //        TextAlignment = TextAlignment.CenterRight,
                        //        Tag = common.Type.ToString () + "_Electric",
                        //        Text = "0 kw.h"
                        //    };
                        //    lightView.AddChidren (btnElectric);
                        ////}

                        Button btnEnergyNull = new Button () {
                            Y = Application.GetRealHeight (127),
@@ -513,7 +515,8 @@
                while (readEnergy) {
                    foreach (var c in EnergtLightList) {
                        Control.ControlBytesSend (Command.ReadAnalogValue, c.SubnetID, c.DeviceID, new byte [] { 10, c.LoopID }, SendCount.Zero);
                        Control.ControlBytesSend (Command.ReadAnalogValue, c.SubnetID, c.DeviceID, new byte [] { 11, c.LoopID }, SendCount.Zero);
                        //2020-07-01 客户提出隐藏kwh
                        //Control.ControlBytesSend (Command.ReadAnalogValue, c.SubnetID, c.DeviceID, new byte [] { 11, c.LoopID }, SendCount.Zero);
                        System.Threading.Thread.Sleep (200);
                    }
                    Thread.Sleep (10000);