From c404f2f369710fe72bbcc4cff2b7b8a2c11b5ff1 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 02 三月 2021 17:48:32 +0800
Subject: [PATCH] Merge branch 'master' into wjc
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserDeviceListPage.cs | 83 +----------------------------------------
1 files changed, 2 insertions(+), 81 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserDeviceListPage.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserDeviceListPage.cs
index 7dbb41c..cf19b50 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserDeviceListPage.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserDeviceListPage.cs
@@ -181,87 +181,8 @@
deviceScrolView.RemoveAll ();
System.Threading.Tasks.Task.Run (() => {
//鎵惧嚭闇�瑕佹樉绀虹殑璁惧
- var filesList = IO.FileUtils.ReadFiles ().FindAll ((obj) => {
- string [] str = obj.Split ('_');
- return obj.StartsWith ("Equipment_") && str.Length == 5;
- });
- var localEquipments = filesList.FindAll ((obj) => {
- string typeString = obj.Split ('_') [1];
- return (
- #region light
- typeString.ToString () == DeviceType.LightCCT.ToString () ||
- typeString.ToString () == DeviceType.LightRGB.ToString () ||
- typeString.ToString () == DeviceType.LightDALI.ToString () ||
- typeString.ToString () == DeviceType.LightRGBW.ToString () ||
- typeString.ToString () == DeviceType.LightLogic.ToString () ||
- typeString.ToString () == DeviceType.LightSwitch.ToString () ||
- typeString.ToString () == DeviceType.LightDimming.ToString () ||
- typeString.ToString () == DeviceType.LightMixSwitch.ToString () ||
- typeString.ToString () == DeviceType.LightRGBandCCT.ToString () ||
- typeString.ToString () == DeviceType.LightMixDimming.ToString () ||
- typeString.ToString () == DeviceType.LightEnergySwitch.ToString () ||
- typeString.ToString () == DeviceType.LightEnergySocket.ToString () ||
- typeString.ToString () == DeviceType.LightSwitchSocket.ToString ()
- || typeString.ToString () == DeviceType.DMX48.ToString ()
- #endregion
- #region light
- || typeString.ToString () == DeviceType.SensorCH4.ToString () ||
- typeString.ToString () == DeviceType.SensorCO2.ToString () ||
- typeString.ToString () == DeviceType.SensorLPG.ToString () ||
- typeString.ToString () == DeviceType.SensorCOH2.ToString () ||
- typeString.ToString () == DeviceType.SensorPM25.ToString () ||
- typeString.ToString () == DeviceType.SensorTVOC.ToString () ||
- typeString.ToString () == DeviceType.SensorPower.ToString () ||
- typeString.ToString () == DeviceType.SensorSmoke.ToString () ||
- typeString.ToString () == DeviceType.SensorWater.ToString () ||
- typeString.ToString () == DeviceType.SensorWeight.ToString () ||
- typeString.ToString () == DeviceType.SensorCurrent.ToString () ||
- typeString.ToString () == DeviceType.SensorVoltage.ToString ()
- || typeString.ToString () == DeviceType.SensorRainfall.ToString ()
- || typeString.ToString () == DeviceType.SensorVelocity.ToString ()
- || typeString.ToString () == DeviceType.SensorMenciAndwindowMagnetic.ToString ()
- || typeString.ToString () == DeviceType.SensorMobileDetection.ToString ()
- || typeString.ToString () == DeviceType.SensorLiquidPressure.ToString ()
- || typeString.ToString () == DeviceType.SensorVibration.ToString ()
- || typeString.ToString () == DeviceType.SensorLiquidFlow.ToString ()
- || typeString.ToString () == DeviceType.SensorLiquidDepth.ToString ()
- || typeString.ToString () == DeviceType.SensorTemperature.ToString ()
- || typeString.ToString () == DeviceType.SensorHeightLength.ToString ()
- || typeString.ToString () == DeviceType.SensorIllumination.ToString ()
- || typeString.ToString () == DeviceType.SensorWindPressure.ToString ()
- || typeString.ToString () == DeviceType.SensorHumidity.ToString ()
- #endregion
- #region curtain
- || typeString.ToString () == DeviceType.CurtainModel.ToString ()
- || typeString.ToString () == DeviceType.CurtainRoller.ToString ()
- || typeString.ToString () == DeviceType.CurtainTrietex.ToString ()
- #endregion
- #region ac
- || typeString.ToString () == DeviceType.ACPanel.ToString ()
- || typeString.ToString () == DeviceType.ACDevice.ToString ()
- || typeString.ToString () == DeviceType.ACInfrared.ToString ()
- || typeString.ToString () == DeviceType.ACCoolmaster.ToString ()
- || typeString.ToString () == DeviceType.CustomAC.ToString ()
- || typeString.ToString () == DeviceType.HVAC.ToString ()
- #endregion
- #region foolheat
- || typeString.ToString () == DeviceType.FoolHeat.ToString ()
- || typeString.ToString () == DeviceType.FoolHeatPanel.ToString ()
- #endregion
- #region
- || typeString.ToString () == DeviceType.InfraredMode.ToString ()
- || typeString.ToString () == DeviceType.DoorLock.ToString ()
- || typeString.ToString () == DeviceType.FanModule.ToString ()
- || typeString.ToString () == DeviceType.FreshAir.ToString ()
- || typeString.ToString () == DeviceType.InfraredTV.ToString ()
- || typeString.ToString () == DeviceType.UniversalDevice.ToString ()
- || typeString.ToString () == DeviceType.MusicModel.ToString ()
- || typeString.ToString () == DeviceType.SecurityModule.ToString ()
- || typeString.ToString () == DeviceType.LogicModule.ToString ()
- || typeString.ToString () == DeviceType.SecurityPanel.ToString ()
- #endregion
- );
- });
+ var localEquipments = CommonUtlis.Current.GetAllLocalEquipments ();
+
var globalSceneFileList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<string>> (System.Text.Encoding.UTF8.GetString (IO.FileUtils.ReadFile (Scene.GlobalSceneFilePath)));
if (globalSceneFileList == null) {
globalSceneFileList = new List<string> ();
--
Gitblit v1.8.0