From 0ca3aa21580e988e340b88360cda23b501fa65f2 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期三, 11 十二月 2019 09:13:40 +0800
Subject: [PATCH] 2019.12.11
---
ZigbeeApp/Shared/Phone/Device/Account/AccountForgetPWD.cs | 4 ++--
ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs | 10 ++++++----
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 27 +++++++++------------------
ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Swing_5Selected.png | 0
ZigbeeApp/Shared/Phone/Device/AC/ACControl.cs | 2 +-
ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide | 0
ZigbeeApp/Shared/Phone/Device/Account/AccountRegister.cs | 1 -
ZigbeeApp/Shared/Phone/UserView/UserPage.cs | 2 +-
8 files changed, 19 insertions(+), 27 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index df47810..a54d582 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -2,17 +2,14 @@
<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/Common/CommonPage.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/UserView/UserHomeView.cs">
<Files>
<File FileName="Shared/Common/CommonPage.cs" Line="162" Column="61" />
- <File FileName="Shared/Phone/UserView/UserHomeView.cs" />
+ <File FileName="Shared/Phone/UserView/UserHomeView.cs" Line="448" Column="1" />
<File FileName="Shared/R.cs" />
- <File FileName="GateWay.Droid/Assets/Language.ini" />
- <File FileName="Shared/Phone/Device/CommonForm/FunctionMainView.cs" />
- <File FileName="Shared/Phone/Device/Room/UnallocatedRoom.cs" />
- <File FileName="Shared/Phone/Device/Account/AccountRegister.cs" />
- <File FileName="Shared/Phone/Device/Account/AccountLogic.cs" />
- <File FileName="Shared/Phone/Device/Account/AccountForgetPWD.cs" />
+ <File FileName="GateWay.Droid/Assets/Language.ini" Line="1" Column="1" />
+ <File FileName="Shared/Phone/Device/Room/UnallocatedRoom.cs" Line="286" Column="62" />
+ <File FileName="Shared/Common/Room.cs" Line="805" Column="69" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -22,19 +19,15 @@
<Node name="Assets" expanded="True" />
</Node>
<Node name="Shared" expanded="True">
- <Node name="Common" expanded="True">
- <Node name="CommonPage.cs" selected="True" />
- </Node>
+ <Node name="Common" expanded="True" />
<Node name="Phone" expanded="True">
<Node name="Device" expanded="True">
<Node name="Account" expanded="True" />
- <Node name="CommonForm" expanded="True" />
<Node name="Room" expanded="True" />
</Node>
- <Node name="UserCenter" expanded="True">
- <Node name="CommonBase" expanded="True" />
+ <Node name="UserView" expanded="True">
+ <Node name="UserHomeView.cs" selected="True" />
</Node>
- <Node name="UserView" expanded="True" />
</Node>
</Node>
</Node>
@@ -48,9 +41,7 @@
</DisabledProjects>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
- <BreakpointStore>
- <Breakpoint file="/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Account/AccountRegister.cs" relfile="Shared/Phone/Device/Account/AccountRegister.cs" line="409" column="1" />
- </BreakpointStore>
+ <BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
</Properties>
\ No newline at end of file
diff --git a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
index b05070d..ffcaf14 100644
--- a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
+++ b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Swing_5Selected.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Swing_5Selected.png
old mode 100755
new mode 100644
index e794a92..0451429
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Swing_5Selected.png
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Swing_5Selected.png
Binary files differ
diff --git a/ZigbeeApp/Shared/Phone/Device/AC/ACControl.cs b/ZigbeeApp/Shared/Phone/Device/AC/ACControl.cs
index 14601b1..230ce9c 100644
--- a/ZigbeeApp/Shared/Phone/Device/AC/ACControl.cs
+++ b/ZigbeeApp/Shared/Phone/Device/AC/ACControl.cs
@@ -931,7 +931,7 @@
Width = Application.GetRealWidth(modeItem_Width - modeItem_X),
Height = Application.GetRealHeight(modeItem_Height),
TextColor = ZigbeeColor.Current.GXCTextBlackColor,
- TextID = R.MyInternationalizationString.SelectFanMode,
+ TextID = R.MyInternationalizationString.SelectMode,
TextAlignment = TextAlignment.CenterLeft
};
changeModeFL.AddChidren(changeModeBtn);
diff --git a/ZigbeeApp/Shared/Phone/Device/Account/AccountForgetPWD.cs b/ZigbeeApp/Shared/Phone/Device/Account/AccountForgetPWD.cs
index 82baff6..2e2d466 100644
--- a/ZigbeeApp/Shared/Phone/Device/Account/AccountForgetPWD.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Account/AccountForgetPWD.cs
@@ -241,7 +241,7 @@
/// <param name="mouseEventArgs">The ${ParameterType} instance containing the event data.</param>
private void Account_TextChange(object sender, string mouseEventArgs)
{
- errorBtn.Text = "";
+ errorBtn.Text = string.Empty;
if ((sender as EditText).Text.Trim().Length > 0)
{
@@ -261,7 +261,7 @@
/// <param name="mouseEventArgs">The ${ParameterType} instance containing the event data.</param>
private void Code_TextChange(object sender, string mouseEventArgs)
{
- errorBtn.Text = "";
+ errorBtn.Text = string.Empty;
if ((sender as EditText).Text.Trim().Length > 0)
{
resetBtn.Enable = resetBtn.IsSelected = true;
diff --git a/ZigbeeApp/Shared/Phone/Device/Account/AccountRegister.cs b/ZigbeeApp/Shared/Phone/Device/Account/AccountRegister.cs
index da5814b..58bb7b5 100644
--- a/ZigbeeApp/Shared/Phone/Device/Account/AccountRegister.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Account/AccountRegister.cs
@@ -266,7 +266,6 @@
{
return;
}
- //鍏堝垽鏂�2娆″瘑鐮佽緭鍏ユ槸鍚︿竴鑷�
if (pwdRow.PasswrodET.Text.Trim() != pwdComfireRow.PasswrodET.Text.Trim())
{
errorBtn.TextID = R.MyInternationalizationString.TwoPasswordInconsistency;
diff --git a/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs b/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
index f6b5651..233fc1a 100644
--- a/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
@@ -426,9 +426,14 @@
Gravity = Gravity.CenterVertical,
UnSelectedImagePath = "Item/Floor.png"
};
+ if (Config.Instance.Home.FloorDics.Count > 0)
+ {
+ topFrameLayout.AddChidren(floor);
+ }
floorBtn = new Button
{
+ X = floor.Right,
Width = Application.GetRealWidth(500),
Height = Application.GetRealHeight(100),
Gravity = Gravity.CenterVertical,
@@ -436,11 +441,8 @@
TextColor = ZigbeeColor.Current.GXCTextColor,
Text = Config.Instance.Home.GetCurrentFloorName
};
-
- if(Config.Instance.Home.FloorDics.Count>0)
+ if (Config.Instance.Home.FloorDics.Count > 0)
{
- topFrameLayout.AddChidren(floor);
- floorBtn.X = floor.Right;
topFrameLayout.AddChidren(floorBtn);
}
diff --git a/ZigbeeApp/Shared/Phone/UserView/UserPage.cs b/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
index e5cbc8e..97e4963 100644
--- a/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
@@ -39,7 +39,7 @@
/// <summary>
/// 搴曢儴鎸夐挳鏂囧瓧鐨刌鍊�
/// </summary>
- private static readonly int tabBarEnumName_Y = 104;
+ private static readonly int tabBarEnumName_Y = 98;
#endregion
#region 鈼� 鎺ュ彛____________________________
--
Gitblit v1.8.0