From 388ece21a0c608c2571775137a89ad32ca0cedd8 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 11 一月 2021 14:35:23 +0800
Subject: [PATCH] 2021-1-11-2

---
 .vs/HDL_APP_Project/xs/UserPrefs.xml |   47 +++++++++++++++++++++--------------------------
 1 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index e441a72..badab7e 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,44 +1,39 @@
 锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
   <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-001674E61438002E" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Automation/WeatherCondition.cs">
     <Files>
-      <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="476" Column="19" />
-      <File FileName="HDL_ON/UI/UI1-Login/LoginPageBLL.cs" Line="31" Column="32" />
-      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs" Line="260" Column="56" />
-      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs" Line="84" Column="33" />
-      <File FileName="HDL_ON/UI/UI2/2-Classification/RoomPageBLL.cs" Line="43" Column="38" />
-      <File FileName="HDL_ON/UI/UI2/2-Classification/RoomPage.cs" Line="78" Column="51" />
-      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPage.cs" Line="145" Column="33" />
-      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs" Line="115" Column="33" />
-      <File FileName="HDL_ON/Entity/Room.cs" Line="52" Column="23" />
-      <File FileName="HDL_ON/Entity/FunctionList.cs" Line="215" Column="87" />
-      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs" Line="213" Column="47" />
+      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs" Line="246" Column="120" />
+      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs" />
+      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs" Line="106" Column="27" />
+      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs" Line="71" Column="41" />
+      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Weather.cs" Line="62" Column="62" />
+      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/OutdoorEnvironment.cs" Line="13" Column="13" />
+      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs" Line="17" Column="13" />
+      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/WeatherCondition.cs" Line="77" Column="21" />
     </Files>
     <Pads>
       <Pad Id="ProjectPad">
         <State name="__root__">
           <Node name="HDL_APP_Project" expanded="True">
             <Node name="HDL_ON" expanded="True">
-              <Node name="DAL" expanded="True" />
-              <Node name="Entity" expanded="True">
-                <Node name="Function" expanded="True" />
-              </Node>
+              <Node name="Common" expanded="True" />
               <Node name="UI" expanded="True">
-                <Node name="UI1-Login" expanded="True" />
-                <Node name="UI2" expanded="True">
-                  <Node name="2-Classification" expanded="True" />
+                <Node name="UI2" expanded="True" selected="True">
                   <Node name="3-Intelligence" expanded="True">
-                    <Node name="Automation" expanded="True">
-                      <Node name="FunTpye.cs" selected="True" />
-                    </Node>
+                    <Node name="Automation" expanded="True" />
                   </Node>
-                  <Node name="4-PersonalCenter" expanded="True">
-                    <Node name="RoomListManage" expanded="True" />
-                  </Node>
+                  <Node name="4-PersonalCenter" expanded="True" />
                 </Node>
               </Node>
             </Node>
-            <Node name="HDL-ON_iOS" expanded="True" />
+            <Node name="HDL-ON_Android" 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" />
+            </Node>
           </Node>
         </State>
       </Pad>

--
Gitblit v1.8.0