From 590a012a34db27cd1630eb70406e05d5af55e4ca Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 27 十一月 2019 10:15:21 +0800
Subject: [PATCH] 20191126
---
HDL_ON/HDL/Operation/UserConfig.cs | 129 +------------------------------------------
1 files changed, 3 insertions(+), 126 deletions(-)
diff --git a/HDL_ON/HDL/Operation/UserConfig.cs b/HDL_ON/HDL/Operation/UserConfig.cs
index 9af80c9..1a3e264 100644
--- a/HDL_ON/HDL/Operation/UserConfig.cs
+++ b/HDL_ON/HDL/Operation/UserConfig.cs
@@ -1,7 +1,6 @@
锘縰sing System;
using System.Collections.Generic;
using HDL_ON.DAL;
-using HDL_ON.R;
namespace HDL_ON
{
@@ -23,33 +22,11 @@
}
if (temp == null) {
instance = new UserConfig { };
- instance.HideDeviceTypes.Add (InternationalizationString.VideoIntercom);
- instance.HideDeviceTypes.Add (InternationalizationString.Thermostat);
} else {
instance = temp;
}
} catch { }
}
- instance.DeviceTypes = new List<int> (){
- InternationalizationString.AC,
- InternationalizationString.Lights,
- InternationalizationString.Curtain,
- InternationalizationString.Scenes,
- InternationalizationString.FoolHeat,
- InternationalizationString.Monitor,
- InternationalizationString.Security,
- InternationalizationString.TV,
- InternationalizationString.Music,
- InternationalizationString.ElectricalControl,
- InternationalizationString.Fan,
- InternationalizationString.DoorLock,
- InternationalizationString.UniversalDevice,
- InternationalizationString.Environmental,
- InternationalizationString.VideoIntercom,
- InternationalizationString.Thermostat,
-
- //-------------------------------------
- };
return instance;
}
}
@@ -71,16 +48,10 @@
}
public int internetStatus = 2;
-
/// <summary>
- /// 瀛樻斁涓嶇敤璋冨厜鍔熻兘鐨勮皟鍏夎澶�
+ /// 鍥藉浠ｇ爜
/// </summary>
- public List<string> UnEnableDimmingLight = new List<string> ();
-
- /// <summary>
- /// 鎻掑骇寮�鍏冲垪琛�
- /// </summary>
- public List<string> SocketList = new List<string> ();
+ public string CountryCode;
/// <summary>
/// 鎵嬫満appID
@@ -92,72 +63,17 @@
/// </summary>
public string phoneName = string.Empty;
- /// <summary>
- /// 鐢ㄦ埛鐣岄潰杩涘叆鏃舵槸鍚︽樉绀虹殑鏄叏灞�鍦烘櫙鐣岄潰
- /// </summary>
- public bool SceneOfGloba = false;
-
- /// <summary>
- /// 淇濆瓨杩滅▼杩炴帴鐨勭綉缁滆澶囨枃浠跺悕
- /// </summary>
- public string RemoteModeFile = string.Empty;
-
- /// <summary>
- /// 鏄惁灞曞紑鎴块棿鐏厜鍒楄〃
- /// </summary>
- public bool ShowRoomLightList = true;
-
- /// <summary>
- /// 鏄惁灞曞紑鎴块棿绐楀笜鍒楄〃
- /// </summary>
- public bool ShowRoomCurtainList = true;
-
- /// <summary>
- /// 闅愯棌娌℃湁鍦烘櫙鐨勬埧闂�
- /// </summary>
- public bool HideInvalidRoomScene = false;
-
- public bool ShowFunctionBackground = true;
-
- //瑕佹樉绀虹殑璁惧绫诲瀷鍏堝湪杩欓噷鍔犺繘鏂囨湰閫夋嫨
- public List<int> DeviceTypes = null;
-
- public List<int> HideDeviceTypes = new List<int> ();
-
public Dictionary<string, int> SkinVision = new Dictionary<string, int> ();
public Dictionary<string, int> DowlaodSkinVision = new Dictionary<string, int> ();
- /// <summary>
- /// 褰撳墠浣跨敤鐨勭毊鑲�
- /// </summary>
- public string CurrentSkinName {
- get {
- string skinPath = "Phone";
- if (SkinCode == 0) {
- skinPath = "Phone";
- } else if (SkinCode == 1) {
- skinPath = "Phone2";
- }
- return skinPath;
- }
- }
-
/// <summary>
/// 瀹夐槻瀵嗙爜
/// </summary>
public string ArmPW = "85521566";
-
/// <summary>
/// 鏄惁鏄剧ず鍦烘櫙鍒楄〃
/// </summary>
public bool ShowAlternativeScene = true;
-
- //闂ㄩ攣瀵嗙爜淇濆瓨
- public Dictionary<string, string> RemoteDoorLockPasswordList = new Dictionary<string, string> ();
-
- public string CountryCode = "CN";
-
- public int SkinCode = 0;
public string SetLanguage = "";
@@ -170,48 +86,9 @@
/// 鏄惁涓哄晢搴楁渶鏂扮増鏈�
/// </summary>
public bool IsAppStoreVersionNewer = true;
- /// <summary>
- /// 鏄惁闇�瑕佹洿鏂帮紝鏇存柊鐨勭被鍨嬫槸浠�涔�
- /// </summary>
- //public SimpleControl.Phone.UpdateVersionType UpdateVersionType = 0;
public List<RegionInfoRes> HomeLists = new List<RegionInfoRes> ();
- public RegionInfoRes CurrentRegion = new RegionInfoRes ();
- [Newtonsoft.Json.JsonIgnore]
- public string GatewayMAC {
- get {
- return CurrentRegion.MAC;
- }
- }
-
- public List<string> RometoUserInfoKeys = new List<string> ();
-
- //public static List<string> LocalFiles = IO.FileUtils.ReadFiles ();
-
- /// <summary>
- /// 璁板綍鏈�鍚庝竴娆¤Е鍙戠殑鍦烘櫙
- /// </summary>
- public string CurScene = string.Empty;
-
- /// <summary>
- /// 涓婚〉鏄惁璁剧疆浜嗕紶鎰熷櫒
- /// </summary>
- public bool IsSetHomePageSensor = false;
- public HomePageSensor temp = null;// new HomePageSensor () { DeviceID = 11, LoopID = 1, Name = "temp.", SubnetID = 1 };
- public HomePageSensor pm25 = null;// new HomePageSensor () { DeviceID = 1, LoopID = 1, Name = "pm25", SubnetID = 1 };
- public HomePageSensor humidity = null;//new HomePageSensor () { DeviceID = 1, LoopID =2, Name = "humidity", SubnetID = 1 };
- public HomePageSensor co2 = null;//new HomePageSensor () { DeviceID = 1, LoopID = 3, Name = "co2", SubnetID = 1 };
- public HomePageSensor tvoc = null;//new HomePageSensor () { DeviceID = 1, LoopID = 4, Name = "tvoc", SubnetID = 1 };
- public HomePageSensor formaldehyde = null;// new HomePageSensor () { DeviceID = 1, LoopID = 5, Name = "formaldehyde", SubnetID = 1 };
- }
-
- public class HomePageSensor
- {
- public byte SubnetID;
- public byte DeviceID;
- public byte LoopID;
- public string Name;
- public double values;
+ public RegionInfoRes CurrentRegion = new RegionInfoRes() { MAC = "0123456789ABCDEF", RegionID = 6666, RegionName = "濡効鐨勫" } ;
}
}
\ No newline at end of file
--
Gitblit v1.8.0