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 | 43 ++++++++++++++++++++++---------------------
1 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 0eab4ed..48925f2 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,28 +1,30 @@
锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
- <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" />
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
<MonoDevelop.Ide.Workbench>
<Files>
- <File FileName="HDL_ON/Entity/Room.cs" Line="83" Column="40" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs" Line="110" Column="41" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomsManagementPageBLL.cs" Line="65" Column="43" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/RoomPageBLL.cs" Line="44" Column="32" />
- <File FileName="HDL_ON/Entity/DB_ResidenceData.cs" Line="116" Column="38" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" Line="493" 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">
<State name="__root__">
<Node name="HDL_APP_Project" expanded="True">
- <Node name="HDL-ON_Android" selected="True" />
+ <Node name="HDL_ON" expanded="True">
+ <Node name="DAL" expanded="True">
+ <Node name="Server" expanded="True" />
+ </Node>
+ <Node name="UI" expanded="True">
+ <Node name="UI0-Public" expanded="True">
+ <Node name="Widget" expanded="True">
+ <Node name="TextButton.cs" selected="True" />
+ </Node>
+ </Node>
+ </Node>
+ </Node>
</Node>
- </State>
- </Pad>
- <Pad Id="MonoDevelop.Debugger.WatchPad">
- <State>
- <Value>global::HDL_ON.UserInfo.Current.regionList[0].Name</Value>
- <Value>global::HDL_ON.Entity.DB_ResidenceData.Instance.CurrentRegion.Name</Value>
- <Value>function.sid</Value>
- <Value>function.trait_on_off.curValue</Value>
</State>
</Pad>
</Pads>
@@ -33,13 +35,12 @@
<String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
<String>Shared.IOS/Shared.IOS.csproj</String>
</DisabledProjects>
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Release|iPhone" />
- <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
+ <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/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs" line="136" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Room.cs" relfile="HDL_ON/Entity/Room.cs" line="371" 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="109" 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