From 0d9f64668fd7350d6a21fd157e32009a96d98134 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 16 十二月 2020 13:09:08 +0800
Subject: [PATCH] 新云端代码Ver1.2
---
ZigbeeApp/Shared/Phone/Common/Common/ResidenceOption.cs | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/ResidenceOption.cs b/ZigbeeApp/Shared/Phone/Common/Common/ResidenceOption.cs
similarity index 75%
rename from ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/ResidenceOption.cs
rename to ZigbeeApp/Shared/Phone/Common/Common/ResidenceOption.cs
index b92e03d..f9dac9c 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/ResidenceOption.cs
+++ b/ZigbeeApp/Shared/Phone/Common/Common/ResidenceOption.cs
@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Text;
-namespace Shared.Phone.UserCenter
+namespace Shared.Phone
{
/// <summary>
/// 浣忓畢鐨勯厤缃�
@@ -15,6 +15,19 @@
/// 鏄惁浣跨敤瀹夐槻蹇嵎鏂瑰紡
/// </summary>
public bool SafetyShortcut = false;
+ /// <summary>
+ /// 鐧婚檰鏉冮檺缂栧彿-> 1:涓昏处鍙疯嚜宸�(鏈汉) 2:璧嬩簣绠＄悊鍛樻潈闄愮殑鎴愬憳 3:鎴愬憳
+ /// </summary>
+ public int AuthorityNo = 0;
+ /// <summary>
+ /// 鐧婚檰鏉冮檺缂栧彿鐨勭炕璇戝悕锛�1:涓昏处鍙疯嚜宸�(鏈汉) 2:璧嬩簣绠＄悊鍛樻潈闄愮殑鎴愬憳 3:鎴愬憳
+ /// </summary>
+ public string AuthorityText = string.Empty;
+ /// <summary>
+ /// 鍦ㄦ病鏈夎皟鐢ㄦ帴鍙ｈ幏鍙栦箣鍓嶇殑鐧婚檰鏉冮檺缂栧彿-> 1:涓昏处鍙疯嚜宸�(鏈汉) 2:璧嬩簣绠＄悊鍛樻潈闄愮殑鎴愬憳 3:鎴愬憳
+ /// </summary>
+ [Newtonsoft.Json.JsonIgnore]
+ public int OldAuthorityNo = 0;
/// <summary>
/// 瀹夐槻鎶ヨ淇℃伅璁板綍涓�澶╁唴鏈�澶х殑鎶ヨ鏁�
/// </summary>
@@ -56,7 +69,7 @@
public void Save()
{
//鍐欏叆鍐呭
- HdlFileLogic.Current.SaveFileContent(DirNameResourse.ResidenceOptionFile, this);
+ HdlFileLogic.Current.SaveFileContent(HdlFileNameResourse.ResidenceOptionFile, this);
}
/// <summary>
@@ -65,7 +78,7 @@
/// <returns></returns>
public ResidenceOptionClass Load()
{
- string fileName = DirNameResourse.ResidenceOptionFile;
+ string fileName = HdlFileNameResourse.ResidenceOptionFile;
if (System.IO.File.Exists(fileName) == false)
{
return new ResidenceOptionClass();
--
Gitblit v1.8.0