From 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 21 七月 2020 09:46:53 +0800
Subject: [PATCH] 请合并最新多功能面板代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/ResidenceOption.cs | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/ResidenceOption.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/ResidenceOption.cs
index 2461b93..c4dfa2e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/ResidenceOption.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/ResidenceOption.cs
@@ -35,6 +35,16 @@
/// </summary>
[Newtonsoft.Json.JsonIgnore]
public int DoorLockMaxAlarmMsgDay = 5;
+ /// <summary>
+ /// 褰撳墠涓婚〉,鍦烘櫙鍜屽姛鑳芥墍閫夋嫨鐨勫垎鏀� 1:鍦烘櫙 2:鍔熻兘
+ /// </summary>
+ [Newtonsoft.Json.JsonIgnore]
+ public int HomeMainPageSwitchIndex = 1;
+ /// <summary>
+ /// 褰撳墠鍒嗙被,鍦烘櫙鍜屽姛鑳芥墍閫夋嫨鐨勫垎鏀� 0:鍦烘櫙 1:鍔熻兘 2:鑷姩鍖�
+ /// </summary>
+ [Newtonsoft.Json.JsonIgnore]
+ public int CategoryPageSwitchIndex = 0;
#endregion
@@ -45,18 +55,8 @@
/// </summary>
public void Save()
{
- try
- {
- var data = Newtonsoft.Json.JsonConvert.SerializeObject(this);
- var byteData = System.Text.Encoding.UTF8.GetBytes(data);
- string fullName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.ResidenceOptionFile);
- //鍐欏叆鍐呭
- Shared.IO.FileUtils.WriteFileByBytes(fullName, byteData);
- }
- catch (Exception ex)
- {
- HdlLogLogic.Current.WriteLog(ex);
- }
+ //鍐欏叆鍐呭
+ HdlFileLogic.Current.SaveFileContent(DirNameResourse.ResidenceOptionFile, this);
}
/// <summary>
@@ -65,14 +65,14 @@
/// <returns></returns>
public ResidenceOptionClass Load()
{
- string fileName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.ResidenceOptionFile);
+ string fileName = DirNameResourse.ResidenceOptionFile;
if (System.IO.File.Exists(fileName) == false)
{
return new ResidenceOptionClass();
}
try
{
- var varByte = Shared.IO.FileUtils.ReadFile(fileName);
+ var varByte = HdlFileLogic.Current.ReadFileByteContent(fileName);
string strValue = System.Text.Encoding.UTF8.GetString(varByte);
var info = Newtonsoft.Json.JsonConvert.DeserializeObject<ResidenceOptionClass>(strValue);
--
Gitblit v1.8.0