From 2562ee38c58a113113a2943ae057c1937ae533cb Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 02 七月 2020 13:49:20 +0800
Subject: [PATCH] 2020-07-01 1.去掉读电能操作，去掉kwh状态显示。 2.当前是分享住宅，不允许删除备份。 3.进入搜索网关页面，切换到本地模式。 4.Alexa页面 增加添加设备失败提示。 5.子账号页面，底部增加文字提示。6.Android 默认隐藏底部虚拟按键。
---
Crabtree/.vs/SmartHome/xs/UserPrefs.xml | 38 ++++++++++++++++++--------------------
1 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
index afc5c40..761f0f2 100644
--- a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
+++ b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
@@ -1,45 +1,43 @@
锘�<Properties StartupConfiguration="{9D9EF20B-6E65-4A65-92BF-567EBF1E1443}|Default">
<MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
- <MonoDevelop.Ide.Workbench ActiveDocument="SmartHome/UI/SimpleControl/MqttCommon.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="SmartHome/UI/SimpleControl/Phone/Alexa/AlexaDeviceListPage.cs">
<Files>
- <File FileName="SmartHome/HDL/Operation/Control.cs" Line="420" Column="73" />
- <File FileName="SmartHome/UI/SimpleControl/MqttCommon.cs" Line="557" Column="39" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/Alexa/AlexaDeviceListPage.cs" Line="478" Column="23" />
+ <File FileName="SmartHome/HDL/Operation/ResponseEntity/ErrorCode.cs" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/Light/UserDeviceToSocket.cs" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/Register/Databackup.cs" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/Register/SubaccountListView.cs" />
+ <File FileName="ON/Application.cs" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs" />
<File FileName="SmartHome/UI/SimpleControl/MainPage.cs" />
<File FileName="ON/Properties/AndroidManifest.xml" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Light/UserDeviceToLight.cs" Line="993" Column="44" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Light/UserDeviceToSocket.cs" Line="507" Column="24" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Room/UserRoom.cs" Line="1880" Column="71" />
- <File FileName="SmartHome/UI/SimpleControl/EquipmentPublicClass.cs" Line="136" Column="91" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs" Line="508" Column="34" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/AC/UserDeviceToAC.cs" Line="1" Column="1" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/FoolHeat/UserDeviceToFH.cs" Line="332" Column="30" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/User/UserDeviceView.cs" Line="1" Column="1" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs" Line="1" Column="1" />
- <File FileName="SmartHome/HDL/Operation/Utlis.cs" Line="1" Column="1" />
</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" selected="True">
<Node name="Properties" expanded="True" />
</Node>
<Node name="ON.Ios" expanded="True" />
<Node name="Shared" expanded="True">
<Node name="HDL" expanded="True">
- <Node name="Operation" expanded="True" />
+ <Node name="Operation" 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="AC" expanded="True" />
+ <Node name="Alexa" expanded="True" />
+ <Node name="Fan" expanded="True" />
<Node name="FoolHeat" expanded="True" />
<Node name="Light" expanded="True" />
+ <Node name="Register" expanded="True" />
<Node name="Room" expanded="True" />
- <Node name="System" expanded="True" />
<Node name="User" expanded="True" />
</Node>
- <Node name="MqttCommon.cs" selected="True" />
</Node>
</Node>
</Node>
@@ -50,13 +48,13 @@
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.ItemProperties.DroidService PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
- <MonoDevelop.Ide.ItemProperties.DroidLib PreferredExecutionTarget="Android.SelectDevice" />
<DisabledProjects>
<String>Shared.Droid/Shared.Droid.csproj</String>
<String>Shared.IOS/Shared.IOS.csproj</String>
+ <String>DroidLib/DroidLib.csproj</String>
</DisabledProjects>
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Release" />
- <MonoDevelop.Ide.ItemProperties.ON.Ios automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.446FF651-C1E0-4C68-805D-F62274849738" />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Release|iPhone" />
+ <MonoDevelop.Ide.ItemProperties.ON.Ios automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.254b82433419c7ca1850b1dfb524c79b7aeb0640" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
--
Gitblit v1.8.0