20200227

wxr

2020-02-27 37c33341f75841dc39c535eb62a3603f596516a1

 HDL_ON/DriverLayer/Control.cs

@@ -9,10 +9,18 @@
    public partial class Control
    {


        /// <summary>
        /// 发送命令
        /// 自动判断是否为A协议设备，
        /// 不是A协议，自动转化bus命令数据
        /// </summary>
        /// <param name="commandString"></param>
        /// <param name="function"></param>
        /// <param name="sendCount"></param>
        /// <returns></returns>
        public static byte[] Send(string commandString, Function function, int sendCount = 3)
        {
            if (!string.IsNullOrEmpty(function.bus_Data))
            if (function.bus_Data!=null)
            {
                try
                {
@@ -51,7 +59,7 @@
        /// </summary>
        /// <param name="commandString"></param>
        /// <returns></returns>
        static byte[] DataConversion_Bus(JObject commandString,string bus_Data, Function function)
        static byte[] DataConversion_Bus(JObject commandString,BusData bus_Data, Function function)
        {
            //反馈:
            //{
@@ -61,44 +69,39 @@
            //}] }
            try
            {
                var sss = JObject.Parse(bus_Data);
                var subnetId = Convert.ToByte(sss.GetValue("SubnetID").ToString());
                var deviceId = Convert.ToByte(sss.GetValue("DeviceID").ToString());
                var loopId = sss.GetValue("LoopID").ToString();
                var subnetId = bus_Data.SubnetID;
                var deviceId = bus_Data.DeviceID;
                var loopId = bus_Data.LoopID;

                var jobj = JObject.FromObject(commandString.GetValue("objects"));
                var functionType = jobj.GetValue("sid").ToString().Substring(22, 2);//截取24，25字符获取控制的设备的类型
                switch (commandString.GetValue("Command").ToString())
                {
                    case "write":
                        var jobj = JObject.FromObject(commandString.GetValue("objects"));
                        var functionType = jobj.GetValue("sid").ToString().Substring(24, 2);//截取24，25字符获取控制的设备的类型
                        switch ((FunctionType)Enum.ToObject(typeof(FunctionType), Convert.ToInt32(functionType)))
                        {
                            case FunctionType.Light:
                                if (jobj.ContainsKey("Switch"))//继电器
                                if (jobj.ContainsKey("switch"))//继电器
                                {
                                    var state = jobj.GetValue("Switch").ToString() == "0" ? (byte)0 : (byte)100;
                                    if (jobj.ContainsKey("Dimmer"))
                                    {   //调光器
                                        var brightness = Convert.ToByte(jobj.GetValue("Dimmer").ToString());
                                        if (brightness > 0)
                                        {
                                            (function as Dimmer).brightness = brightness;
                                        }
                                        (function as Dimmer).state = state;
                                        var bytes = new byte[] { Convert.ToByte(loopId), brightness, 0, 0 };
                                        (function as Dimmer).lastState = Language.StringByID(StringId.Brightness) + " : " + brightness.ToString() + "%";
                                        return ControlBytesSendHasReturn(Command.SetSingleLight, subnetId, deviceId, bytes);
                                    }
                                    else//继电器
                                    {
                                        var bytes = new byte[] { Convert.ToByte(loopId), state, 0, 0 };
                                        return ControlBytesSendHasReturn(Command.SetSingleLight, subnetId, deviceId, bytes);
                                    }
                                    var state = jobj.GetValue("switch").ToString() == "0" ? (byte)0 : (byte)100;
                                    var bytes = new byte[] { Convert.ToByte(loopId), state, 0, 0 };
                                    return ControlBytesSendHasReturn(Command.SetSingleLight, subnetId, deviceId, bytes);
                                }
                                break;
                        }
                        break;
                    case "read":

                        switch ((FunctionType)Enum.ToObject(typeof(FunctionType), Convert.ToInt32(functionType)))
                        {
                            case FunctionType.Light:
                                if (jobj.ContainsKey("switch"))//继电器
                                {
                                    var state = jobj.GetValue("switch").ToString() == "0" ? (byte)0 : (byte)100;
                                    var bytes = new byte[] { Convert.ToByte(loopId), state, 0, 0 };
                                    return ControlBytesSendHasReturn(Command.ReadLightSingleLoopBrightness, subnetId, deviceId, bytes);
                                }
                                break;
                        }
                        break;
                }