From 1f6f024bddf48dea1c17c54ade1535a10ef7b39b Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期一, 23 三月 2020 17:16:37 +0800
Subject: [PATCH] 2020-03-23-2
---
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 28 +++++++++++-----------------
ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs | 4 ++--
ZigbeeApp/Shared/Phone/Device/Logic/EverymonthPage.cs | 2 +-
ZigbeeApp/Shared/Phone/Device/Logic/LogicView/Addview.cs | 6 +++---
ZigbeeApp/Shared/Phone/Device/Logic/Method.cs | 5 +++++
ZigbeeApp/Shared/Phone/Device/Category/Category.cs | 6 +++---
6 files changed, 25 insertions(+), 26 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index 7809045..9dfcbd3 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,29 +1,23 @@
锘�<Properties StartupConfiguration="{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}|Default">
<MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.M7BBB18B19152766" />
<MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.SelectDevice" />
- <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/Send.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Category/Category.cs">
<Files>
- <File FileName="Shared/Phone/Device/Category/Category.cs" Line="2263" Column="57" />
- <File FileName="Shared/Phone/Device/Logic/LogicView/mFunView.cs" />
- <File FileName="Shared/Phone/Device/Logic/DeviceTarget.cs" Line="68" Column="45" />
- <File FileName="Shared/Phone/Device/Logic/RoomAndDeviceView.cs" Line="451" Column="45" />
- <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="1" Column="1" />
- <File FileName="Shared/Phone/Device/Logic/CurrentDeviceState.cs" Line="1302" Column="26" />
- <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="612" Column="77" />
+ <File FileName="Shared/Phone/Device/Category/Category.cs" Line="2411" Column="18" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="GateWay" expanded="True">
+ <Node name="Home.IOS" expanded="True">
+ <Node name="Resources" expanded="True">
+ <Node name="Phone" expanded="True" />
+ </Node>
+ </Node>
<Node name="Shared" expanded="True">
<Node name="Phone" expanded="True">
- <Node name="Device" expanded="True">
- <Node name="Category" expanded="True" />
- <Node name="Logic" expanded="True">
- <Node name="DoorLockLogic" expanded="True" />
- <Node name="Send.cs" selected="True" />
- </Node>
- </Node>
+ <Node name="Device" expanded="True" />
+ <Node name="Login" selected="True" />
</Node>
</Node>
</Node>
@@ -31,9 +25,9 @@
</Pad>
</Pads>
</MonoDevelop.Ide.Workbench>
- <MonoDevelop.Ide.ItemProperties.Home.IOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.913cb77b0eef11c9119c61a02bc00fec01bf67d6" />
+ <MonoDevelop.Ide.ItemProperties.Home.IOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.9992EB40-E6DD-48F4-AFED-CEB5E811ACDD" />
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhoneSimulator" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
index 061f831..32de9d4 100644
--- a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
@@ -2371,8 +2371,8 @@
var logicswitchBtn = new Button
{
- Width = Application.GetRealWidth(104),
- Height = Application.GetRealHeight(63),
+ Width = Application.GetMinRealAverage(104),
+ Height = Application.GetMinRealAverage(63),
UnSelectedImagePath = "ZigeeLogic/logicclose.png",
SelectedImagePath = "ZigeeLogic/logicopen.png",
X = logicRowlayout.Width - Application.GetRealWidth(104 + 58),
@@ -2523,7 +2523,7 @@
Height = Application.GetMinRealAverage(82),
X = Application.GetRealWidth(58) + Application.GetRealWidth(12 + (12 + 82 + 45 + 12) * i),
Y = Application.GetRealHeight(58 + 30 + 30),
- Radius = (uint)Application.GetRealHeight(41),
+ Radius = (uint)Application.GetMinRealAverage(41),
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
};
logicRowlayout.AddChidren(typebjBtn);
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/EverymonthPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/EverymonthPage.cs
index c4ab55c..b4578ef 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/EverymonthPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/EverymonthPage.cs
@@ -115,7 +115,7 @@
X = Application.GetRealWidth(35 * j) + Application.GetRealWidth(100 * (j - 1)),
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
SelectedTextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
- Radius = (uint)Application.GetRealHeight(50),
+ Radius = (uint)Application.GetMinRealAverage(50),
BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
SelectedBackgroundColor = ZigbeeColor.Current.LogicAddColor,
Tag = k,
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/Addview.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/Addview.cs
index 73b019c..48970d2 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/Addview.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/Addview.cs
@@ -44,8 +44,8 @@
public Button switchBtn = new Button
{
- Width = Application.GetRealWidth(104),
- Height = Application.GetRealHeight(63),
+ Width = Application.GetMinRealAverage(104),
+ Height = Application.GetMinRealAverage(63),
UnSelectedImagePath = "ZigeeLogic/logicclose.png",
SelectedImagePath = "ZigeeLogic/logicopen.png",
X = Application.GetRealWidth(1080 - 58 - 104),
@@ -60,7 +60,7 @@
Width = Application.GetRealWidth(58 +58+40),
Height = Application.GetRealHeight(160),
- X = Application.GetRealWidth(1080 - 58 - 58),
+ X = Application.GetRealWidth(1080 - 58 - 58-40),
};
public FrameLayout AddDeviceView()
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
index e0e8a72..16cbc62 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
@@ -654,6 +654,7 @@
custompushview.iconBtn.Visible = true;
custompushview.iconBtn.UnSelectedImagePath = "ZigeeLogic/next.png";
custompushview.titleBtn.TextID = MyInternationalizationString.custompush;
+ custompushview.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor;
middle.AddChidren(custompushview.AddDeviceView());
EventHandler<MouseEventArgs> customclick = (sender, e) =>
@@ -674,6 +675,7 @@
LogicView.IfString.Tag = true;
custompushview.frameLayout.Height = Application.GetRealHeight(160);
Common.Logic.CurrentLogic.LogicIsCustomPushText = 1;
+ pushview.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicRowLayoutLineColor;
}
else
@@ -681,6 +683,7 @@
LogicView.IfString.Tag = false;
custompushview.frameLayout.Height = Application.GetRealHeight(0);
Common.Logic.CurrentLogic.LogicIsCustomPushText = 0;
+ pushview.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor;
}
Send.Zj(LogicView.IfString.Tag, Common.Logic.CurrentLogic);
};
@@ -690,12 +693,14 @@
LogicView.IfString.Tag = false;
pushview.switchBtn.IsSelected = false;
custompushview.frameLayout.Height = Application.GetRealHeight(0);
+ pushview.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor;
}
else
{
LogicView.IfString.Tag = true;
pushview.switchBtn.IsSelected = true;
custompushview.frameLayout.Height = Application.GetRealHeight(160);
+ pushview.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicRowLayoutLineColor;
}
}
/// <summary>
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs
index c4d535f..5b5bf36 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs
@@ -313,8 +313,8 @@
var backgroundColor = new Button
{
- Width = Application.GetRealWidth(156),
- Height = Application.GetRealHeight(180),
+ Width = Application.GetMinRealAverage(156),
+ Height = Application.GetMinRealAverage(180),
X = Application.GetRealWidth(10),
UnSelectedImagePath = "ZigeeLogic/deviceunselectedbackgroundcolor.png",
SelectedImagePath = "ZigeeLogic/deviceselectedbackgroundcolor.png",
--
Gitblit v1.8.0