From 531f1380ec8478e109118cf96bc2c9f31e9278d1 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 23 六月 2021 09:27:23 +0800
Subject: [PATCH] 代码同步
---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 74 ++++++++++++++++---------------------
1 files changed, 32 insertions(+), 42 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index b9b526f..317a65d 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,60 +1,48 @@
锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
- <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/Common/R.cs">
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-000929D421E8802E" />
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs">
<Files>
- <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="150" Column="25" IsPinned="True" />
- <File FileName="HDL-ON_iOS/Resources/Language.ini" Line="1963" Column="8" />
- <File FileName="HDL-ON_Android/Assets/Language.ini" Line="1593" Column="1" />
- <File FileName="HDL-ON_iOS/Info.plist" />
- <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="193" Column="26" />
- <File FileName="HDL_ON/UI/UI1-Login/LoginPageBLL.cs" Line="175" Column="1" />
- <File FileName="HDL_ON/Entity/DB_ResidenceData.cs" Line="31" Column="30" />
- <File FileName="HDL_ON/Common/UserInfo.cs" Line="29" Column="34" />
- <File FileName="HDL_ON/UI/UI2/UserPage.cs" Line="569" Column="25" />
- <File FileName="HDL_ON/UI/MainPage.cs" Line="174" Column="34" />
- <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs" Line="1" Column="1" />
- <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" Line="203" Column="38" />
- <File FileName="HDL_ON/Common/R.cs" Line="8" Column="36" />
+ <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="275" Column="53" />
+ <File FileName="HDL-ON_iOS/Resources/Language.ini" Line="30" Column="10" />
+ <File FileName="HDL-ON_Android/Assets/Language.ini" />
+ <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" Line="637" Column="53" />
+ <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs" Line="402" Column="64" />
+ <File FileName="HDL_ON/UI/MainPage.cs" Line="275" Column="45" />
+ <File FileName="HDL_ON/UI/UI2/UserPageBLL.cs" Line="6" Column="26" />
+ <File FileName="HDL_ON/UI/UI2/UserPage.cs" Line="571" Column="7" />
+ <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" Line="101" Column="16" />
+ <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="599" Column="27" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs" Line="249" Column="22" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs" Line="238" Column="25" />
+ <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs" Line="94" Column="26" />
+ <File FileName="HDL_ON/Common/ApiUtlis.cs" Line="123" Column="1" />
+ <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="16" Column="22" />
+ <File FileName="HDL_ON/Entity/Room.cs" Line="111" Column="43" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs" Line="244" Column="1" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs" Line="186" Column="39" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="HDL_APP_Project" expanded="True">
<Node name="HDL_ON" expanded="True">
- <Node name="Common" expanded="True">
- <Node name="R.cs" selected="True" />
- </Node>
+ <Node name="Common" expanded="True" />
<Node name="DAL" expanded="True">
- <Node name="DriverLayer" expanded="True" />
<Node name="Server" expanded="True" />
</Node>
- <Node name="Entity" expanded="True">
- <Node name="Device" expanded="True" />
- <Node name="Function" expanded="True" />
- </Node>
+ <Node name="Entity" expanded="True" />
<Node name="UI" expanded="True">
- <Node name="UI1-Login" expanded="True" />
<Node name="UI2" expanded="True">
- <Node name="1-HomePage" expanded="True" />
- <Node name="2-Classification" expanded="True" />
<Node name="3-Intelligence" expanded="True">
- <Node name="Automation" expanded="True" />
- </Node>
- <Node name="4-PersonalCenter" expanded="True">
- <Node name="AddDevice" expanded="True">
- <Node name="SenesorMegahealth" expanded="True" />
+ <Node name="Automation" expanded="True">
+ <Node name="AddLogic.cs" selected="True" />
</Node>
- <Node name="AddFunction" expanded="True" />
- <Node name="RoomListManage" expanded="True">
- <Node name="AddRoom" expanded="True" />
- </Node>
- </Node>
- <Node name="FuntionControlView" expanded="True">
- <Node name="1ContorlPage" expanded="True" />
- <Node name="AC" expanded="True" />
</Node>
</Node>
</Node>
+ </Node>
+ <Node name="HDL-ON_iOS" expanded="True">
+ <Node name="Resources" expanded="True" />
</Node>
</Node>
</State>
@@ -72,10 +60,12 @@
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore>
<Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" line="34" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs" line="313" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/BindingResidence/BindingResidencePage.cs" relfile="HDL_ON/UI/BindingResidence/BindingResidencePage.cs" line="121" 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="118" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/1-HomePage/HomePage.cs" relfile="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" line="198" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs" line="546" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Common/ApiUtlis.cs" relfile="HDL_ON/Common/ApiUtlis.cs" line="117" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs" line="255" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs" line="327" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs" line="191" column="1" />
</BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
--
Gitblit v1.8.0