From 4653dfad25810d9365e1be43df791df12de0a872 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 27 十一月 2020 17:51:57 +0800
Subject: [PATCH] 2020-11-27-4

---
 .vs/HDL_APP_Project/xs/UserPrefs.xml |   72 ++++++++++++++----------------------
 1 files changed, 28 insertions(+), 44 deletions(-)

diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 41a9915..bbe7581 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,17 +1,19 @@
-锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
-  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI0-Public/OperationSuccessPromptPage.cs">
+锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
+  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.D4411691-F5B8-40F4-97C1-964F33115DBC" />
+  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs">
     <Files>
-      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/ChangeBindAccountPage.cs" Line="153" Column="66" />
-      <File FileName="HDL-ON_iOS/Resources/Language.ini" Line="305" Column="10" />
-      <File FileName="HDL_ON/Common/R.cs" Line="14" Column="36" />
-      <File FileName="HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs" Line="468" Column="24" />
-      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/BindAccountPage.cs" Line="19" Column="10" />
-      <File FileName="HDL_ON/UI/UI1-Login/LoginPageBLL.cs" Line="53" Column="19" />
-      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/AccountBindInfoPage.cs" Line="30" Column="29" />
-      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/VerificationCodePage.cs" Line="505" Column="38" />
-      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs" Line="240" Column="10" />
-      <File FileName="HDL_ON/UI/UI0-Public/OperationSuccessPromptPage.cs" Line="14" Column="42" />
+      <File FileName="HDL_ON/Common/R.cs" Line="432" Column="40" />
+      <File FileName="HDL-ON_Android/Assets/Language.ini" Line="426" Column="11" />
+      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs" />
+      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/DeviceFunList.cs" />
+      <File FileName="HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs" Line="1" Column="1" />
+      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs" Line="27" Column="14" />
+      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs" Line="89" Column="28" />
+      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs" Line="53" Column="6" />
+      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/DateView.cs" Line="26" Column="43" />
+      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/SingleLogicView.cs" Line="88" Column="51" />
+      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs" Line="5" Column="11" />
+      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TopView.cs" Line="44" Column="23" />
     </Files>
     <Pads>
       <Pad Id="ProjectPad">
@@ -19,39 +21,25 @@
           <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="Net" expanded="True" />
-                <Node name="Server" expanded="True" />
-              </Node>
-              <Node name="Entity" expanded="True">
-                <Node name="Function" expanded="True" />
-              </Node>
               <Node name="UI" expanded="True">
-                <Node name="CSS" expanded="True" />
-                <Node name="UI0-Public" expanded="True">
-                  <Node name="OperationSuccessPromptPage.cs" selected="True" />
-                </Node>
-                <Node name="UI1-Login" expanded="True" />
                 <Node name="UI2" expanded="True">
-                  <Node name="1-HomePage" expanded="True" />
-                  <Node name="4-PersonalCenter" expanded="True">
-                    <Node name="AccountBindInfo" expanded="True" />
-                    <Node name="MemberManagement" expanded="True" />
-                    <Node name="UnlockSetting" expanded="True" />
-                  </Node>
-                  <Node name="FuntionControlView" expanded="True">
-                    <Node name="EnvironmentalScience" expanded="True" />
-                    <Node name="Music" expanded="True" />
+                  <Node name="3-Intelligence" expanded="True">
+                    <Node name="Automation" expanded="True">
+                      <Node name="LogicView" expanded="True" />
+                    </Node>
                   </Node>
                 </Node>
               </Node>
             </Node>
-            <Node name="HDL-ON_iOS" expanded="True">
-              <Node name="Resources" expanded="True">
+            <Node name="HDL-ON_Android" expanded="True">
+              <Node name="Assets" expanded="True">
                 <Node name="Phone" expanded="True">
-                  <Node name="FunctionIcon" expanded="True" />
+                  <Node name="LogicIcon" expanded="True" selected="True" />
+                  <Node name="LoginIcon" expanded="True" />
                 </Node>
               </Node>
+              <Node name="Properties" expanded="True" />
+              <Node name="Resources" expanded="True" />
             </Node>
           </Node>
         </State>
@@ -64,14 +52,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" PreferredExecutionTarget="Android.SelectDevice" />
+  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
+  <MonoDevelop.Ide.ItemProperties.HDL-ON__Android AndroidDesignerPreferredTheme="AppTheme" AndroidDesignerPreferredDevice="Nexus 4" PreferredExecutionTarget="Android.4b65c4650918" />
   <MonoDevelop.Ide.DebuggingService.Breakpoints>
-    <BreakpointStore>
-      <Breakpoint file="/Users/nigel/Desktop/HDL_APP_Project/HDL_ON/DriverLayer/Packet.cs" relfile="HDL_ON/DriverLayer/Packet.cs" line="60" column="1" />
-      <Breakpoint file="/Users/nigel/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs" relfile="HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs" line="198" column="1" />
-      <Breakpoint file="/Users/nigel/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/AccountBindInfoPage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/AccountBindInfoPage.cs" line="138" column="1" />
-    </BreakpointStore>
+    <BreakpointStore />
   </MonoDevelop.Ide.DebuggingService.Breakpoints>
   <MultiItemStartupConfigurations />
 </Properties>
\ No newline at end of file

--
Gitblit v1.8.0