2020-06-16-1

陈嘉乐

2020-06-16 7167334c0e89dd84827d59e726123d14776e3a09

 HDL_ON/Entity/Function/Curtain.cs

@@ -1,4 +1,5 @@
using System;
using System.Collections.Generic;
using Newtonsoft.Json.Linq;

namespace HDL_ON.Entity
@@ -15,6 +16,8 @@
        public Curtain()
        {
        }
        [Newtonsoft.Json.JsonIgnore]
        public Trait trait_openLevel;
        /// <summary>
        /// 开关百分比
        /// 0-100
@@ -26,9 +29,22 @@
            {
                try
                {
                    string o = "0";
                    dicPropert.TryGetValue("openLevel", out o);
                    return o == "" ? 0 : Convert.ToInt32(o);
                    if(trait_openLevel==null)
                    {
                        trait_openLevel = propertList.Find((obj) => obj.attri == "openLevel");
                        if (trait_openLevel == null)
                        {
                            trait_openLevel = new Trait()
                            {
                                attri = "openLevel",
                                value = new List<string> { "up", "down" },
                                max = 100,
                                min = 0,
                            };
                        }
                        trait_openLevel.curValues = trait_openLevel.min;
                    }
                    return Convert.ToInt32( trait_openLevel.curValues);
                }
                catch
                {
@@ -40,7 +56,7 @@
            {
                try
                {
                    dicPropert["openLevel"] = value.ToString();
                    trait_openLevel.curValues = value;
                }
                catch
                {
@@ -52,13 +68,13 @@
        /// <summary>
        /// 拼接、获取A协议操作数据
        /// </summary>
        public override JObject GetSendJObject(string command)
        public override JObject GetSendJObject(CommandType_A command)
        {
            var sendJob = new JObject();
            if (command == "write")
            if (command == CommandType_A.write)
            {

                sendJob = new JObject { { "vendor_code", vendor_code }, { "Command", command }, { "Type", "device" } };
                sendJob = new JObject { { "vendor_code", vendor_code }, { "Command", command.ToString() }, { "Type", "device" } };
                JObject data = null;
                switch (functionType)
                {
@@ -72,9 +88,9 @@
                }
                sendJob.Add("objects", data);
            }
            else if (command == "read")
            else if (command == CommandType_A.read)
            {
                sendJob = new JObject { { "vendor_code", vendor_code }, { "Command", command }, { "Type", "device" } };
                sendJob = new JObject { { "vendor_code", vendor_code }, { "Command", command.ToString() }, { "Type", "device" } };
                var data = new JObject { { "sid", sid } };
                sendJob.Add("objects", data);
            }