From 1265d531759b5565e9f641b17045896b52dfdba8 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 03 十二月 2020 18:37:47 +0800
Subject: [PATCH] 2020-12-03 1.主页增加未读消息查询和提示处理。2.房间和场景背景上传和下载和读取方法修改处理。3.头像上传和下载方案修改处理。4.增加子账号头像下载。5.Loading 调用方法修复。6.封装ImageUtlis 图片上传和下载管理工具类 7.读取本地住宅增加判空处理。
---
HDL_ON/Entity/DB_ResidenceData.cs | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 111 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index b5def69..e20e883 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -1,5 +1,7 @@
锘縰sing 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,63 @@
}
else
{
- var curRegion = UserInfo.Current.regionList.Find((obj) => obj.RegionID == CurReginID);
+ var curRegion = UserInfo.Current.regionList.Find((obj) => obj.RegionID == CurReginID);
+ if (curRegion == null)
+ {
+ if (UserInfo.Current.regionList != null && UserInfo.Current.regionList.Count > 0)
+ {
+ CurReginID = UserInfo.Current.regionList[0].RegionID;
+ //鎭㈠澶囦唤
+ HDLCommon.Current.RestoreHomeBackup(CurReginID);
+
+ return UserInfo.Current.regionList[0];
+ }
+ else
+ {
+ return new RegionInfoRes();
+ }
+ }
+
+ //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>
@@ -103,6 +158,9 @@
},
}.SaveFunctionData();
+
+
+
@@ -406,13 +464,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>
+ /// 褰撳墠浣忓畢鐨勭綉鍏矼AC
+ /// </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>
/// 褰撳墠浣忓畢鐨勭綉鍏矼AC
/// </summary>
- public string residenceGatewayMAC = "4E47323347591243";//"0281B9078C000000";// "00964E19C4467B1E";
+ //public string residenceGatewayMAC = "4E47323347591243";//"0281B9078C000000";// "00964E19C4467B1E";
/// <summary>
/// 淇濆瓨浣忓畢鏁版嵁
/// </summary>
--
Gitblit v1.8.0