From 849d8656a8ec66bf3472ddabdc541f98cd0f3e09 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 17 十二月 2020 19:47:42 +0800
Subject: [PATCH] 2020-12-17 1.信息中心增加换行显示。2.收到报警推送类型的通知才弹窗。
---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 60 ++++++++++++++----------------------------------------------
1 files changed, 14 insertions(+), 46 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 0af4d57..48925f2 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,21 +1,12 @@
-锘�<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/UI/UI2/2-Classification/ClassificationPage.cs">
+锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
+ <MonoDevelop.Ide.Workbench>
<Files>
- <File FileName="HDL_ON/Entity/Function/Scene.cs" Line="262" Column="29" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs" Line="383" Column="25" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs" Line="107" Column="29" />
- <File FileName="HDL_ON/Entity/FunctionList.cs" Line="504" Column="47" />
- <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="1957" Column="10" />
- <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="172" Column="1" />
- <File FileName="HDL_ON/DAL/Server/NewAPI.cs" Line="372" Column="84" />
- <File FileName="HDL_ON/DAL/DriverLayer/Control_Udp.cs" Line="829" Column="45" />
- <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="376" Column="1" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs" Line="100" Column="1" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs" Line="528" Column="27" />
- <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" Line="909" Column="66" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs" Line="170" Column="43" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" Line="34" Column="30" />
+ <File FileName="HDL-ON_Android/Other/JPush/JPushService.cs" Line="1" Column="1" />
+ <File FileName="HDL-ON_Android/Other/JPush/JPushReceiver.cs" Line="170" Column="43" />
+ <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="118" Column="14" />
+ <File FileName="HDL_ON/DAL/Server/NewApiRes.cs" Line="1423" Column="28" />
+ <File FileName="HDL_ON/UI/UI0-Public/Widget/TextButton.cs" Line="42" Column="42" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -23,38 +14,14 @@
<Node name="HDL_APP_Project" expanded="True">
<Node name="HDL_ON" 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="Function" expanded="True" />
- </Node>
<Node name="UI" expanded="True">
- <Node name="UI0-Public" expanded="True" />
- <Node name="UI2" expanded="True">
- <Node name="1-HomePage" expanded="True" />
- <Node name="2-Classification" expanded="True">
- <Node name="ClassificationPage.cs" selected="True" />
- </Node>
- <Node name="3-Intelligence" expanded="True">
- <Node name="Scene" expanded="True" />
- </Node>
- <Node name="4-PersonalCenter" expanded="True">
- <Node name="RoomListManage" expanded="True">
- <Node name="AddRoom" expanded="True" />
- </Node>
- </Node>
- <Node name="FuntionControlView" expanded="True">
- <Node name="AC" expanded="True" />
- <Node name="Electrical" expanded="True" />
- <Node name="FoolHeating" expanded="True" />
+ <Node name="UI0-Public" expanded="True">
+ <Node name="Widget" expanded="True">
+ <Node name="TextButton.cs" selected="True" />
</Node>
</Node>
- </Node>
- </Node>
- <Node name="HDL-ON_iOS" expanded="True">
- <Node name="Resources" expanded="True">
- <Node name="Phone" expanded="True" />
</Node>
</Node>
</Node>
@@ -69,10 +36,11 @@
<String>Shared.IOS/Shared.IOS.csproj</String>
</DisabledProjects>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.364c4b3158493098" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore>
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Function/Scene.cs" relfile="HDL_ON/Entity/Function/Scene.cs" line="292" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Function/Scene.cs" relfile="HDL_ON/Entity/Function/Scene.cs" line="266" column="1" />
+ <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/ON+/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs" relfile="HDL_ON/UI/UI1-Login/RegisterPageBLL.cs" line="579" column="1" />
+ <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/ON+/HDL_ON/Entity/Function/Function.cs" relfile="HDL_ON/Entity/Function/Function.cs" line="265" column="1" />
</BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
--
Gitblit v1.8.0