From e90209beae6a4e822cecb18e6889f8bda23f630e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 14 十二月 2020 11:16:06 +0800
Subject: [PATCH] 合并了晾衣架(非新云端)
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/ResidenceOption.cs | 19 +++----------------
1 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Common/Common/ResidenceOption.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/ResidenceOption.cs
similarity index 75%
rename from ZigbeeApp/Shared/Phone/Common/Common/ResidenceOption.cs
rename to ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/ResidenceOption.cs
index f9dac9c..b92e03d 100644
--- a/ZigbeeApp/Shared/Phone/Common/Common/ResidenceOption.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/ResidenceOption.cs
@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Text;
-namespace Shared.Phone
+namespace Shared.Phone.UserCenter
{
/// <summary>
/// 浣忓畢鐨勯厤缃�
@@ -15,19 +15,6 @@
/// 鏄惁浣跨敤瀹夐槻蹇嵎鏂瑰紡
/// </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>
@@ -69,7 +56,7 @@
public void Save()
{
//鍐欏叆鍐呭
- HdlFileLogic.Current.SaveFileContent(HdlFileNameResourse.ResidenceOptionFile, this);
+ HdlFileLogic.Current.SaveFileContent(DirNameResourse.ResidenceOptionFile, this);
}
/// <summary>
@@ -78,7 +65,7 @@
/// <returns></returns>
public ResidenceOptionClass Load()
{
- string fileName = HdlFileNameResourse.ResidenceOptionFile;
+ string fileName = DirNameResourse.ResidenceOptionFile;
if (System.IO.File.Exists(fileName) == false)
{
return new ResidenceOptionClass();
--
Gitblit v1.8.0