blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
wxr
2021-07-01 43b0d5870d528f23ecd6aeceb6cfd4325188b46f 
 HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs


@@ -92,6 +92,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)


@@ -105,6 +106,29 @@


                    outputArray.Add(outputTypeJOb);


                }






                var noticeConfigJObject = new JObject();


                noticeConfigJObject.Add("enable", logic.noticeConfig.enable);


                noticeConfigJObject.Add("noticeContent", logic.noticeConfig.noticeContent);




                var pushConfigsArray = new JArray { };


                if (logic.pushConfigs.Count > 0)


                {   // 推送文本


                    foreach (var pushConfig in logic.pushConfigs)


                    {


                       


                        var pushConfigJob = new JObject { };


                        pushConfigJob.Add("pushMethod", pushConfig.pushMethod);


                        var accountArray = new JArray { };


                        foreach (var account in pushConfig.pushTarget)


                        {


                            accountArray.Add(account);


                        }


                        pushConfigJob.Add("pushTarget", accountArray);


                        pushConfigsArray.Add(pushConfigJob);


                    }


                }




                var logicjArray = new JArray { };


                var logicIfon = new JObject { };


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


@@ -115,23 +139,22 @@


                logicIfon.Add("cycle", cycleJObject);


                logicIfon.Add("input", inputArray);


                logicIfon.Add("output", outputArray);


                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);


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


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


                if (responsePackNew.Code == StateCode.TOKEN_EXPIRED)


                {


                    RefreshToken();


                    AddLogic(logic);


                }




            }


            catch (Exception e)


            {


                var dd = e.Message;


            }






            return responsePackNew;


        }


        /// <summary>


@@ -165,7 +188,10 @@


                    {


                        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);


@@ -179,6 +205,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)


@@ -192,6 +219,29 @@


                    outputArray.Add(outputTypeJOb);


                }




                var noticeConfigJObject = new JObject();


                noticeConfigJObject.Add("enable", logic.noticeConfig.enable);


                noticeConfigJObject.Add("noticeContent", logic.noticeConfig.noticeContent);




                var pushConfigsArray = new JArray { };


                if (logic.pushConfigs.Count > 0)


                {


                    // 推送文本


                    foreach (var pushConfig in logic.pushConfigs)


                    {




                        var pushConfigJob = new JObject { };


                        pushConfigJob.Add("pushMethod", pushConfig.pushMethod);


                        var accountArray = new JArray { };


                        foreach (var account in pushConfig.pushTarget)


                        {


                            accountArray.Add(account);


                        }


                        pushConfigJob.Add("pushTarget", accountArray);


                        pushConfigsArray.Add(pushConfigJob);


                    }


                }




                var logicjArray = new JArray { };


                var logicIfon = new JObject { };


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


@@ -203,9 +253,12 @@


                logicIfon.Add("cycle", cycleJObject);


                logicIfon.Add("input", inputArray);


                logicIfon.Add("output", outputArray);


                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_Update);


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


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


                if (responsePackNew.Code == StateCode.TOKEN_EXPIRED)


                {


@@ -217,8 +270,6 @@


            {


                var dd = e.Message;


            }






            return responsePackNew;


        } 


        /// <summary>