2022年08月30日15:23:36

wjc

2022-08-30 06a320d7e207a7da06b207346d1106c13dd82901

 HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs

@@ -378,7 +378,7 @@
        /// <param name="logic">当前对象</param>
        /// <param name="isTip">是否要提示</param>
        /// <returns></returns>
        public ResponsePackNew SwitchLogic(Logic logic,bool isTip=false)
        public ResponsePackNew EnableLogic(Logic logic,bool isTip=false)
        {
            var jArray = new JArray { };
            var job = new JObject { { "userLogicId", logic.userLogicId }, { "enable", logic.enable } };
@@ -389,14 +389,14 @@
            if (responsePackNew.Code == StateCode.TOKEN_EXPIRED)
            {
                RefreshToken();
                SwitchLogic(logic, isTip);
                EnableLogic(logic, isTip);
            }
            if (Check(responsePackNew, isTip) == false)
            {
                return null;
            }
            return responsePackNew;
        }
        } 
        /// <summary> 
        /// 自动化地理围栏状态上报
        /// </summary>
@@ -462,13 +462,16 @@
        /// <summary>
        ///请求服务器（与住宅有关:例如；homeId） 
        /// </summary>
        /// <param name="o">发送数据</param>
        /// <param name="api_Url">请求地址(不是绝对地址)</param>
        /// <param name="tag">标记->描述接口(自定义)</param>
        /// <returns></returns>
        public  ResponsePackNew RequestServerhomeId(object o, string api_Url, string tag,int mTimeout = 3)
        public ResponsePackNew RequestServerhomeId(object o, string api_Url, string tag,int mTimeout = 3)
        {
            Log($"{DateTime.Now}->发送->{tag}", o.ToString());
            Log($"{DateTime.Now}->发送->{tag}", api_Url,o.ToString());
            var requestJson = HttpUtil.GetSignRequestJson(o);
            var r= HttpUtil.RequestHttpsPostFroHome(api_Url, requestJson, mTimeout);
            Log($"{DateTime.Now}->回复->{tag}", Newtonsoft.Json.JsonConvert.SerializeObject(r));
            Log($"{DateTime.Now}->回复->{tag}", "", Newtonsoft.Json.JsonConvert.SerializeObject(r));
            return r;

        }
@@ -481,10 +484,10 @@
        /// <returns></returns>
        public  ResponsePackNew RequestServer(object o, string api_Url,string tag)
        {
            Log($"发送->{tag}", o.ToString());
            Log($"发送数据->{tag}", api_Url, o.ToString());
            var requestJson = HttpUtil.GetSignRequestJson(o);
            var r = HttpUtil.RequestHttpsPost(api_Url, requestJson);
            Log($"回复->{tag}", Newtonsoft.Json.JsonConvert.SerializeObject(r));
            Log($"回复数据->{tag}", "", Newtonsoft.Json.JsonConvert.SerializeObject(r));
            return r;
        }
        /// <summary>
@@ -521,10 +524,10 @@
        /// </summary>
        /// <param name="tag">打印标记</param>
        /// <param name="content">打印内容</param>
        public void Log(string tag, string content)
        public void Log(string tag,string url, string content)
        {
         #if DEBUG
            Console.WriteLine(tag + $"\r\n数据内容->->{content}");
            Console.WriteLine(tag + $"\r\n{url}\r\n{content}");
         #endif
        }