增加本地发送的重发机制

hxb

2020-12-17 5eeafe3af80bfd88306bd8ad9e76c8f4b51ca35f

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

@@ -9,17 +9,6 @@
{
    public  class Send
    {
        ///// <summary>
        ///// 住宅ID
        ///// </summary>
        //public static string homeId = Entity.DB_ResidenceData.residenceData.CurReginID;
        ///// <summary>
        ///// 网关ID（秀桡有网关ID却返回是MAC）
        ///// </summary>
        //public static string gatewayId = DriverLayer.Control.Ins.GatewayId;

        //public static string homeId = UserInfo.Current.CurReginID;

        /// <summary>
        /// 网关ID(获取嘉乐网关ID)
        /// </summary>
@@ -27,19 +16,24 @@
        {
            get
            {
                if (Entity.DB_ResidenceData.residenceData.HomeGateway == null)
                if (Entity.DB_ResidenceData.Instance.HomeGateway == null)
                {
                    return DriverLayer.Control.Ins.GatewayId;
                }
                return Entity.DB_ResidenceData.residenceData.HomeGateway.gatewayId;
                return Entity.DB_ResidenceData.Instance.HomeGateway.gatewayId;
            }
        }
        

        /// <summary>
        /// 住宅ID
        /// </summary>
        public static string homeId = Entity.DB_ResidenceData.residenceData.residecenInfo.RegionID;

        public static string homeId
        {
            get
            {
                return Entity.DB_ResidenceData.Instance.CurrentRegion.RegionID;
            }
        }

        /// <summary>
        /// 获取逻辑ID列表
@@ -294,7 +288,7 @@
        ///请求服务器（与住宅有关:例如；homeId）
        /// </summary>
        /// <returns></returns>
        public static ResponsePackNew RequestServerhomeId(object o, string api_Url, int mTimeout = 10)
        public static ResponsePackNew RequestServerhomeId(object o, string api_Url, int mTimeout = 3)
        {
            var requestJson = HttpUtil.GetSignRequestJson(o);
            return HttpUtil.RequestHttpsPostFroHome(api_Url, requestJson, mTimeout);