From 593720d8cfa423242191a6d39c745053c08cf55e Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期一, 30 十二月 2019 13:56:38 +0800
Subject: [PATCH] 2019.12.30
---
ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceInfoWithZoneRow.cs | 18 +++++++-
ZigbeeApp/Shared/Phone/Device/Room/RoomHumiditySetting.cs | 15 ++++++-
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 13 +++---
ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide | 0
ZigbeeApp/Shared/Phone/Device/Room/RoomTemperatureSetting.cs | 16 ++++++-
5 files changed, 48 insertions(+), 14 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index fdcd02e..ff20ba7 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -2,7 +2,7 @@
<MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.M7BBB18B19152766" />
<MonoDevelop.Ide.ItemProperties.GateWay.Ios automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.8c0bdb303f25d82c2a42fb8bfca449bfaca00260" />
<MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
- <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Room/EditRoom.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Room/RoomTemperatureSetting.cs">
<Files>
<File FileName="Shared/R.cs" Line="809" Column="16" />
<File FileName="GateWay.Droid/Assets/Language.ini" />
@@ -12,10 +12,11 @@
<File FileName="Shared/Phone/UserView/UserHomeView.cs" />
<File FileName="Shared/Phone/Device/Light/LightControl.cs" />
<File FileName="Shared/Phone/Device/Category/CategoryAddScene.cs" />
- <File FileName="Shared/Phone/Device/CommonForm/RoomView.cs" Line="271" Column="59" />
- <File FileName="Shared/Phone/Device/Room/EditRoom.cs" Line="84" Column="74" />
- <File FileName="Shared/Phone/Device/Room/RoomTemperatureSetting.cs" />
- <File FileName="Shared/Phone/Device/Room/RoomHumiditySetting.cs" />
+ <File FileName="Shared/Phone/Device/CommonForm/RoomView.cs" Line="242" Column="62" />
+ <File FileName="Shared/Phone/Device/Room/EditRoom.cs" Line="124" Column="75" />
+ <File FileName="Shared/Phone/Device/Room/RoomTemperatureSetting.cs" Line="114" Column="19" />
+ <File FileName="Shared/Phone/Device/Room/RoomHumiditySetting.cs" Line="110" Column="16" />
+ <File FileName="Shared/Phone/Device/CommonForm/DeviceInfoWithZoneRow.cs" Line="1" Column="1" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -29,7 +30,7 @@
<Node name="DeviceLogic" expanded="True" />
<Node name="Light" expanded="True" />
<Node name="Room" expanded="True">
- <Node name="EditRoom.cs" selected="True" />
+ <Node name="RoomTemperatureSetting.cs" selected="True" />
</Node>
</Node>
<Node name="UserCenter" expanded="True">
diff --git a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
index 836de9c..65eb20f 100644
--- a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
+++ b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
Binary files differ
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceInfoWithZoneRow.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceInfoWithZoneRow.cs
index 2edd7e7..7bfe15c 100644
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceInfoWithZoneRow.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceInfoWithZoneRow.cs
@@ -25,6 +25,10 @@
/// </summary>
public Button ClickButton;
/// <summary>
+ /// line
+ /// </summary>
+ Button line;
+ /// <summary>
/// DeviceInfoWithZoneRow
/// </summary>
/// <param name="y"></param>
@@ -83,12 +87,12 @@
};
AddChidren(SelectBtn);
- var line = new Button()
+ line = new Button()
{
X = Application.GetRealWidth(CommonFormResouce.X_Left),
- Y = Height - 2,
+ Y = Height - 1,
Width = Application.GetRealWidth(965),
- Height = 2,
+ Height = 1,
BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor2,
};
AddChidren(line);
@@ -135,6 +139,14 @@
{
SelectBtn.Visible = statu;
}
+ /// <summary>
+ /// HideLine
+ /// </summary>
+ /// <param name="statu"></param>
+ public void HideLine(bool statu)
+ {
+ line.Visible = !statu;
+ }
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/RoomHumiditySetting.cs b/ZigbeeApp/Shared/Phone/Device/Room/RoomHumiditySetting.cs
index 2c8b49d..82a4850 100644
--- a/ZigbeeApp/Shared/Phone/Device/Room/RoomHumiditySetting.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Room/RoomHumiditySetting.cs
@@ -107,13 +107,24 @@
for (int i = 0; i < deviceList.Count; i++)
{
+ var fl = new FrameLayout
+ {
+ Height = Application.GetRealHeight(127 + 20),
+ BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
+ };
+ verticalScrolView.AddChidren(fl);
+
var device = deviceList[i];
- var devRow = new DeviceInfoWithZoneRow(20 + i * (127 + 20));
- verticalScrolView.AddChidren(devRow);
+ var devRow = new DeviceInfoWithZoneRow(20);
+ fl.AddChidren(devRow);
devRow.Init();
devRow.SetIcon(device.IconPath);
devRow.SetName(Common.LocalDevice.Current.GetDeviceEpointName(device));
devRow.SetZone(Common.Room.CurrentRoom.GetRoomNameByDevice(device));
+ if (i == deviceList.Count - 1)
+ {
+ devRow.HideLine(true);
+ }
if (tempDevice != null && tempDevice == device)
{
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/RoomTemperatureSetting.cs b/ZigbeeApp/Shared/Phone/Device/Room/RoomTemperatureSetting.cs
index 4691908..d47fa9d 100644
--- a/ZigbeeApp/Shared/Phone/Device/Room/RoomTemperatureSetting.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Room/RoomTemperatureSetting.cs
@@ -104,15 +104,25 @@
var deviceList = GetTemperatrueDevices();
for (int i = 0; i < deviceList.Count; i++)
{
+ var fl = new FrameLayout
+ {
+ Height = Application.GetRealHeight(127 + 20),
+ BackgroundColor=ZigbeeColor.Current.GXCBackgroundColor
+ };
+ verticalScrolView.AddChidren(fl);
var device = deviceList[i];
- var devRow = new DeviceInfoWithZoneRow(20 + i * (127 + 20));
- verticalScrolView.AddChidren(devRow);
+ var devRow = new DeviceInfoWithZoneRow(20);
+ fl.AddChidren(devRow);
devRow.Init();
devRow.SetIcon(device.IconPath);
devRow.SetName(Common.LocalDevice.Current.GetDeviceEpointName(device));
devRow.SetZone(Common.Room.CurrentRoom.GetRoomNameByDevice(device));
+ if (i == deviceList.Count - 1)
+ {
+ devRow.HideLine(true);
+ }
- if(tempDevice!=null && tempDevice==device)
+ if (tempDevice!=null && tempDevice==device)
{
tempDeviceRow = devRow;
tempDevice = device;
--
Gitblit v1.8.0