From bfb3d0d4879dca8c59ff287c92f5113162f3a33a Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期二, 27 八月 2024 15:22:48 +0800
Subject: [PATCH] 代码备份
---
OnPro/.vs/HDL_APP_Project/xs/UserPrefs.xml | 108 ++++++++++++++++++++++++------------------------------
1 files changed, 48 insertions(+), 60 deletions(-)
diff --git a/OnPro/.vs/HDL_APP_Project/xs/UserPrefs.xml b/OnPro/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 62c6f93..1d20eba 100644
--- a/OnPro/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/OnPro/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,51 +1,5 @@
-锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL-ON_iOS/AppDelegate.cs">
- <Files>
- <File FileName="HDL-ON_Android/Properties/AndroidManifest.xml" />
- <File FileName="HDL-ON_Android/AgreementActivity.cs" />
- <File FileName="HDL-ON_Android/Other/JPush/JPushOpenClickActivity.cs" />
- <File FileName="HDL-ON_Android/SplashActivity.cs" />
- <File FileName="HDL-ON_iOS/AppDelegate.cs" Line="323" Column="39" />
- <File FileName="HDL-ON_iOS/ZXingOverlayView.cs" />
- <File FileName="HDL-ON_iOS/ViewControllerBase.cs" />
- <File FileName="HDL-ON_iOS/Reachability.cs" Line="144" Column="57" />
- <File FileName="../../../../../../Library/Frameworks/Mono.framework/External/xbuild/Xamarin/iOS/Xamarin.iOS.Common.targets" />
- <File FileName="HDL_ON/DAL/DriverLayer/A_Protocol_Common.cs" />
- <File FileName="HDL-ON_Android/Assets/Echarts/js/echarts-all.js" />
- <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" />
- <File FileName="HDL-ON_iOS/Scan.cs" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" />
- <File FileName="HDL-ON_iOS/Main.cs" />
- <File FileName="HDL-ON_iOS/BlueWifi.cs" />
- <File FileName="RongAn/Info.plist" />
- <File FileName="HDL-ON_iOS/Entitlements.plist" />
- <File FileName="HDL-ON_iOS/Resources/Language.ini" Line="1" Column="1" />
- <File FileName="HDL-ON_iOS/Info.plist" />
- </Files>
- <Pads>
- <Pad Id="ProjectPad">
- <State name="__root__">
- <Node name="HDL_APP_Project">
- <Node name="HDL-ON_iOS" selected="True">
- <Node name="References" expanded="True" />
- <Node name="Packages" expanded="True" />
- <Node name="Other" expanded="True" />
- <Node name="Resources" expanded="True" />
- </Node>
- <Node name="RongAn">
- <Node name="References" expanded="True" />
- </Node>
- </Node>
- </State>
- </Pad>
- <Pad Id="MonoDevelop.Debugger.WatchPad">
- <State>
- <Value>DB_ResidenceData.Instance.CurrentRegion</Value>
- </State>
- </Pad>
- </Pads>
- </MonoDevelop.Ide.Workbench>
- <MonoDevelop.Ide.ItemProperties.RongAn PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-000404163432002E" Xamarin.HotReload.WrongLinkerErrorInfoBar.RongAn.HideInfoBar="True" />
+锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
+ <MultiItemStartupConfigurations />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore>
<Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupControl.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupControl.cs" line="326" column="1" />
@@ -56,9 +10,9 @@
<Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs" line="260" column="1" />
<Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFaceManagementPage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFaceManagementPage.cs" line="31" column="1" />
<Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs" line="549" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs" line="254" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs" line="224" column="1" />
<Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs" line="207" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/DAL/DriverLayer/Control.cs" relfile="HDL_ON/DAL/DriverLayer/Control.cs" line="947" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/DAL/DriverLayer/Control.cs" relfile="HDL_ON/DAL/DriverLayer/Control.cs" line="948" column="1" />
<Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/FhControlPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/FhControlPage.cs" line="132" column="1" />
<Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/UI/UI0-Stan/Form/Base/CommonFormBase.cs" relfile="HDL_ON/UI/UI0-Stan/Form/Base/CommonFormBase.cs" line="329" column="1" />
<Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs" line="669" column="1" />
@@ -81,23 +35,22 @@
<Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockFaceUnlockTriggerSettingPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockFaceUnlockTriggerSettingPage.cs" line="198" column="1" />
<Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs" line="561" column="1" />
<Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs" line="842" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="2473" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="2482" column="1" />
<Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs" line="502" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs" line="68" column="1" />
<Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/UI/UI2/FuntionControlView/Light/ColorfulSettingPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/Light/ColorfulSettingPage.cs" line="356" column="1" />
<Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs" line="486" column="1" />
<Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/UI/UI2/FuntionControlView/Light/GroupControlPage_V2.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/Light/GroupControlPage_V2.cs" line="129" column="1" />
<Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs" line="119" column="1" />
<Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs" line="118" column="1" />
<Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs" line="217" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="3585" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="3596" column="1" />
<Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs" relfile="HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs" line="184" column="1" />
<Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/Shared.IOS/UI/WebView.cs" relfile="Shared.IOS/UI/WebView.cs" line="97" column="1" />
<Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/Shared.IOS/UI/WebView.cs" relfile="Shared.IOS/UI/WebView.cs" line="96" column="1" />
<Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/Shared.IOS/UI/WebView.cs" relfile="Shared.IOS/UI/WebView.cs" line="95" column="1" />
<Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockAudioSetupPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockAudioSetupPage.cs" line="621" column="1" />
<Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockAudioSetupPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockAudioSetupPage.cs" line="204" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="3352" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="3363" column="1" />
<Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockUserManagerPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockUserManagerPage.cs" line="148" column="1" />
<Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/UnlockSettingFacePage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/UnlockSettingFacePage.cs" line="136" column="1" />
<Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockUserManagerPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockUserManagerPage.cs" line="774" column="1" />
@@ -110,17 +63,52 @@
<Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="295" column="1" />
<Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3SubloopEnergyPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3SubloopEnergyPage.cs" line="610" column="1" />
<Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs" line="340" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs" line="606" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs" line="524" column="1" />
<Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs" line="52" column="1" />
<Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs" line="1008" column="1" />
<Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs" line="16" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/UI/UI1-Login/SelectServerDialog.cs" relfile="HDL_ON/UI/UI1-Login/SelectServerDialog.cs" line="150" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs" line="50" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="237" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs" line="471" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs" line="475" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs" line="88" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/UI/UI2/3-Intelligence/Automation/OnePortAutomation.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/Automation/OnePortAutomation.cs" line="18" column="1" />
</BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
- <MonoDevelop.MonoDroid LastDeploySdkVersion="13.2.1.2" />
- <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.364c4b3158493098" Xamarin.HotReload.WrongLinkerErrorInfoBar.HDL-ON__Android.HideInfoBar="True" />
- <MultiItemStartupConfigurations />
- <Xamarin.Addins.Core.Project ActiveDebugTarget="Android.364c4b3158493098" />
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__Android Xamarin.HotReload.WrongLinkerErrorInfoBar.HDL-ON__Android.HideInfoBar="True" PreferredExecutionTarget="Android.364c4b3158493098" />
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
- <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-000404163432002E" Xamarin.HotReload.WrongLinkerErrorInfoBar.HDL-ON__iOS.HideInfoBar="True" />
+ <MonoDevelop.Ide.Workbench>
+ <Files>
+ <File FileName="HDL_ON/UI/UI2/UserPage.cs" Line="115" Column="34" />
+ <File FileName="HDL_ON/UI/MainPage.cs" />
+ <File FileName="HDL-ON_iOS/Info.plist" />
+ <File FileName="HDL-ON_iOS/Resources/zh-Hans.lproj/InfoPlist.strings" />
+ <File FileName="HDL-ON_Android/Properties/AndroidManifest.xml" Line="129" Column="81" />
+ </Files>
+ <Pads>
+ <Pad Id="ProjectPad">
+ <State name="__root__">
+ <Node name="HDL_APP_Project">
+ <Node name="HDL-ON_Android" expanded="True">
+ <Node name="References" expanded="True">
+ <Node name="Shared.Droid.JPush" selected="True" />
+ </Node>
+ <Node name="Assets" expanded="True" />
+ <Node name="Properties" expanded="True" />
+ </Node>
+ <Node name="HDL_ON">
+ <Node name="UI" expanded="True">
+ <Node name="UI2" expanded="True" />
+ </Node>
+ </Node>
+ </Node>
+ </State>
+ </Pad>
+ </Pads>
+ </MonoDevelop.Ide.Workbench>
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS Xamarin.HotReload.WrongLinkerErrorInfoBar.HDL-ON__iOS.HideInfoBar="True" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget" />
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
+ <MonoDevelop.MonoDroid LastDeploySdkVersion="13.2.2.0" />
+ <Xamarin.Addins.Core.Project ActiveDebugTarget="Android.364c4b3158493098" />
</Properties>
\ No newline at end of file
--
Gitblit v1.8.0