From dc840e2d67654781ebc9c7640e6c44a63a6d04d0 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 11 十二月 2020 09:44:37 +0800
Subject: [PATCH] 2020-12-11 1.注册、忘记密码、重置密码、点击返回到时候屏蔽检测错误提示。底部按钮使能效果优化修改。邮箱变密码输入问题修复。2.网络请求底层增加token过期检测刷新方法。3.更新控件库，iOS EditText取消默认密码输入方式。
---
HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs | 179 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 142 insertions(+), 37 deletions(-)
diff --git a/HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs b/HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs
index a99a04e..e2f0f3b 100644
--- a/HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs
+++ b/HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs
@@ -1,5 +1,6 @@
锘縰sing System;
using System.Collections.Generic;
+using HDL_ON.DAL.Server;
namespace HDL_ON.Entity
{
@@ -12,25 +13,25 @@
public ResidenceMemberInfo()
{
}
- 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";
@@ -39,30 +40,134 @@
/// </summary>
public List<ShareData> CurResidenceShareDate = new List<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 regionUrl;
+ /// <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 UserName = "";
+ /// <summary>
+ ///
+ /// </summary>
+ public string childAccountEmail;
+ /// <summary>
+ ///
+ /// </summary>
+ public string childAccountPhone;
+ /// <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>
- /// 澶囦唤鐨勬暟鎹甀D
- /// </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