2021-01-05 1.更新

JLChen

2021-01-05 f500e14c0a994487070380c50c85e0929cbc8e63

 Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/SceneMethod.cs

@@ -397,13 +397,13 @@
                            if (device == null) {
                                continue;
                            }
                            replyBytes = Control.ControlBytesSendHasReturn (Command.UpdataCurtainModelStutas, device.SubnetID, device.DeviceID, new byte [] { 1, (byte)device.Status });
                            replyBytes = Control.ControlBytesSendHasReturn (Command.UpdataCurtainModelStutas, device.SubnetID, device.DeviceID, new byte [] { 17, (byte)device.CurtainProress });
                        } else if (common.Type == DeviceType.CurtainTrietex) {
                            var device = Newtonsoft.Json.JsonConvert.DeserializeObject<CurtainTrietex> (System.Text.Encoding.UTF8.GetString (IO.FileUtils.ReadFile (deviceFilePath)));
                            if (device == null) {
                                continue;
                            }
                            replyBytes = Control.ControlBytesSendHasReturn (Command.UpdataCurtainModelStutas, device.SubnetID, device.DeviceID, new byte [] { 1, (byte)device.Status });
                            replyBytes = Control.ControlBytesSendHasReturn (Command.UpdataCurtainModelStutas, device.SubnetID, device.DeviceID, new byte [] { 17, (byte)device.CurtainProress });
                        } else if (common.Type == DeviceType.HVAC || common.Type == DeviceType.ACInfrared) {
                            var device = Newtonsoft.Json.JsonConvert.DeserializeObject<HVAC> (System.Text.Encoding.UTF8.GetString (IO.FileUtils.ReadFile (deviceFilePath)));
                            if (device == null) {
@@ -445,6 +445,12 @@
                            }
                            replyBytes = Control.ControlBytesSendHasReturn (Command.SetScene, device.SubnetID, device.DeviceID, new byte [] {
                            device.AreaID,device.AreaSceneID});
                        } else if (common.Type == DeviceType.UniversalDevice) {//2020-09-02 增加通用开关
                            var device = Newtonsoft.Json.JsonConvert.DeserializeObject<UniversalDevice> (System.Text.Encoding.UTF8.GetString (IO.FileUtils.ReadFile (deviceFilePath)));
                            if (device == null) {
                                continue;
                            }
                            replyBytes = Control.ControlBytesSendHasReturn (Command.SetCommonSwitch, device.SubnetID, device.DeviceID, new byte [] { device.SendBytes [0], device.SendBytes [1] });
                        }

                        try {
@@ -715,8 +721,17 @@
                                        replyBytes = Control.ControlBytesSendHasReturn (Command.SetScene, device.SubnetID, device.DeviceID, new byte [] {
                            device.AreaID,device.AreaSceneID});
                                    }
                                } else if (common.Type == DeviceType.UniversalDevice) {//2020-09-02 增加通用开关
                                    var device = Newtonsoft.Json.JsonConvert.DeserializeObject<UniversalDevice> (System.Text.Encoding.UTF8.GetString (IO.FileUtils.ReadFile (deviceFilePath)));
                                    if (device == null) {
                                        replyBytes = new byte [] { 0x00 };
                                    } else {
                                        replyBytes = Control.ControlBytesSendHasReturn (Command.SetCommonSwitch, device.SubnetID, device.DeviceID, new byte [] { device.SendBytes [0], device.SendBytes [1] });
                                    }
                                }



                                try {
                                    if (showTip) {
                                        if (replyBytes == null) {