Merge branch 'NewFilePath' into CJL

JLChen

2020-12-23 95d51dfc65299bdb735a855b515af84ca5b58252

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

@@ -12,7 +12,7 @@
        /// <summary>
        /// 网关ID(获取嘉乐网关ID)
        /// </summary>
        public static string gatewayId
        public static string GatewayId
        {
            get
            {
@@ -23,15 +23,15 @@
                return Entity.DB_ResidenceData.Instance.HomeGateway.gatewayId;
            }
        }

         
        /// <summary>
        /// 住宅ID
        /// </summary>
        public static string homeId
        public static string HomeId
        {
            get
            {
                return Entity.DB_ResidenceData.Instance.CurrentRegion.RegionID;
                return Entity.DB_ResidenceData.Instance.CurrentRegion.RegionID; 
            }
        }

@@ -39,15 +39,15 @@
        /// 获取逻辑ID列表
        /// </summary>
        /// <returns></returns>
        public static ResponsePackNew getLogicIdList()
        public static ResponsePackNew GetLogicIdList() 
        {
            var jObject = new JObject { { "homeId", homeId } };
            var jObject = new JObject { { "homeId", HomeId } };
            var responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Logic_List);
            //如果是token过期则刷新token
            if (responsePackNew.Code == StateCode.TOKEN_EXPIRED)
            {
                RefreshToken();
                getLogicIdList();
                GetLogicIdList();
            }
            return responsePackNew;
        }
@@ -56,7 +56,7 @@
        /// </summary>
        /// <param name="listIdList">逻辑ID列表</param>
        /// <returns></returns>
        public static ResponsePackNew getLogic(List<string> listIdList)
        public static ResponsePackNew GetLogic(List<string> listIdList)
        {
            var jArray = new JArray { };
            for (int i = 0; i < listIdList.Count; i++)
@@ -69,12 +69,12 @@
            if (responsePackNew.Code == StateCode.TOKEN_EXPIRED)
            {
                RefreshToken();
                getLogic(listIdList);
                GetLogic(listIdList);
            }
            return responsePackNew;
        }
        /// <summary>
        /// 添加自动化命令
        /// 添加自动化命令 
        /// </summary>
        /// <param name="logic"></param>
        /// <returns></returns>
@@ -134,7 +134,7 @@
                var logicjArray = new JArray { };
                var logicIfon = new JObject { };
                logicIfon.Add("sid", logic.sid);
                logicIfon.Add("gatewayId", gatewayId);
                logicIfon.Add("gatewayId", GatewayId);
                logicIfon.Add("name", logic.name);
                logicIfon.Add("relation", logic.relation);
                logicIfon.Add("enable", logic.enable);
@@ -142,7 +142,7 @@
                logicIfon.Add("input", inputArray);
                logicIfon.Add("output", outputArray);
                logicjArray.Add(logicIfon);
                var jObject = new JObject { { "homeId", homeId }, { "logics", logicjArray } };
                var jObject = new JObject { { "homeId", HomeId }, { "logics", logicjArray } };
                responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Logic_Add);
                //如果是token过期则刷新token
                if (responsePackNew.Code == StateCode.TOKEN_EXPIRED)
@@ -165,7 +165,7 @@
        /// </summary>
        /// <param name="logic"></param>
        /// <returns></returns>
        public static ResponsePackNew updateLogic(Logic logic)
        public static ResponsePackNew UpdateLogic(Logic logic)
        {
            ResponsePackNew responsePackNew = null;
            try
@@ -222,7 +222,7 @@
                var logicIfon = new JObject { };
                logicIfon.Add("userLogicId", logic.userLogicId);
                logicIfon.Add("sid", logic.sid);
                logicIfon.Add("gatewayId", gatewayId);
                logicIfon.Add("gatewayId", GatewayId);
                logicIfon.Add("name", logic.name);
                logicIfon.Add("relation", logic.relation);
                logicIfon.Add("enable", logic.enable);
@@ -230,13 +230,13 @@
                logicIfon.Add("input", inputArray);
                logicIfon.Add("output", outputArray);
                logicjArray.Add(logicIfon);
                var jObject = new JObject { { "homeId", homeId }, { "logics", logicjArray } };
                var jObject = new JObject { { "homeId", HomeId }, { "logics", logicjArray } };
                responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Logic_Update);
                //如果是token过期则刷新token
                if (responsePackNew.Code == StateCode.TOKEN_EXPIRED)
                {
                    RefreshToken();
                    updateLogic(logic);
                    UpdateLogic(logic);
                }
            }
            catch (Exception e)
@@ -246,12 +246,12 @@


            return responsePackNew;
        }
        } 
        /// <summary>
        /// 删除逻辑
        /// </summary>
        /// <returns></returns>
        public static ResponsePackNew delLogic(Logic logic)
        public static ResponsePackNew DelLogic(Logic logic)
        {
            var jArray = new JArray { };
            jArray.Add(logic.userLogicId);
@@ -261,15 +261,15 @@
            if (responsePackNew.Code == StateCode.TOKEN_EXPIRED)
            {
                RefreshToken();
                delLogic(logic);
                DelLogic(logic);
            }
            return responsePackNew;
        }
        /// <summary>
        /// <summary> 
        /// 逻辑开关
        /// </summary>
        /// <returns></returns>
        public static ResponsePackNew switchLogic(Logic logic)
        public static ResponsePackNew SwitchLogic(Logic logic)
        {
            var jArray = new JArray { };
            var job = new JObject { { "userLogicId", logic.userLogicId } , { "enable", logic.enable } };
@@ -280,12 +280,12 @@
            if (responsePackNew.Code == StateCode.TOKEN_EXPIRED)
            {
                RefreshToken();
                switchLogic(logic);
                SwitchLogic(logic);
            }
            return responsePackNew;
        }
        /// <summary>
        ///请求服务器（与住宅有关:例如；homeId）
        ///请求服务器（与住宅有关:例如；homeId） 
        /// </summary>
        /// <returns></returns>
        public static ResponsePackNew RequestServerhomeId(object o, string api_Url, int mTimeout = 3)