| .vs/HDL_APP_Project/xs/UserPrefs.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/DAL/DriverLayer/Control.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/Entity/Function/Function.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/Entity/FunctionList.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,6 +1,6 @@ <Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default"> <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" /> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/Mqtt/MqttClient.cs"> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/DriverLayer/Control.cs"> <Files> <File FileName="HDL_ON/Common/R.cs" Line="9" Column="19" /> <File FileName="HDL-ON_iOS/Resources/Language.ini" /> @@ -18,14 +18,13 @@ <File FileName="HDL_ON/UI/UI2/FuntionControlView/ArmSensor/ArmSensorHistroyPaging.cs" /> <File FileName="HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SenesorMegahealthPage.cs" /> <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" /> <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="675" Column="34" /> <File FileName="HDL_ON/DAL/Server/NewApiRes.cs" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs" /> <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs" /> <File FileName="HDL_ON/Entity/Function/Function.cs" /> <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" /> <File FileName="HDL_ON/DAL/Server/NewAPI.cs" /> <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" Line="681" Column="5" /> <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" Line="424" Column="69" /> </Files> <Pads> <Pad Id="ProjectPad"> @@ -33,10 +32,16 @@ <Node name="HDL_APP_Project" expanded="True"> <Node name="HDL_ON" expanded="True"> <Node name="DAL" expanded="True"> <Node name="Mqtt" expanded="True"> <Node name="MqttClient.cs" selected="True" /> <Node name="DriverLayer" expanded="True"> <Node name="Control.cs" selected="True" /> </Node> <Node name="Mqtt" expanded="True" /> <Node name="Server" expanded="True" /> </Node> <Node name="Entity" expanded="True"> <Node name="Function" expanded="True" /> </Node> <Node name="UI" expanded="True" /> </Node> </Node> </State> @@ -59,6 +64,7 @@ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="1857" column="1" /> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/AddSenesorMegahealthDirection1Page.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/AddSenesorMegahealthDirection1Page.cs" line="119" column="1" /> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Mqtt/MqttClient.cs" relfile="HDL_ON/DAL/Mqtt/MqttClient.cs" line="678" column="1" /> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/DriverLayer/Control.cs" relfile="HDL_ON/DAL/DriverLayer/Control.cs" line="673" column="1" /> </BreakpointStore> </MonoDevelop.Ide.DebuggingService.Breakpoints> <MultiItemStartupConfigurations /> HDL_ON/DAL/DriverLayer/Control.cs
@@ -669,15 +669,6 @@ /// <param name="updateBytes"></param> public void UpdataFunctionStatus(string revString, byte[] usefulBytes,bool isCloudData = false) { if (Ins.GatewayOnline_Local && isCloudData)//本地链接，除了涂鸦设备数据之外的云端数据不处理 { if (FunctionList.List.GetDeviceFunctionList(SPK.BrandType.Tuya).Count == 0) { //MainPage.Log($"A协议更新状态:本地链接，除了涂鸦设备数据之外的云端数据不处理..."); return; } } var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<AlinkFunctionStatusObj>(revString); if (temp != null) { @@ -687,6 +678,22 @@ { try { if (Ins.GatewayOnline_Local && isCloudData)//本地链接，除了涂鸦设备数据之外的云端数据不处理 { if (FunctionList.List.OtherBrandFunction.Count != 0) { if (FunctionList.List.OtherBrandFunction.Find((obj) => obj.sid == updateTemp.sid) == null) { //MainPage.Log($"A协议更新状态:本地链接，除了涂鸦设备数据之外的云端数据不处理..."); return; } } } var localFunction = allLocalFuntion.Find((obj) => obj.sid == updateTemp.sid); if (localFunction == null) { HDL_ON/Entity/Function/Function.cs
@@ -945,6 +945,8 @@ public static class SPK { #region 灯光 /// <summary> @@ -1349,7 +1351,21 @@ } #endregion #region 第三方spk列表 /// <summary> /// 获取所有第三方品牌功能的spk /// </summary> /// <returns></returns> public static List<string> GetAll3tySPK() { var spkList = new List<string>(); spkList.Add(ElectricTuyaAirCleaner); spkList.Add(ElectricTuyaFan); spkList.Add(ElectricTuyaWaterValve); spkList.Add(ElectricTuyaWeepRobot); spkList.Add(SenesorMegahealth); return spkList; } /// <summary> /// 获取第三方设备spk /// </summary> @@ -1360,16 +1376,19 @@ switch (brandType) { case BrandType.All3tyBrand: case BrandType.Tuya: list.Add(ElectricTuyaAirCleaner); list.Add(ElectricTuyaFan); list.Add(ElectricTuyaWaterValve); list.Add(ElectricTuyaWeepRobot); break; case BrandType.All3tyBrand: list.Add(SenesorMegahealth);//兆观 break; } return list; } #endregion /// <summary> @@ -1380,6 +1399,10 @@ All = 0, Hdl = 1, Tuya = 2, /// <summary> /// 兆观 /// </summary> Megahealth = 3, All3tyBrand = 999, HDL_ON/Entity/FunctionList.cs
@@ -143,6 +143,25 @@ /// </summary> public UI.UI2.FuntionControlView.Video.VideoClouds videoIntercom; List<Function> _OtherBrandFunction; /// <summary> /// 第三方品牌功能 /// </summary> public List<Function> OtherBrandFunction { get { if(_OtherBrandFunction == null) { _OtherBrandFunction = new List<Function>(); var spkList = SPK.GetAll3tySPK(); _OtherBrandFunction = Functions.FindAll((obj) => spkList.Contains(obj.spk)); } return _OtherBrandFunction; } } /// <summary> /// 场景列表 /// </summary> @@ -271,6 +290,9 @@ return Functions; } /// <summary> /// 清空设备功能列表 /// </summary>
