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 | 66 +++++++++++----------------------
1 files changed, 22 insertions(+), 44 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 67425cc..48925f2 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,54 +1,26 @@
-锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
- <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.0F4026EE-BBCD-4E97-B4B5-7A70C2BB2286" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.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/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs" Line="59" Column="10" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/Room/FunctionDiv.cs" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/Room/FunctionDivBLL.cs" />
- <File FileName="HDL_ON/Entity/Function/Curtain/Curtain.cs" />
- <File FileName="HDL_ON/Entity/DB_ResidenceData.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs" Line="147" Column="46" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs" />
+ <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">
<State name="__root__">
<Node name="HDL_APP_Project" expanded="True">
<Node name="HDL_ON" expanded="True">
- <Node name="DriverLayer" expanded="True" />
- <Node name="Entity" expanded="True">
- <Node name="Function" expanded="True">
- <Node name="Curtain" expanded="True" />
- <Node name="Light" expanded="True" />
- </Node>
+ <Node name="DAL" expanded="True">
+ <Node name="Server" expanded="True" />
</Node>
<Node name="UI" expanded="True">
- <Node name="UI2" expanded="True">
- <Node name="1-HomePage" expanded="True" />
- <Node name="2-Classification" expanded="True">
- <Node name="Room" expanded="True" />
+ <Node name="UI0-Public" expanded="True">
+ <Node name="Widget" expanded="True">
+ <Node name="TextButton.cs" selected="True" />
</Node>
- <Node name="FuntionControlView" expanded="True">
- <Node name="Curtain" expanded="True">
- <Node name="RollingShutterPage.cs" selected="True" />
- </Node>
- <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="Collection" expanded="True" />
- <Node name="FunctionIcon" expanded="True">
- <Node name="Curtain" expanded="True" />
- <Node name="Scene" expanded="True" />
- </Node>
- <Node name="Public" expanded="True" />
</Node>
</Node>
</Node>
@@ -58,11 +30,17 @@
</Pads>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
+ <DisabledProjects>
+ <String>Shared.IOS.TBL/Shared.IOS.TBL.csproj</String>
+ <String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
+ <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/nigel/Desktop/HDL_APP_Project/HDL_ON/UI/MainPage.cs" relfile="HDL_ON/UI/MainPage.cs" line="181" column="1" />
- <Breakpoint file="/Users/nigel/Desktop/HDL_APP_Project/HDL_ON/UI/MainPage.cs" relfile="HDL_ON/UI/MainPage.cs" line="179" 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