From 50b7b7a486f56fab27c83b59eb45673c6d9f0935 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 24 二月 2021 18:33:57 +0800
Subject: [PATCH] 2021-02-24 1.新增场景上传。2.优化
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaSettingPage.cs | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaSettingPage.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaSettingPage.cs
index f36fde0..d330cc0 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaSettingPage.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaSettingPage.cs
@@ -196,7 +196,7 @@
#endregion
#region
|| typeString.ToString () == DeviceType.FanModule.ToString ()
- //|| typeString.ToString () == DeviceType.UniversalDevice.ToString ()
+ || typeString.ToString () == DeviceType.UniversalDevice.ToString ()
#endregion
);
});
@@ -286,6 +286,7 @@
} else if (deviceFilePath.Contains ("CurtainModel")) {
deviceFilePath = deviceFilePath.Replace ("CurtainModel", "CurtainModule");
}
+
Common commonDevice = Newtonsoft.Json.JsonConvert.DeserializeObject<Common> (System.Text.Encoding.UTF8.GetString (commonBytes));
if (commonDevice.Type == DeviceType.OnePortBus || commonDevice.Type == DeviceType.OnePortWirelessFR || commonDevice.Type == DeviceType.OnePortMqttFR || commonDevice.Type == DeviceType.RCU
|| commonDevice.Type == DeviceType.A31MusicModel || commonDevice.Type == DeviceType.MusicA31) {
@@ -430,7 +431,7 @@
//涓嬫媺鍒楄〃鐨勬暟鎹簮锛堥�夐」涓鸿澶囩被鍨嬫湁鍏筹級
List<string> typeTemp = new List<string>{
Language.StringByID(R.MyInternationalizationString.All),
- Language.StringByID(R.MyInternationalizationString.Scenes),
+ //Language.StringByID(R.MyInternationalizationString.Scenes),
Language.StringByID(R.MyInternationalizationString.Lights),
//Language.StringByID(R.MyInternationalizationString.AC),
Language.StringByID(R.MyInternationalizationString.Curtains),
@@ -442,7 +443,7 @@
//Language.StringByID (R.MyInternationalizationString.LogicModule),
//Language.StringByID(R.MyInternationalizationString.ElectricalControl),
//Language.StringByID (R.MyInternationalizationString.MusicModel),
- //Language.StringByID (R.MyInternationalizationString.UniversalDevice),
+ Language.StringByID (R.MyInternationalizationString.UniversalDevice),
//Language.StringByID (R.MyInternationalizationString.Sensor),
};
--
Gitblit v1.8.0