Merge remote-tracking branch 'origin/CJL-NEW'

wxr

2020-12-01 a2927467ebfa938a420f392deb6882b35570fd33

 HDL_ON/Entity/DB_ResidenceData.cs

@@ -1,5 +1,7 @@
using System;
using System.Collections.Generic;
using System.Threading;
using HDL_ON.DAL.Server;
using Shared;

namespace HDL_ON.Entity
@@ -9,6 +11,7 @@
        public DB_ResidenceData()
        {
        }

        /// <summary>
        /// 主人token
        /// </summary>
@@ -31,11 +34,47 @@
                }
                else
                {
                    var curRegion =  UserInfo.Current.regionList.Find((obj) => obj.RegionID == CurReginID);
                    var curRegion = UserInfo.Current.regionList.Find((obj) => obj.RegionID == CurReginID);
                    //if (curRegion == null)
                    //{
                    //    CurReginID =  UserInfo.Current.regionList[0].RegionID;
                    //    return  UserInfo.Current.regionList[0];
                    //}
                    return curRegion;
                }
            }
        }

        ///// <summary>
        ///// 获取网关列表
        ///// </summary>
        //void GetHomeGatewayList()
        //{
        //    new Thread(() =>
        //    {
        //        //切换住宅后，查询一次网关列表
        //        new HttpServerRequest().GetHomeGatewayList();
        //    })
        //    { IsBackground = true }.Start();

        //}

        //string curReginID;
        ///// <summary>
        ///// 当前选择的住宅索引
        ///// </summary>
        //public string CurReginID
        //{
        //    set
        //    {
        //        curReginID = value;
        //        GetHomeGatewayList();
        //    }
        //    get
        //    {
        //        return curReginID;
        //    }
        //}
        /// <summary>
        /// 当前选择的住宅索引
        /// </summary>
@@ -406,13 +445,64 @@
        }

        /// <summary>
        /// 网关详细信息
        /// </summary>
        public HomeGatewayInfo HomeGateway;

        /// <summary>
        /// 检测住宅是否绑定了网关
        /// </summary>
        /// <returns></returns>
        public bool CheckWhetherGatewayIsBound()
        {
            if (HomeGateway != null && !string.IsNullOrEmpty(HomeGateway.mac))
            {
                return true;
            }
            else
            {
                return false;
            }
        }

        /// <summary>
        /// 当前住宅的网关MAC
        /// </summary>
        public string residenceGatewayMAC
        {
            get
            {
                if (CheckWhetherGatewayIsBound())
                {
                    return HomeGateway.mac.ToUpper();
                }
                else
                {
                    return "";
                }
            }
            set
            {
                if (CheckWhetherGatewayIsBound())
                {
                    HomeGateway.mac = value;
                }
                else
                {
                    HomeGateway = new HomeGatewayInfo() { mac = value };
                }
            }

        }

        /// <summary>
        /// 住宅图片
        /// </summary>
        public string residenceImage;
        /// <summary>
        /// 当前住宅的网关MAC
        /// </summary>
        public string residenceGatewayMAC = "4E47323347591243";//"0281B9078C000000";// "00964E19C4467B1E";
        //public string residenceGatewayMAC = "4E47323347591243";//"0281B9078C000000";// "00964E19C4467B1E";
        /// <summary>
        /// 保存住宅数据
        /// </summary>