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 | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
index a3070ea..761f0f2 100644
--- a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
+++ b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
@@ -1,17 +1,16 @@
-锘�<Properties StartupConfiguration="{1D83BF28-BA88-4152-BA41-D7EFE90A5437}|Default">
- <MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.364c4b3158493098" />
- <MonoDevelop.Ide.Workbench>
+锘�<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/Phone/Alexa/AlexaDeviceListPage.cs">
<Files>
- <File FileName="SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs" Line="84" Column="50" IsPinned="True" />
- <File FileName="../../../2020/娴嬭瘯/SmartHome/SmartHome/UI/SimpleControl/Phone/Room/UserRoom.cs" />
- <File FileName="SmartHome/UI/SimpleControl/EquipmentPublicClass.cs" Line="51" Column="1" />
- <File FileName="SmartHome/UI/SimpleControl/MainPage.cs" Line="41" Column="56" />
+ <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/MqttCommon.cs" Line="241" Column="64" />
- <File FileName="SmartHome/HDL/Operation/Utlis.cs" />
+ <File FileName="SmartHome/UI/SimpleControl/MainPage.cs" />
<File FileName="ON/Properties/AndroidManifest.xml" />
- <File FileName="ON.Ios/AppDelegate.cs" Line="294" Column="22" />
- <File FileName="ON.Ios/ViewController.cs" Line="39" Column="77" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -23,12 +22,21 @@
<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="User" expanded="True" />
</Node>
</Node>
</Node>
--
Gitblit v1.8.0