From d8545fbd1b36a6766c57c987e5d89862b470fed9 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 03 九月 2020 09:46:29 +0800
Subject: [PATCH] 2020-09-03 1.修改风扇默认为关状态。2.Alexa添加设备时，去掉空调和通用开关选择添加支持。 3.场景增加通用开关添加和发送控制支持，Alexa 的场景同样增加通用开关的支持。
---
Crabtree/SmartHome/HDL/Operation/UserConfig.cs | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 54 insertions(+), 2 deletions(-)
diff --git a/Crabtree/SmartHome/HDL/Operation/UserConfig.cs b/Crabtree/SmartHome/HDL/Operation/UserConfig.cs
index 93db11b..6074190 100644
--- a/Crabtree/SmartHome/HDL/Operation/UserConfig.cs
+++ b/Crabtree/SmartHome/HDL/Operation/UserConfig.cs
@@ -7,7 +7,7 @@
[System.Serializable]
public class UserConfig
{
- static string configFile = "UserConfig";
+ public static string configFile = "UserConfig";
static UserConfig instance;
public static UserConfig Instance {
@@ -28,7 +28,7 @@
instance.HideDeviceTypes.Add (SimpleControl.R.MyInternationalizationString.Sensor);
instance.HideDeviceTypes.Add (SimpleControl.R.MyInternationalizationString.Environmental);
instance.HideDeviceTypes.Add (SimpleControl.R.MyInternationalizationString.MusicModel);
- instance.HideDeviceTypes.Add (SimpleControl.R.MyInternationalizationString.UniversalDevice);
+ //instance.HideDeviceTypes.Add (SimpleControl.R.MyInternationalizationString.UniversalDevice);
} else {
instance = temp;
}
@@ -154,6 +154,10 @@
set {
currentRegion = value;
CheckIfNeedGetMasterAccountToken ();
+ //鍒囨崲浣忓畢 璁剧疆鏈湴鍔犲瘑Key
+ SetLocalEncryptKey ();
+
+
}
get {
if (currentRegion == null) {
@@ -256,6 +260,54 @@
public List<string> RometoUserInfoKeys = new List<string> ();
+
+ /// <summary>
+ /// 鏈湴閫氫俊鍔犲瘑Key
+ /// </summary>
+ public string LocalEncryptKey = string.Empty;
+
+
+ /// <summary>
+ /// 鏄惁鍔犲瘑瀵嗙爜楠岃瘉閫氳繃
+ /// </summary>
+ public bool EncryptedPasswordCorrect = true;
+
+ /// <summary>
+ /// 鏄惁鍔犲瘑
+ /// </summary>
+ public bool IsLocalEncrypt = false;
+ /// <summary>
+ /// 璁剧疆涓洪粯璁ゅ姞瀵嗭紝骞惰绠楀姞瀵咾ey
+ /// </summary>
+ private void SetLocalEncryptKey ()
+ {
+ if (currentRegion != null) {
+ IsLocalEncrypt = true;
+ GenerateLocalEncryptionKey ();
+ //LocalEncryptKey = CommonPage.MyEncodingUTF8.GetString (GenerateLocalEncryptionKey ());
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇16浣嶇殑key byte []
+ /// </summary>
+ /// <returns></returns>
+ public byte [] GenerateLocalEncryptionKey ()
+ {
+ byte [] aseKey = new byte [16];
+ try {
+ //鐢熸垚鍔犲瘑Key
+ byte [] homeId = System.Text.Encoding.ASCII.GetBytes (currentRegion.Id);
+ Array.Copy (homeId, 0, aseKey, 0, 16 < homeId.Length ? 16 : homeId.Length);
+ LocalEncryptKey = System.Text.Encoding.ASCII.GetString (aseKey);
+ return aseKey;
+
+ } catch {
+ return aseKey;
+ }
+
+ }
+
public string MasterAccountToken = "";
public string MasterAccountRequestBaseUrl = "";
/// <summary>
--
Gitblit v1.8.0