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 | 117 +++++++++++++---------------------------------------------
1 files changed, 26 insertions(+), 91 deletions(-)
diff --git a/OnPro/.vs/HDL_APP_Project/xs/UserPrefs.xml b/OnPro/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 5738633..1d20eba 100644
--- a/OnPro/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/OnPro/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,6 +1,5 @@
锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
- <MonoDevelop.MonoDroid LastDeploySdkVersion="13.2.1.2" />
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
+ <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" />
@@ -36,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" />
@@ -65,106 +63,43 @@
<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.Ide.ItemProperties.HDL-ON__Android Xamarin.HotReload.WrongLinkerErrorInfoBar.HDL-ON__Android.HideInfoBar="True" PreferredExecutionTarget="Android.364c4b3158493098" />
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/Server/HttpUtil.cs">
+ <MonoDevelop.Ide.Workbench>
<Files>
- <File FileName="HDL_ON/UI/BindingResidence/BindingResidencePage.cs" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/DeliveryQrCodePage.cs" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPageBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/Transfer/TransferInputPage.cs" />
+ <File FileName="HDL_ON/UI/UI2/UserPage.cs" Line="115" Column="34" />
<File FileName="HDL_ON/UI/MainPage.cs" />
- <File FileName="HDL_ON/UI/UI2/UserPage.cs" Line="127" Column="17" />
- <File FileName="HDL_ON/Common/R.cs" />
- <File FileName="HDL_ON/UI/UI1-Login/RegisterPage.cs" Line="164" Column="27" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" Line="375" Column="55" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs" Line="174" Column="9" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs" />
- <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" />
- <File FileName="HDL-ON_Android/Resources/xml/file_paths.xml" />
- <File FileName="HDL-ON_Android/Resources/values/ic_launcher_background.xml" />
- <File FileName="HDL-ON_Android/Resources/values/dimens.xml" />
- <File FileName="HDL-ON_Android/Resources/values/colors.xml" />
- <File FileName="HDL-ON_Android/Resources/values/styles.xml" />
- <File FileName="HDL-ON_Android/Other/JPush/JPushReceiver.cs" />
- <File FileName="HDL-ON_Android/Other/JPush/JPushOpenClickActivity.cs" />
- <File FileName="HDL-ON_Android/Other/JPush/JPushFirmBroadcast.cs" />
- <File FileName="HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs" />
- <File FileName="HDL_ON/DAL/Server/NewAPI.cs" Line="375" Column="29" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshRelayControlPage.cs" />
- <File FileName="HDL_ON/UI/UI0-Stan/Form/Base/EditorCommonForm.cs" />
- <File FileName="HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs" />
- <File FileName="HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs" />
- <File FileName="HDL_ON/Entity/Function/Function.cs" />
- <File FileName="HDL_ON/Entity/Function/InverterInfo.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/FhControlPage.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Curtain/VenetianBlindsPageBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/RGBWPageBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainDreamPage.cs" />
- <File FileName="HDL_ON/Entity/DB_ResidenceData.cs" />
- <File FileName="HDL-ON_Android/Assets/Language.ini" />
- <File FileName="../../../../../../Library/Frameworks/Mono.framework/External/xbuild/Xamarin/Android/Xamarin.Android.Common.targets" />
- <File FileName="HDL-ON_Android/SplashActivity.cs" Line="350" Column="42" />
- <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" />
<File FileName="HDL-ON_iOS/Info.plist" />
- <File FileName="HDL-ON_iOS/Resources/Language.ini" />
- <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" />
- <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="23" Column="9" />
- <File FileName="HDL_ON/UI/UI1-Login/LoginPageBLL.cs" />
- <File FileName="HDL_ON/Entity/MyEnum.cs" />
- <File FileName="HDL_ON/DAL/DriverLayer/Packet.cs" />
- <File FileName="HDL_ON/DAL/DriverLayer/UdpSocket.cs" />
- <File FileName="HDL_ON/DAL/DriverLayer/CRC.cs" />
- <File FileName="HDL_ON/UI/UI1-Login/RegisterPageBLL.cs" Line="400" Column="66" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs" Line="1" Column="1" />
- <File FileName="HDL_ON/Common/HDLCommon.cs" Line="78" Column="23" />
- <File FileName="HDL_ON/DAL/Server/NewApiRes.cs" Line="1248" Column="4" />
+ <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="HDL_ON">
- <Node name="Common" expanded="True" />
- <Node name="DAL" expanded="True">
- <Node name="Server" expanded="True">
- <Node name="HttpUtil.cs" selected="True" />
- </Node>
+ <Node name="HDL-ON_Android" expanded="True">
+ <Node name="References" expanded="True">
+ <Node name="Shared.Droid.JPush" selected="True" />
</Node>
- <Node name="UI">
- <Node name="UI2">
- <Node name="3-Intelligence" expanded="True">
- <Node name="Automation" expanded="True" />
- <Node name="Scene" expanded="True" />
- </Node>
- <Node name="FuntionControlView" expanded="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>
@@ -172,8 +107,8 @@
</Pad>
</Pads>
</MonoDevelop.Ide.Workbench>
- <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.364c4b3158493098" Xamarin.HotReload.WrongLinkerErrorInfoBar.HDL-ON__Android.HideInfoBar="True" />
- <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget" Xamarin.HotReload.WrongLinkerErrorInfoBar.HDL-ON__iOS.HideInfoBar="True" />
+ <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" />
- <MultiItemStartupConfigurations />
</Properties>
\ No newline at end of file
--
Gitblit v1.8.0