From 1aa53dcce192d9a5f5e1abd6ba1bad04427c6010 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 15 三月 2021 15:51:27 +0800
Subject: [PATCH] 2021-03-15 1.更新丰林推送处理
---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 71 ++++++++---------------------------
1 files changed, 17 insertions(+), 54 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 5847763..7ffbd35 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,28 +1,14 @@
-<<<<<<< HEAD
-锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
- <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddThirdPartyBrandListpage.cs">
- <Files>
- <File FileName="HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs" Line="1" Column="1" />
- <File FileName="HDL_ON/DAL/Server/NewAPI.cs" Line="470" Column="50" />
- <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="2126" Column="47" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddThirdPartyBrandListpage.cs" Line="116" Column="35" />
-=======
锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
- <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-000404163432002E" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/Common/HDLCommon.cs">
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.08FD445C-3EE8-4ED2-BF28-B42ADD0DA92C" />
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/Common/Constant.cs">
<Files>
- <File FileName="HDL_ON/DAL/DriverLayer/Control_Udp.cs" />
- <File FileName="HDL_ON/DAL/DriverLayer/A_Protocol_Common.cs" />
- <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" />
- <File FileName="HDL-ON_iOS/Info.plist" />
- <File FileName="HDL_ON/UI/MainPage.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWaterValvePage.cs" Line="124" Column="46" />
- <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="616" Column="84" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaAirCleanerPage.cs" Line="331" Column="15" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" Line="758" Column="56" />
- <File FileName="HDL_ON/Common/HDLCommon.cs" Line="500" Column="21" />
->>>>>>> origin/temp-wxr
+ <File FileName="HDL-ON_iOS/Other/ESVideo.cs" Line="9" Column="27" />
+ <File FileName="HDL-ON_Android/Application.cs" Line="30" Column="10" />
+ <File FileName="HDL_ON/Common/HDLCommon.cs" Line="251" Column="23" />
+ <File FileName="HDL-ON_Android/Other/JLCountrycode.cs" Line="67" Column="32" />
+ <File FileName="HDL-ON_Android/Other/JPush/JPushService.cs" Line="1" Column="1" />
+ <File FileName="HDL-ON_Android/Other/JPush/JPushReceiver.cs" Line="177" Column="52" />
+ <File FileName="HDL_ON/Common/Constant.cs" Line="241" Column="32" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -30,36 +16,18 @@
<Node name="HDL_APP_Project" expanded="True">
<Node name="HDL_ON" expanded="True">
<Node name="Common" expanded="True">
-<<<<<<< HEAD
- <Node name="Utlis" expanded="True" />
- </Node>
- <Node name="DAL" expanded="True">
- <Node name="Server" expanded="True" />
- </Node>
- <Node name="Entity" expanded="True">
- <Node name="Integratedbrand" expanded="True" />
- <Node name="ResponseEntity" expanded="True" />
- </Node>
- <Node name="UI" expanded="True">
- <Node name="UI2" expanded="True">
- <Node name="4-PersonalCenter" expanded="True">
- <Node name="AddFunction" expanded="True">
- <Node name="AddThirdPartyBrandListpage.cs" selected="True" />
- </Node>
- </Node>
- </Node>
+ <Node name="Constant.cs" selected="True" />
</Node>
</Node>
- <Node name="ys" expanded="True">
- <Node name="Transforms" expanded="True" />
-=======
- <Node name="HDLCommon.cs" selected="True" />
+ <Node name="HDL-ON_Android" expanded="True">
+ <Node name="Other" expanded="True">
+ <Node name="JPush" expanded="True" />
</Node>
</Node>
<Node name="HDL-ON_iOS" expanded="True">
- <Node name="Resources" expanded="True" />
->>>>>>> origin/temp-wxr
+ <Node name="Other" expanded="True" />
</Node>
+ <Node name="ys" expanded="True" />
</Node>
</State>
</Pad>
@@ -71,13 +39,8 @@
<String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
<String>Shared.IOS/Shared.IOS.csproj</String>
</DisabledProjects>
-<<<<<<< HEAD
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
- <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.4b65c4650918" />
-=======
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Release|iPhone" />
- <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
->>>>>>> origin/temp-wxr
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.822QECU5228FU" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
--
Gitblit v1.8.0