blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
JLChen
2021-11-16 b8d7b4fa382f7c779fb9e81a9f049d94a9083fa3 
 HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs


@@ -37,7 +37,7 @@


        /// <returns></returns>


        public static ResponsePackNew GetLogicIdList() 


        {


            var jObject = new JObject { { "homeId", LogicMethod.HomeId } };


            var jObject = new JObject { { "homeId", LogicMethod.CurrLogicMethod.HomeId } };


            var responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Logic_List);


            //如果是token过期则刷新token


            if (responsePackNew.Code == StateCode.TOKEN_EXPIRED)


@@ -106,6 +106,14 @@


                        conditionArray.Add(conditionJOb);


                    }


                    inputTypeJOb.Add("condition",conditionArray);


                    if (dictionary.condition_type=="8") {


                        ///地理围栏


                        var geo_fencejob = new JObject();


                        geo_fencejob.Add("longitude", dictionary.geo_fence.longitude);


                        geo_fencejob.Add("latitude", dictionary.geo_fence.latitude);


                        geo_fencejob.Add("radius", dictionary.geo_fence.radius);


                        inputTypeJOb.Add("geo_fence", geo_fencejob);


                    }


                    inputArray.Add(inputTypeJOb);


                }




@@ -114,6 +122,7 @@


                {


                    var outputTypeJOb = new JObject { };


                    outputTypeJOb.Add("sid", dictionary.sid);


                    outputTypeJOb.Add("delay", dictionary.delay);


                    outputTypeJOb.Add("target_type", dictionary.target_type);


                    var statusArray = new JArray { };


                    foreach (var dic in dictionary.status)


@@ -153,7 +162,7 @@


                var logicjArray = new JArray { };


                var logicIfon = new JObject { };


                logicIfon.Add("sid", logic.sid);


                logicIfon.Add("gatewayId", LogicMethod.GatewayId);


                logicIfon.Add("gatewayId", LogicMethod.CurrLogicMethod.GatewayId);


                logicIfon.Add("name", logic.name);


                logicIfon.Add("relation", logic.relation);


                logicIfon.Add("enable", logic.enable);


@@ -163,15 +172,14 @@


                logicIfon.Add("noticeConfig", noticeConfigJObject);


                logicIfon.Add("pushConfigs", pushConfigsArray);


                logicjArray.Add(logicIfon);


                var jObject = new JObject { { "homeId", LogicMethod.HomeId }, { "logics", logicjArray } };


                responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Logic_Add);


                var jObject = new JObject { { "homeId", LogicMethod.CurrLogicMethod.HomeId }, { "logics", logicjArray } };


                responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Logic_Add,5);


                //如果是token过期则刷新token


                if (responsePackNew.Code == StateCode.TOKEN_EXPIRED)


                {


                    RefreshToken();


                    AddLogic(logic);


                }


                Console.WriteLine("添加逻辑===" + logicjArray);


            }


            catch (Exception e)


            {


@@ -210,10 +218,22 @@


                    {


                        var conditionJOb = new JObject { };


                        conditionJOb.Add("key", dic["key"]);


                        conditionJOb.Add("comparator", dic["comparator"]);


                        var c1 = "";


                        dic.TryGetValue("comparator", out c1);


                        c1 = string.IsNullOrEmpty(c1) ? "" : c1;


                        conditionJOb.TryAdd("comparator", c1);


                        conditionJOb.Add("data_type", dic["data_type"]);


                        conditionJOb.Add("value", dic["value"]);


                        conditionArray.Add(conditionJOb);


                        if (dictionary.condition_type == "8")


                        {


                            ///地理围栏


                            var geo_fencejob = new JObject();


                            geo_fencejob.Add("longitude", dictionary.geo_fence.longitude);


                            geo_fencejob.Add("latitude", dictionary.geo_fence.latitude);


                            geo_fencejob.Add("radius", dictionary.geo_fence.radius);


                            inputTypeJOb.Add("geo_fence", geo_fencejob);


                        }


                    }


                    inputTypeJOb.Add("condition", conditionArray);


                    inputArray.Add(inputTypeJOb);


@@ -224,6 +244,7 @@


                {


                    var outputTypeJOb = new JObject { };


                    outputTypeJOb.Add("sid", dictionary.sid);


                    outputTypeJOb.Add("delay", dictionary.delay);


                    outputTypeJOb.Add("target_type", dictionary.target_type);


                    var statusArray = new JArray { };


                    foreach (var dic in dictionary.status)


@@ -243,7 +264,8 @@




                var pushConfigsArray = new JArray { };


                if (logic.pushConfigs.Count > 0)


                {   // 推送文本


                {


                    // 推送文本


                    foreach (var pushConfig in logic.pushConfigs)


                    {




@@ -263,7 +285,7 @@


                var logicIfon = new JObject { };


                logicIfon.Add("userLogicId", logic.userLogicId);


                logicIfon.Add("sid", logic.sid);


                logicIfon.Add("gatewayId", LogicMethod.GatewayId);


                logicIfon.Add("gatewayId", LogicMethod.CurrLogicMethod.GatewayId);


                logicIfon.Add("name", logic.name);


                logicIfon.Add("relation", logic.relation);


                logicIfon.Add("enable", logic.enable);


@@ -274,8 +296,10 @@


                logicIfon.Add("pushConfigs", pushConfigsArray);




                logicjArray.Add(logicIfon);


                var jObject = new JObject { { "homeId", LogicMethod.HomeId }, { "logics", logicjArray } };


                responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Logic_Update);


                var jObject = new JObject { { "homeId", LogicMethod.CurrLogicMethod.HomeId }, { "logics", logicjArray } };




                string str = jObject.ToString();


                responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Logic_Update,5);


                //如果是token过期则刷新token


                if (responsePackNew.Code == StateCode.TOKEN_EXPIRED)


                {