From 9ab5bd54fadd8fc9c542b48c99a117a4e182669b Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 14 十月 2021 16:37:56 +0800
Subject: [PATCH] 智能空开能源界面数据更新
---
HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs | 196 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 151 insertions(+), 45 deletions(-)
diff --git a/HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs b/HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs
index 87cfabe..2c1680d 100644
--- a/HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs
+++ b/HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs
@@ -1,71 +1,177 @@
锘縰sing System;
using System.Collections.Generic;
+using HDL_ON.DAL.Server;
namespace HDL_ON.Entity
{
/// <summary>
+ /// 2020-11-16 寰呬慨鏀硅皟鏁�
/// 浣忓畢鎴愬憳鐨勪俊鎭垪琛�
/// </summary>
public class ResidenceMemberInfo
{
public ResidenceMemberInfo()
{
- var ss = sharedDatas.Find((obj) => obj.HouseDistributedMark == DB_ResidenceData.residenceData.residecenInfo.RegionID);
- if (ss == null)
- {
- ss = new ShareData();
- }
- CurShareData = ss;
}
- public string Account = "";
+ //public string Account = "";
- public string UserName = "";
+ //public string UserName = "";
- public string SubAccountDistributedMark = "";
+ //public string SubAccountDistributedMark = "";
- public string DistributedMark = "";
+ //public string DistributedMark = "";
- public string Nickname = "";
+ //public string Nickname = "";
- public int AccountType = 0;
- /// <summary>
- /// <!--姝ゆ垚鍛樺笎鍙锋槸鍚﹀叿鏈夎繙绋嬫帶鍒舵潈闄�-->
- /// </summary>
- public bool IsAllowRemoteCtrl = false;
- /// <summary>
- /// 鏄惁鍏佽瀛愯处鍙峰垱寤哄満鏅�
- /// </summary>
- public bool IsAllowCreateScene = false;
+ //public int AccountType = 0;
+ ///// <summary>
+ ///// <!--姝ゆ垚鍛樺笎鍙锋槸鍚﹀叿鏈夎繙绋嬫帶鍒舵潈闄�-->
+ ///// </summary>
+ //public bool IsAllowRemoteCtrl = false;
+ ///// <summary>
+ ///// 鏄惁鍏佽瀛愯处鍙峰垱寤哄満鏅�
+ ///// </summary>
+ //public bool IsAllowCreateScene = false;
public string headImagePagePath = "LoginIcon/2.png";
- public List<ShareData> sharedDatas = new List<ShareData>();
+ /// <summary>
+ /// 瀛愯处鍙疯幏寰楃殑褰撳墠浣忓畢鐨勫姛鑳芥暟鎹�
+ /// </summary>
+ public List<ShareData> CurResidenceShareData = new List<ShareData>();
- public ShareData CurShareData = new ShareData();
+ /// <summary>
+ ///
+ /// </summary>
+ public string id;
+ /// <summary>
+ ///
+ /// </summary>
+ public string homeId;
+ /// <summary>
+ ///
+ /// </summary>
+ public string homeRegionId;
+ /// <summary>
+ ///
+ /// </summary>
+ public string childAccountId;
+ /// <summary>
+ ///
+ /// </summary>
+ public string childAccountRegionId;
+ /// <summary>
+ /// 瀛愯处鎴风被鍨� ORDINARY銆丏EBUG銆丄DMIN
+ /// </summary>
+ public string childAccountType;
+ /// <summary>
+ /// 鍖哄煙鏈嶅姟鍣�
+ /// </summary>
+ public string childAccountRegionUrl;
+ /// <summary>
+ /// 鏄惁鍏佽杩滅▼鎺у埗
+ /// </summary>
+ public bool isRemoteControl;
+ /// <summary>
+ /// 鏄惁鍒涘缓鍦烘櫙
+ /// </summary>
+ public bool isAllowCreateScene;
+ /// <summary>
+ /// 鏄电О1
+ /// </summary>
+ public string nickName;
+ /// <summary>
+ ///
+ /// </summary>
+ public string createTime;
+ /// <summary>
+ /// 鐢ㄦ埛鍚嶅瓧
+ /// </summary>
+ public string memberName = "";
+ /// <summary>
+ ///
+ /// </summary>
+ public string childAccountEmail;
+ /// <summary>
+ ///
+ /// </summary>
+ public string childAccountPhone;
+ /// <summary>
+ /// 鐢ㄦ埛澶村儚
+ /// </summary>
+ public string memberHeadIcon;
+ /// <summary>
+ /// 鐢ㄦ埛璐﹀彿
+ /// 浼樺厛鏄剧ず鎵嬫満鍙凤紝濡傛灉鎵嬫満鍙蜂负绌哄垯鏄剧ず閭鍦板潃
+ /// </summary>
+ public string Account
+ {
+ get
+ {
+ if (!string.IsNullOrEmpty(childAccountPhone))
+ {
+ return childAccountPhone;
+ }
+ else
+ {
+ if (!string.IsNullOrEmpty(childAccountEmail))
+ {
+ return childAccountEmail;
+ }
+ else
+ {
+ return "";
+ }
+
+ }
+ }
+ }
}
- public class ShareData
- {
- /// <summary>
- /// 璁惧鍚嶇О
- /// </summary>
- public string ShareName = "";
- /// <summary>
- /// 璁惧ID
- /// </summary>
- public string DistributedMark = "";
- /// <summary>
- /// 鎴块棿ID
- /// </summary>
- public string HouseDistributedMark = "";
- /// <summary>
- /// 瀛愯处鍙稩D
- /// </summary>
- public string SubAccountDistributedMark = "";
- /// <summary>
- /// 鍔熻兘鏁版嵁
- /// </summary>
- public byte[] ShareDataBytes;
+ //public class ShareData
+ //{
+ // ///// <summary>
+ // ///// 澶囦唤鍚嶇О
+ // ///// </summary>
+ // //public string ShareName = "";
+ // ///// <summary>
+ // ///// 澶囦唤鐨勬暟鎹甀D
+ // ///// </summary>
+ // //public string DistributedMark = "";
+ // ///// <summary>
+ // ///// 澶囦唤鎵�灞炵殑浣忓畢ID
+ // ///// </summary>
+ // //public string HouseDistributedMark = "";
+ // ///// <summary>
+ // ///// 瀛愯处鍙稩D
+ // ///// </summary>
+ // //public string SubAccountDistributedMark = "";
+ // ///// <summary>
+ // ///// 鍔熻兘鏁版嵁
+ // ///// </summary>
+ // //public byte[] ShareDataBytes;
- }
+ // ///// <summary>
+ // ///// 涓婚敭ID
+ // ///// </summary>
+ // //public string id;
+ // ///// <summary>
+ // ///// 浣忓畢ID
+ // ///// </summary>
+ // //public string homeId;
+ // ///// <summary>
+ // ///// 瀛愯处鍙稩D
+ // ///// </summary>
+ // //public string childAccountId;
+ // ///// <summary>
+ // ///// 鏂囦欢鍚�
+ // ///// </summary>
+ // //public string fileName;
+ // ///// <summary>
+ // ///// 鍒涘缓鏃堕棿
+ // ///// </summary>
+ // //public string createTime;
+
+
+ //}
}
--
Gitblit v1.8.0