From 454ac814944cf956ff02b84b70ba2ec68e5e5ea1 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 15 一月 2020 19:38:47 +0800
Subject: [PATCH] 2020-01-15 1.优化MQTT连接。 2.增加本地通信加密。

---
 Crabtree/.vs/SmartHome/xs/UserPrefs.xml |   57 +++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
index ee6e0ce..ac980ab 100644
--- a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
+++ b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
@@ -1,40 +1,52 @@
-锘�<Properties StartupConfiguration="{1D83BF28-BA88-4152-BA41-D7EFE90A5437}|Default">
-  <MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="SmartHome/HDL/Operation/UserInfo.cs">
+锘�<Properties StartupConfiguration="{9D9EF20B-6E65-4A65-92BF-567EBF1E1443}|Default">
+  <MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.4b65c46595" />
+  <MonoDevelop.Ide.Workbench ActiveDocument="SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs">
     <Files>
-      <File FileName="SmartHome/UI/SimpleControl/MainPage.cs" Line="362" Column="16" />
-      <File FileName="SmartHome/HDL/Operation/ResponseEntity/SendJson.cs" />
-      <File FileName="SmartHome/UI/SimpleControl/MqttCommon.cs" />
-      <File FileName="SmartHome/HDL/Operation/Control.cs" Line="388" Column="38" />
-      <File FileName="SmartHome/HDL/Operation/Target.cs" />
-      <File FileName="SmartHome/HDL/Operation/UserConfig.cs" Line="299" Column="22" />
-      <File FileName="SmartHome/HDL/Operation/BusSocket.cs" Line="167" Column="1" />
-      <File FileName="SmartHome/HDL/Operation/Packet.cs" Line="145" Column="45" />
-      <File FileName="SmartHome/HDL/Operation/MyEnum.cs" />
-      <File FileName="SmartHome/UI/SimpleControl/Phone/Guide/GuideSettingGateway.cs" />
-      <File FileName="SmartHome/UI/SimpleControl/Phone/Guide/GuideAddResidence.cs" Line="281" Column="42" />
-      <File FileName="SmartHome/UI/SimpleControl/CommonPage.cs" Line="55" Column="57" />
-      <File FileName="SmartHome/UI/SimpleControl/Phone/Guide/GuideAddGateway.cs" Line="372" Column="19" />
-      <File FileName="SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs" Line="406" Column="43" />
-      <File FileName="SmartHome/HDL/Operation/UserInfo.cs" Line="1" Column="1" />
+      <File FileName="SmartHome/HDL/Operation/ResponseEntity/SendJson.cs" Line="464" Column="8" />
+      <File FileName="SmartHome/UI/SimpleControl/MainPage.cs" Line="43" Column="25" />
+      <File FileName="SmartHome/UI/SimpleControl/MqttCommon.cs" Line="105" Column="16" />
+      <File FileName="SmartHome/UI/SimpleControl/Phone/Room/UserRoom.cs" Line="2270" Column="76" />
+      <File FileName="SmartHome/HDL/Operation/MyEnum.cs" Line="1214" Column="27" />
+      <File FileName="SmartHome/UI/SimpleControl/CommonPage.cs" Line="453" Column="22" />
+      <File FileName="SmartHome/UI/SimpleControl/Phone/Light/UserDeviceToLight.cs" Line="45" Column="56" />
+      <File FileName="SmartHome/UI/SimpleControl/EquipmentPublicClass.cs" Line="120" Column="1" />
+      <File FileName="SmartHome/UI/SimpleControl/Phone/Light/UserDeviceToSocket.cs" Line="44" Column="23" />
+      <File FileName="SmartHome/HDL/Operation/Packet.cs" Line="69" Column="1" />
+      <File FileName="SmartHome/HDL/Operation/Device/ButtonPanel.cs" Line="27" Column="9" />
+      <File FileName="SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs" Line="482" Column="42" />
+      <File FileName="SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs" Line="12" Column="28" />
+      <File FileName="SmartHome/UI/SimpleControl/Phone/Schedule/HelpView.cs" Line="35" Column="40" />
+      <File FileName="SmartHome/HDL/Operation/ResponseEntity/ErrorCode.cs" Line="26" Column="47" />
+      <File FileName="SmartHome/UI/SimpleControl/Phone/Guide/GuideAddGateway.cs" Line="1" Column="1" />
+      <File FileName="SmartHome/UI/SimpleControl/Phone/Register/AccountView.cs" Line="80" Column="29" />
+      <File FileName="SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs" Line="207" Column="21" />
     </Files>
     <Pads>
       <Pad Id="ProjectPad">
         <State name="__root__">
           <Node name="SmartHome" expanded="True">
-            <Node name="ON.Droid" expanded="True" />
+            <Node name="ON.Droid" expanded="True">
+              <Node name="Properties" expanded="True" />
+            </Node>
             <Node name="Shared" expanded="True">
               <Node name="HDL" expanded="True">
                 <Node name="Operation" expanded="True">
-                  <Node name="UserInfo.cs" selected="True" />
+                  <Node name="Device" expanded="True" />
+                  <Node name="ResponseEntity" expanded="True" />
                 </Node>
               </Node>
               <Node name="UI" expanded="True">
                 <Node name="SimpleControl" expanded="True">
                   <Node name="Phone" expanded="True">
                     <Node name="Guide" expanded="True" />
+                    <Node name="Light" expanded="True" />
+                    <Node name="Music" expanded="True" />
                     <Node name="Register" expanded="True" />
-                    <Node name="User" expanded="True" />
+                    <Node name="Room" expanded="True" />
+                    <Node name="Schedule" expanded="True" />
+                    <Node name="User" expanded="True">
+                      <Node name="UserMiddle.cs" selected="True" />
+                    </Node>
                   </Node>
                 </Node>
               </Node>
@@ -55,7 +67,8 @@
   <MonoDevelop.Ide.ItemProperties.ON.Ios automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.254b82433419c7ca1850b1dfb524c79b7aeb0640" />
   <MonoDevelop.Ide.DebuggingService.Breakpoints>
     <BreakpointStore>
-      <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/CrabtreeOn/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideAddGateway.cs" relfile="SmartHome/UI/SimpleControl/Phone/Guide/GuideAddGateway.cs" line="546" column="1" />
+      <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/CrabtreeOn/Crabtree/SmartHome/UI/SimpleControl/Phone/Light/UserDeviceToLight.cs" relfile="SmartHome/UI/SimpleControl/Phone/Light/UserDeviceToLight.cs" line="69" column="1" />
+      <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/CrabtreeOn/Crabtree/SmartHome/UI/SimpleControl/Phone/Light/UserDeviceToSocket.cs" relfile="SmartHome/UI/SimpleControl/Phone/Light/UserDeviceToSocket.cs" line="72" column="1" />
     </BreakpointStore>
   </MonoDevelop.Ide.DebuggingService.Breakpoints>
   <MultiItemStartupConfigurations />

--
Gitblit v1.8.0