From 6992dfd5cd06481ee251e72b6d28e0221ea9276b Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 04 十二月 2020 16:04:45 +0800
Subject: [PATCH] 2020-12-04-3

---
 .vs/HDL_APP_Project/xs/UserPrefs.xml |   63 +++++++++++++++----------------
 1 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 2d0b468..0d9b852 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,45 +1,49 @@
 锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
-  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPageBLL.cs">
+  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.D4411691-F5B8-40F4-97C1-964F33115DBC" />
+  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs">
     <Files>
-      <File FileName="HDL_ON/DriverLayer/Control_Bus.cs" Line="1" Column="1" />
-      <File FileName="HDL_ON/DriverLayer/CommonPage.cs" />
-      <File FileName="HDL_ON/DriverLayer/Control.cs" Line="251" Column="34" />
-      <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs" />
-      <File FileName="HDL_ON/Entity/FunctionList.cs" />
-      <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs" Line="36" Column="33" />
-      <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs" Line="68" Column="1" />
-      <File FileName="HDL_ON/Entity/Function/Light.cs" Line="15" Column="35" />
-      <File FileName="HDL-ON_Android/Application.cs" Line="79" Column="55" />
-      <File FileName="HDL-ON_iOS/ViewController.cs" Line="83" Column="16" />
-      <File FileName="HDL_ON/UI/UI0-Public/AppUnlockPage.cs" Line="182" Column="77" />
-      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs" Line="365" Column="64" />
-      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPageBLL.cs" Line="40" Column="21" />
+      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs" Line="249" Column="43" />
+      <File FileName="HDL_ON/Common/R.cs" Line="486" Column="43" />
+      <File FileName="HDL-ON_Android/Assets/Language.ini" Line="485" Column="14" />
+      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs" Line="76" Column="1" />
+      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/SwitchView.cs" Line="98" Column="39" />
+      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs" Line="26" Column="26" />
+      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs" Line="111" Column="45" />
+      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/SelectTypeView.cs" Line="5" Column="18" />
+      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs" Line="10" Column="23" />
+      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Set.cs" Line="102" Column="45" />
+      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs" Line="228" Column="36" />
     </Files>
     <Pads>
       <Pad Id="ProjectPad">
         <State name="__root__">
           <Node name="HDL_APP_Project" expanded="True">
             <Node name="HDL_ON" expanded="True">
+              <Node name="Common" expanded="True" />
               <Node name="DAL" expanded="True">
                 <Node name="Server" expanded="True" />
               </Node>
-              <Node name="Entity" expanded="True" />
+              <Node name="Entity" expanded="True">
+                <Node name="Enumerative" expanded="True" />
+                <Node name="Function" expanded="True" />
+              </Node>
               <Node name="UI" expanded="True">
-                <Node name="UI0-Public" expanded="True" />
                 <Node name="UI2" expanded="True">
-                  <Node name="2-Classification" expanded="True" />
-                  <Node name="3-Intelligence" expanded="True" />
-                  <Node name="4-PersonalCenter" expanded="True">
-                    <Node name="UnlockSetting" expanded="True">
-                      <Node name="AppUnlockSettingsPageBLL.cs" selected="True" />
+                  <Node name="3-Intelligence" expanded="True">
+                    <Node name="Automation" expanded="True">
+                      <Node name="LogicView" expanded="True">
+                        <Node name="ModeView.cs" selected="True" />
+                      </Node>
                     </Node>
                   </Node>
+                  <Node name="FuntionControlView" expanded="True" />
                 </Node>
               </Node>
             </Node>
             <Node name="HDL-ON_Android" expanded="True">
-              <Node name="Assets" expanded="True" />
+              <Node name="Assets" expanded="True">
+                <Node name="Phone" expanded="True" />
+              </Node>
             </Node>
             <Node name="HDL-ON_iOS" expanded="True">
               <Node name="Resources" expanded="True" />
@@ -55,17 +59,10 @@
     <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 AndroidDesignerPreferredTheme="AppTheme" AndroidDesignerPreferredDevice="Nexus 4" PreferredExecutionTarget="Android.364c4b3158493098" />
+  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
+  <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.4b65c4650918" />
   <MonoDevelop.Ide.DebuggingService.Breakpoints>
-    <BreakpointStore>
-      <Breakpoint file="/Users/nigel/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs" line="115" column="1" />
-      <Breakpoint file="/Users/nigel/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs" line="351" column="1" />
-      <Breakpoint file="/Users/nigel/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs" line="311" column="1" />
-      <Breakpoint file="/Users/nigel/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPageBLL.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPageBLL.cs" line="76" column="1" />
-      <Breakpoint file="/Users/nigel/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/SetSceneLocationPage.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/SetSceneLocationPage.cs" line="38" column="1" />
-      <Breakpoint file="/Users/nigel/Desktop/HDL_APP_Project/HDL-ON_Android/Application.cs" relfile="HDL-ON_Android/Application.cs" line="82" column="1" />
-    </BreakpointStore>
+    <BreakpointStore />
   </MonoDevelop.Ide.DebuggingService.Breakpoints>
   <MultiItemStartupConfigurations />
 </Properties>
\ No newline at end of file

--
Gitblit v1.8.0