From f5268d43584a1f72cb7b19c17232645c24e2348b Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 17 十二月 2020 15:29:31 +0800
Subject: [PATCH] 20201217-3
---
HDL_ON/Entity/Function/TV.cs | 4 ++--
.vs/HDL_APP_Project/xs/UserPrefs.xml | 46 ++++++++++------------------------------------
HDL_ON/DAL/DriverLayer/Control.cs | 5 -----
3 files changed, 12 insertions(+), 43 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 5edc66e..1815d1a 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -2,16 +2,19 @@
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" />
<MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/Server/HttpServerRequest.cs">
<Files>
- <File FileName="../../Downloads/PanelColorSelectForm.cs" Line="6" Column="46" IsPinned="True" />
+ <File FileName="../../Downloads/PanelColorSelectForm.cs" Line="117" Column="1" IsPinned="True" />
<File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs" Line="153" Column="1" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs" Line="385" Column="99" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs" Line="375" Column="31" />
<File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs" Line="899" Column="38" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs" Line="22" Column="51" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs" Line="16" Column="20" />
<File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs" Line="6" Column="20" />
<File FileName="HDL_ON/UI/MainPage.cs" Line="264" Column="62" />
<File FileName="HDL_ON/Entity/FunctionList.cs" Line="384" Column="22" />
<File FileName="HDL_ON/Entity/Room.cs" Line="546" Column="14" />
- <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="1776" Column="22" />
+ <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="1838" Column="52" />
+ <File FileName="HDL_ON/Entity/Function/TV.cs" Line="27" Column="30" />
+ <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="469" Column="78" />
+ <File FileName="HDL_ON/Entity/Function/Function.cs" Line="260" Column="1" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -28,39 +31,10 @@
<Node name="Function" expanded="True" />
</Node>
<Node name="UI" expanded="True">
- <Node name="UI0-Public" expanded="True" />
- <Node name="UI2" expanded="True">
- <Node name="3-Intelligence" expanded="True">
- <Node name="Scene" expanded="True" />
- </Node>
- <Node name="4-PersonalCenter" expanded="True">
- <Node name="MemberManagement" expanded="True" />
- </Node>
- <Node name="FuntionControlView" expanded="True">
- <Node name="Light" expanded="True" />
- <Node name="Music" expanded="True" />
- </Node>
- </Node>
+ <Node name="BindingResidence" expanded="True" />
</Node>
</Node>
- <Node name="HDL-ON_Android" expanded="True">
- <Node name="Assets" expanded="True">
- <Node name="Phone" expanded="True">
- <Node name="FunctionIcon" expanded="True">
- <Node name="Light" expanded="True" />
- </Node>
- </Node>
- </Node>
- </Node>
- <Node name="HDL-ON_iOS" expanded="True">
- <Node name="Resources" expanded="True">
- <Node name="Phone" expanded="True">
- <Node name="FunctionIcon" expanded="True">
- <Node name="Light" expanded="True" />
- </Node>
- </Node>
- </Node>
- </Node>
+ <Node name="HDL-ON_iOS" expanded="True" />
</Node>
</State>
</Pad>
@@ -82,7 +56,7 @@
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore>
<Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs" relfile="HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs" line="86" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Function/Function.cs" relfile="HDL_ON/Entity/Function/Function.cs" line="260" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="1837" column="1" />
</BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
diff --git a/HDL_ON/DAL/DriverLayer/Control.cs b/HDL_ON/DAL/DriverLayer/Control.cs
index dcd5410..6aa43e7 100644
--- a/HDL_ON/DAL/DriverLayer/Control.cs
+++ b/HDL_ON/DAL/DriverLayer/Control.cs
@@ -469,11 +469,6 @@
public void UpdataFunctionStatus(string revString,byte []usefulBytes)
{
MainPage.Log($"A鍗忚鏇存柊鐘舵��:{revString}");
- if(Control.Ins.myUdp!= null)
- {
- //閲嶇疆閲嶅惎udp鍒ゆ柇璋冩暣
- Ins.myUdp.controlLostCount = 0;
- }
var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<AlinkFunctionStatusObj>(revString);
if (temp != null)
{
diff --git a/HDL_ON/Entity/Function/TV.cs b/HDL_ON/Entity/Function/TV.cs
index 3d8289c..c0b23c5 100644
--- a/HDL_ON/Entity/Function/TV.cs
+++ b/HDL_ON/Entity/Function/TV.cs
@@ -14,7 +14,7 @@
{
int RandKey = new Random().Next(0, 255);
var textByte = (byte)iCode;
- Control.Ins.myUdp.ControlBytesSend(Command.InfraredControl, bus.SubnetID, bus.DeviceID, new byte[] { 1, bus.LoopId, textByte, 0, 0, (byte)RandKey }, 0);
+ new Control_Udp().ControlBytesSend(Command.InfraredControl, bus.SubnetID, bus.DeviceID, new byte[] { 1, bus.LoopId, textByte, 0, 0, (byte)RandKey }, 0);
}
public void ControlTV(int number)
{
@@ -24,7 +24,7 @@
{
textByte = 18;
}
- Control.Ins.myUdp.ControlBytesSend(Command.InfraredControl, bus.SubnetID, bus.DeviceID, new byte[] { 1, bus.LoopId, textByte, 0, 0, (byte)RandKey }, 0);
+ new Control_Udp().ControlBytesSend(Command.InfraredControl, bus.SubnetID, bus.DeviceID, new byte[] { 1, bus.LoopId, textByte, 0, 0, (byte)RandKey }, 0);
}
}
}
--
Gitblit v1.8.0