From 05ce435c3b58e53eeab04c672affdeeab75f3036 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 15 十一月 2019 14:41:39 +0800
Subject: [PATCH] 2019.11.15-1
---
ZigbeeApp/Shared/Common/ZigbeeColor.cs | 5 +++++
ZigbeeApp/Shared/Phone/Device/CommonForm/BackButton.cs | 2 +-
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 9 ++-------
ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide | 0
ZigbeeApp/Shared/Phone/Device/CommonForm/TopFrameLayout.cs | 8 ++++++++
5 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index b308326..543ba5d 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -4,17 +4,12 @@
<MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
<MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Category/Category.cs">
<Files>
- <File FileName="Shared/Phone/Device/Category/Category.cs" Line="1034" Column="60" />
- <File FileName="Shared/Phone/UserView/UserHomeView.cs" Line="1673" Column="25" />
+ <File FileName="Shared/Phone/Device/Category/Category.cs" Line="1463" Column="65" />
+ <File FileName="Shared/Phone/UserView/UserHomeView.cs" Line="1671" Column="53" />
<File FileName="Shared/Phone/Device/Room/EditRoom.cs" />
<File FileName="Shared/Phone/Device/Account/AccountLogin.cs" Line="509" Column="33" />
<File FileName="Shared/Phone/UserCenter/UserMain/QRCodeForm.cs" />
<File FileName="GateWay.Droid/Application.cs" Line="106" Column="28" />
- <File FileName="Shared/Phone/Device/CommonForm/FunctionMainView.cs" Line="228" Column="36" />
- <File FileName="Shared/Phone/Device/CommonForm/TopFrameLayout.cs" Line="82" Column="35" />
- <File FileName="Shared/Common/DeviceUI.cs" Line="1" Column="1" />
- <File FileName="Shared/Phone/Device/Light/DimmableLightControl.cs" Line="1" Column="1" />
- <File FileName="Shared/Phone/Device/CommonForm/CategoryFunctionRow.cs" Line="1" Column="1" />
</Files>
<Pads>
<Pad Id="ProjectPad">
diff --git a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
index 8607cb7..34d6e4a 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/Common/ZigbeeColor.cs b/ZigbeeApp/Shared/Common/ZigbeeColor.cs
index 1551afc..bdaeb8d 100644
--- a/ZigbeeApp/Shared/Common/ZigbeeColor.cs
+++ b/ZigbeeApp/Shared/Common/ZigbeeColor.cs
@@ -186,6 +186,11 @@
/// </summary>
public uint GXCGrayLineColor2 = 0x66CCCCCC;
/// <summary>
+ /// 娴呰壊绾挎潯 0xFFB7B8BB
+ /// </summary>
+ public uint GXCGrayLineColor3 = 0xFFB7B8BB;
+
+ /// <summary>
/// 鎸夐挳鏈�変腑鐘舵�� 0xFF656565;
/// </summary>
public uint GXCButtonUnSelectedColor = 0xFF656565;
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/BackButton.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/BackButton.cs
index 45aebf9..c74e102 100644
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/BackButton.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/BackButton.cs
@@ -12,7 +12,7 @@
/// </summary>
public BackButton()
{
- X = Application.GetRealWidth(58);
+ X = Application.GetRealWidth(28);
Height = Application.GetMinRealAverage(110);
Width = Application.GetMinRealAverage(110);
UnSelectedImagePath = "Account/Back.png";
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/TopFrameLayout.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/TopFrameLayout.cs
index a18180f..4227c91 100644
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/TopFrameLayout.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/TopFrameLayout.cs
@@ -68,6 +68,14 @@
Width = Application.GetRealWidth(CommonPage.AppRealWidth)
};
AddChidren(topView);
+
+ var line = new Button
+ {
+ Y=Height-1,
+ Height=1,
+ BackgroundColor=ZigbeeColor.Current.GXCGrayLineColor3
+ };
+ AddChidren(line);
}
#endregion
--
Gitblit v1.8.0