From 15c5215e0a16207baace58b81f406acfd84b4de5 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 28 八月 2020 16:00:26 +0800
Subject: [PATCH] V2.508281-beta 2020-08-28 1.搜索设备时，如果红外空调备注为空时，默认”AC“+回路号命名。 2.添加场景时，卷帘和开合帘提交改为百分比进度参数。 3.增加房间页面，长按设备名字，弹出修改备注。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideSettingGateway.cs | 5 +
Crabtree/SmartHome/UI/SimpleControl/CommonPage.cs | 3
Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/UserAddSceneDevice.cs | 88 +++++++++++-----------
Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide-wal | 0
Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaDeviceListPage.cs | 6
Crabtree/SmartHome/UI/SimpleControl/Phone/Room/GenericDialog.cs | 3
Crabtree/ON/Properties/AndroidManifest.xml | 2
Crabtree/.vs/SmartHome/xs/UserPrefs.xml | 33 ++++---
Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide | 0
Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide-shm | 0
Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserRoom.cs | 44 +++++++++++
Crabtree/SmartHome/UI/SimpleControl/MainPage.cs | 2
12 files changed, 121 insertions(+), 65 deletions(-)
diff --git a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
index bf3284c..da460e1 100644
--- a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
+++ b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
@@ -1,21 +1,24 @@
-锘�<Properties StartupConfiguration="{9D9EF20B-6E65-4A65-92BF-567EBF1E1443}|Default">
- <MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.4b65c46595" />
- <MonoDevelop.Ide.Workbench ActiveDocument="SmartHome/UI/SimpleControl/Phone/Alexa/AlexaDeviceListPage.cs">
+锘�<Properties StartupConfiguration="{1D83BF28-BA88-4152-BA41-D7EFE90A5437}|Default">
+ <MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
+ <MonoDevelop.Ide.Workbench>
<Files>
- <File FileName="SmartHome/UI/SimpleControl/MainPage.cs" Line="43" Column="22" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Alexa/AlexaDeviceListPage.cs" Line="6" Column="18" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Alexa/AlexaSettingPage.cs" Line="277" Column="23" />
- <File FileName="ON/Properties/AndroidManifest.xml" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/Scene/UserDeviceToScene.cs" Line="16" Column="36" IsPinned="True" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/Guide/GuideSettingInfraredModule.cs" Line="5" Column="2" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/Guide/GuideSettingGateway.cs" Line="254" Column="46" />
+ <File FileName="SmartHome/UI/SimpleControl/MainPage.cs" Line="146" Column="20" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/Room/UserRoom.cs" Line="2409" Column="1" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/Room/GenericDialog.cs" Line="172" Column="78" />
+ <File FileName="SmartHome/HDL/Operation/Device/Common.cs" Line="1" Column="1" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="SmartHome" expanded="True">
- <Node name="ON.Droid" expanded="True">
+ <Node name="ON.Droid" expanded="True" selected="True">
+ <Node name="Assets" expanded="True" />
<Node name="Properties" expanded="True" />
<Node name="Resources" expanded="True" />
</Node>
- <Node name="ON.Ios" expanded="True" />
<Node name="Shared" expanded="True">
<Node name="HDL" expanded="True">
<Node name="Operation" expanded="True">
@@ -23,16 +26,18 @@
<Node name="ResponseEntity" expanded="True" />
</Node>
</Node>
+ <Node name="IO" expanded="True" />
<Node name="UI" expanded="True">
<Node name="SimpleControl" expanded="True">
<Node name="Phone" expanded="True">
- <Node name="Alexa" expanded="True">
- <Node name="AlexaDeviceListPage.cs" selected="True" />
- </Node>
+ <Node name="Alexa" expanded="True" />
+ <Node name="Curtain" expanded="True" />
<Node name="Guide" expanded="True" />
+ <Node name="Music" expanded="True" />
+ <Node name="Panel" expanded="True" />
<Node name="Register" expanded="True" />
<Node name="Room" expanded="True" />
- <Node name="User" expanded="True" />
+ <Node name="Scene" expanded="True" />
</Node>
</Node>
</Node>
@@ -49,7 +54,7 @@
<String>Shared.IOS/Shared.IOS.csproj</String>
<String>DroidLib/DroidLib.csproj</String>
</DisabledProjects>
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Release|iPhone" />
<MonoDevelop.Ide.ItemProperties.ON.Ios automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.254b82433419c7ca1850b1dfb524c79b7aeb0640" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
diff --git a/Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide b/Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide
index 1d455da..0ac9c35 100644
--- a/Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide
+++ b/Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide
Binary files differ
diff --git a/Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide-shm b/Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide-shm
new file mode 100644
index 0000000..209e195
--- /dev/null
+++ b/Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide-shm
Binary files differ
diff --git a/Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide-wal b/Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide-wal
new file mode 100644
index 0000000..b98fd1c
--- /dev/null
+++ b/Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide-wal
Binary files differ
diff --git a/Crabtree/ON/Properties/AndroidManifest.xml b/Crabtree/ON/Properties/AndroidManifest.xml
index 166ae6f..2185cea 100644
--- a/Crabtree/ON/Properties/AndroidManifest.xml
+++ b/Crabtree/ON/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
锘�<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.crabtreenew" android:versionName="2.507241" android:versionCode="202007241">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.crabtreenew" android:versionName="2.508281" android:versionCode="202008281">
<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="28" />
<!-- 鍦ㄥ畨鍗揚鐗堟湰涔嬪悗锛屽繀椤昏鎺堜簣FOREGROUND_SERVICE鏉冮檺锛屾墠鑳藉浣跨敤鍓嶅彴鏈嶅姟 -->
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
diff --git a/Crabtree/SmartHome/UI/SimpleControl/CommonPage.cs b/Crabtree/SmartHome/UI/SimpleControl/CommonPage.cs
index ac206b1..33a2247 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/CommonPage.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/CommonPage.cs
@@ -1280,6 +1280,9 @@
//2020-07-03 濡傛灉鏄孩澶栨ā鍧楃被鍨嬶紝澶囨敞涓虹┖鐨勮瘽锛岄粯璁や负TV鍚嶅瓧
if (deviceType1 == DeviceType.InfraredMode) {
devcieLoopName = "TV " + usefullBytes [2].ToString ();
+ } else if (deviceType1 == DeviceType.ACInfrared) {
+ //2020-08-28 濡傛灉鏄孩澶栫┖璋冪被鍨嬶紝澶囨敞涓虹┖鐨勮瘽锛岄粯璁や负AC鍚嶅瓧
+ devcieLoopName = "AC " + usefullBytes [2].ToString ();
}
byte [] ddd = CommonPage.MyEncodingGB2312.GetBytes (devcieLoopName);
byte [] newddd = new byte [20];
diff --git a/Crabtree/SmartHome/UI/SimpleControl/MainPage.cs b/Crabtree/SmartHome/UI/SimpleControl/MainPage.cs
index 854b76f..648f405 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/MainPage.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/MainPage.cs
@@ -38,7 +38,7 @@
//public static Button LogoButton = new Button ();
- public static string RequestVersion = "2.507241";
+ public static string RequestVersion = "2.508281";
public static UserInfo LoginUser;
/// <summary>
/// 鏄惁鏄鐞嗗憳鏉冮檺(鍙樻洿浜�,鎴愬憳鐨勬椂鍊�,杩欎釜涔熶负ture銆備负浠�涔堜細澹版槑杩欐牱鍙橀噺,鍥犱负鏈変簺鎺ュ彛蹇呴』浣跨敤鍘熸潵鐨凾oken)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaDeviceListPage.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaDeviceListPage.cs
index 0ea98e1..9398296 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaDeviceListPage.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaDeviceListPage.cs
@@ -265,7 +265,7 @@
uploadScene.DeviceListObject.Add (new AddCloudSceneDeviceData () {
Command = (int)Command.UpdataCurtainModelStutas, SubnetId = device.SubnetID, DeviceId = device.DeviceID,
DeviceName = device.Name, DeviceType = "CurtainModule", LoopId = device.LoopID,
- DataString = device.Status.ToString ()
+ DataString = ((byte)device.Status).ToString ()
});
}
} else if (common.Type == DeviceType.CurtainRoller) {
@@ -274,7 +274,7 @@
uploadScene.DeviceListObject.Add (new AddCloudSceneDeviceData () {
Command = (int)Command.UpdataCurtainModelStutas, SubnetId = device.SubnetID, DeviceId = device.DeviceID,
DeviceName = device.Name, DeviceType = "CurtainRoller", LoopId = device.LoopID,
- DataString = (device.Status + 3).ToString ()
+ DataString = ((byte)device.CurtainProress + 3).ToString ()
});
}
} else if (common.Type == DeviceType.CurtainTrietex) {
@@ -283,7 +283,7 @@
uploadScene.DeviceListObject.Add (new AddCloudSceneDeviceData () {
Command = (int)Command.UpdataCurtainModelStutas, SubnetId = device.SubnetID, DeviceId = device.DeviceID,
DeviceName = device.Name, DeviceType = "CurtainRoller", LoopId = device.LoopID,
- DataString = (device.Status + 3).ToString ()
+ DataString = ((byte)device.CurtainProress + 3).ToString ()
});
}
} else if (common.Type == DeviceType.HVAC || common.Type == DeviceType.ACInfrared) {
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideSettingGateway.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideSettingGateway.cs
index 34288c5..135c50c 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideSettingGateway.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideSettingGateway.cs
@@ -25,8 +25,11 @@
curView = this;
myLoading = new Loading ();
+ myLoading.TextColor = 0xFFA9A9A9;
+ myLoading.LodingBackgroundColor = SkinStyle.Current.MainColor;
+
//#if __IOS__
- myLoading.LodingBackgroundColor = 0x00999999;
+ //myLoading.LodingBackgroundColor = 0x20999999;
//#else
// myLoading.LodingBackgroundColor = SkinStyle.Current.ViewColor;
//#endif
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/GenericDialog.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/GenericDialog.cs
index 798a7d9..e4a9e60 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/GenericDialog.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/GenericDialog.cs
@@ -54,6 +54,7 @@
Radius = 1,
BorderWidth = 1,
BorderColor = SkinStyle.Current.BorderColor,
+
};
dialogView.AddChidren (etDeviceName);
etDeviceName.TextChangeEventHandler += (sender, e) => {
@@ -168,7 +169,7 @@
try {
foreach (var room in Room.Lists) {
foreach (var common in room.DeviceList) {
- if (common.SubnetID != commonDevice.SubnetID || common.DeviceID != commonDevice.DeviceID || common.LoopID != commonDevice.LoopCount) {
+ if (common.CommonLoopID != commonDevice.CommonLoopID || common.Type != commonDevice.Type) {
continue;
}
common.Name = commonDevice.Name;
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserRoom.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserRoom.cs
index 1fa0179..6dd2f3a 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserRoom.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserRoom.cs
@@ -918,6 +918,9 @@
SelectedTextColor = SkinStyle.Current.TextColor1,
};
acRowView.AddChidren (tempDeviceName);
+ //2020-08-28 澧炲姞闀挎寜淇敼璁惧澶囨敞
+ ButtonNameAddMouseLongEventHandler (tempDeviceName, devcieCommon);
+
tempDeviceName.MouseUpEventHandler += openACControlPageEvent;
Button btnMode = new Button () {
@@ -1031,6 +1034,10 @@
IsMoreLines = true
};
fhRowView.AddChidren (tempDeviceName);
+
+ //2020-08-28 澧炲姞闀挎寜淇敼璁惧澶囨敞
+ ButtonNameAddMouseLongEventHandler (tempDeviceName, devcieCommon);
+
tempDeviceName.MouseUpEventHandler += (sender2, e2) => {
UserFHPage fhView = new UserFHPage (fh, room);
if (roomFilePath == Room.FavoriteRoom) {
@@ -1148,6 +1155,13 @@
IsMoreLines = true
};
DeviceRowView.AddChidren (btnName);
+
+ //2020-08-28 澧炲姞闀挎寜淇敼璁惧澶囨敞
+ ButtonNameAddMouseLongEventHandler (btnName, devcieCommon);
+
+ //btnName.MouseLongEventHandler += (sender, e)=>{
+ // RemarkDeviceName (devcieCommon, SimpleControl.CommonPage.MyEncodingUTF8.GetBytes (Newtonsoft.Json.JsonConvert.SerializeObject (devcieCommon)), btnName);
+ //};
Button tempSwitch = new Button () {
Width = Application.GetMinRealAverage (90),
@@ -2364,5 +2378,35 @@
});
});
}
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="btnName"></param>
+ /// <param name="devcieCommon"></param>
+ void ButtonNameAddMouseLongEventHandler (Button btnName,Common devcieCommon)
+ {
+ //2020-08-28 澧炲姞闀挎寜淇敼璁惧澶囨敞
+ btnName.MouseLongEventHandler += (sender, e) => {
+ RemarkDeviceName (devcieCommon, SimpleControl.CommonPage.MyEncodingUTF8.GetBytes (Newtonsoft.Json.JsonConvert.SerializeObject (devcieCommon)), btnName);
+ };
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="commonDevice"></param>
+ /// <param name="commonBytes"></param>
+ /// <param name="btnEquipment"></param>
+ void RemarkDeviceName (Common commonDevice, byte[] commonBytes, Button btnEquipment)
+ {
+ Action successAction = () => {
+ GenericDialog.Current.RefreshRemark (commonDevice);
+ //if (!roomDeviceFilePathList.Contains (filePath)) {
+ // roomDeviceFilePathList.Add (filePath);
+ //}
+ };
+ GenericDialog.Current.ShowModifyRemarksDialog (commonDevice, commonBytes, btnEquipment, successAction);
+ }
}
}
\ No newline at end of file
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/UserAddSceneDevice.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/UserAddSceneDevice.cs
index 4e53bb6..12465b5 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/UserAddSceneDevice.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/UserAddSceneDevice.cs
@@ -1038,8 +1038,8 @@
}
title.Text = curtainmodel.Name;
Button btnOpenCurtain = new Button () {
- Width = Application.GetRealWidth (124),
- Height = Application.GetRealHeight (125),
+ Width = Application.GetMinRealAverage (124),
+ Height = Application.GetMinRealAverage (124),
UnSelectedImagePath = "Curtain/CurtainOpen.png",
SelectedImagePath = "Curtain/CurtainOpenSelected.png",
X = Application.GetRealWidth (20),
@@ -1057,8 +1057,8 @@
};
dialogBodyLayout.AddChidren (btnOpenLbl);
Button btnStopCurtain = new Button () {
- Width = Application.GetRealWidth (124),
- Height = Application.GetRealHeight (125),
+ Width = Application.GetMinRealAverage (124),
+ Height = Application.GetMinRealAverage (124),
X = Application.GetRealWidth ((480 - 124) / 2),
Y = btnOpenCurtain.Y,
UnSelectedImagePath = "Curtain/CurtainTimeOut.png",
@@ -1076,8 +1076,8 @@
};
dialogBodyLayout.AddChidren (btnStopLbl);
Button btnCloseCurtain = new Button () {
- Width = Application.GetRealWidth (124),
- Height = Application.GetRealHeight (125),
+ Width = Application.GetMinRealAverage (124),
+ Height = Application.GetMinRealAverage (124),
X = Application.GetRealWidth (480 - 124 - 35),
Y = btnOpenCurtain.Y,
UnSelectedImagePath = "Curtain/CurtainClose.png",
@@ -1178,8 +1178,8 @@
};
Button btnOpenCurtain = new Button () {
- Width = Application.GetRealWidth (124),
- Height = Application.GetRealHeight (125),
+ Width = Application.GetMinRealAverage (124),
+ Height = Application.GetMinRealAverage (124),
UnSelectedImagePath = "Curtain/CurtainOpen.png",
SelectedImagePath = "Curtain/CurtainOpenSelected.png",
X = Application.GetRealWidth (20),
@@ -1198,8 +1198,8 @@
};
dialogBodyLayout.AddChidren (btnOpenLbl);
Button btnStopCurtain = new Button () {
- Width = Application.GetRealWidth (124),
- Height = Application.GetRealHeight (125),
+ Width = Application.GetMinRealAverage (124),
+ Height = Application.GetMinRealAverage (124),
X = Application.GetRealWidth ((480 - 124) / 2),
Y = btnOpenCurtain.Y,
UnSelectedImagePath = "Curtain/CurtainTimeOut.png",
@@ -1217,8 +1217,8 @@
};
//dialogBodyLayout.AddChidren (btnStopLbl);
Button btnCloseCurtain = new Button () {
- Width = Application.GetRealWidth (124),
- Height = Application.GetRealHeight (125),
+ Width = Application.GetMinRealAverage (124),
+ Height = Application.GetMinRealAverage (124),
X = Application.GetRealWidth (480 - 124 - 35),
Y = btnOpenCurtain.Y,
UnSelectedImagePath = "Curtain/CurtainClose.png",
@@ -1325,8 +1325,8 @@
Button btnOpenCurtain = new Button () {
- Width = Application.GetRealWidth (124),
- Height = Application.GetRealHeight (125),
+ Width = Application.GetMinRealAverage (124),
+ Height = Application.GetMinRealAverage (124),
UnSelectedImagePath = "Curtain/CurtainRollerUp.png",
SelectedImagePath = "Curtain/CurtainRollerUpOn.png",
X = Application.GetRealWidth (20),
@@ -1349,8 +1349,8 @@
};
dialogBodyLayout.AddChidren (btnOpenLbl);
Button btnStopCurtain = new Button () {
- Width = Application.GetRealWidth (124),
- Height = Application.GetRealHeight (125),
+ Width = Application.GetMinRealAverage (124),
+ Height = Application.GetMinRealAverage (124),
X = Application.GetRealWidth ((480 - 124) / 2),
Y = btnOpenCurtain.Y,
UnSelectedImagePath = "Curtain/CurtainTimeOut.png",
@@ -1368,8 +1368,8 @@
};
//dialogBodyLayout.AddChidren (btnStopLbl);
Button btnCloseCurtain = new Button () {
- Width = Application.GetRealWidth (124),
- Height = Application.GetRealHeight (125),
+ Width = Application.GetMinRealAverage (124),
+ Height = Application.GetMinRealAverage (124),
X = Application.GetRealWidth (480 - 124 - 35),
Y = btnOpenCurtain.Y,
UnSelectedImagePath = "Curtain/CurtainRollerDown.png",
@@ -1456,8 +1456,8 @@
dialogBodyLayout.AddChidren (btnSetTemperature);
Button btnReduceTemperature = new Button () {
- Width = Application.GetRealWidth (94),
- Height = Application.GetRealHeight (94),
+ Width = Application.GetMinRealAverage (94),
+ Height = Application.GetMinRealAverage (94),
X = Application.GetRealWidth (20),
Y = btnSetTemperature.Bottom + Application.GetRealHeight (20),
UnSelectedImagePath = "AC/AC-.png",
@@ -1466,8 +1466,8 @@
dialogBodyLayout.AddChidren (btnReduceTemperature);
Button btnSwitchAC = new Button () {
- Width = Application.GetRealWidth (94),
- Height = Application.GetRealHeight (94),
+ Width = Application.GetMinRealAverage (94),
+ Height = Application.GetMinRealAverage (94),
X = Application.GetRealWidth ((480 - 94) / 2),
Y = btnReduceTemperature.Y,
UnSelectedImagePath = "AC/ACClose.png",
@@ -1492,8 +1492,8 @@
}
Button btnAddTemperature = new Button () {
- Width = Application.GetRealWidth (94),
- Height = Application.GetRealHeight (94),
+ Width = Application.GetMinRealAverage (94),
+ Height = Application.GetMinRealAverage (94),
X = Application.GetRealWidth (480 - 20 - 94),
Y = btnReduceTemperature.Y,
UnSelectedImagePath = "AC/AC+.png",
@@ -1533,8 +1533,8 @@
dialogBodyLayout.AddChidren (acModeView);
Button btnACModeLeft = new Button () {
- Width = Application.GetRealWidth (129),
- Height = Application.GetRealHeight (129),
+ Width = Application.GetMinRealAverage (129),
+ Height = Application.GetMinRealAverage (129),
X = btnReduceTemperature.X - Application.GetRealWidth (17),
Gravity = Gravity.CenterVertical,
UnSelectedImagePath = "AC/ACLeft.png",
@@ -1551,8 +1551,8 @@
};
acModeView.AddChidren (btnModeIcon);
Button btnACModeRight = new Button () {
- Width = Application.GetRealWidth (129),
- Height = Application.GetRealHeight (129),
+ Width = Application.GetMinRealAverage (129),
+ Height = Application.GetMinRealAverage (129),
X = btnAddTemperature.X - Application.GetRealWidth (17),
Gravity = Gravity.CenterVertical,
UnSelectedImagePath = "AC/ACRight.png",
@@ -1594,8 +1594,8 @@
dialogBodyLayout.AddChidren (acWindView);
Button btnACWindLeft = new Button () {
- Width = Application.GetRealWidth (129),
- Height = Application.GetRealHeight (129),
+ Width = Application.GetMinRealAverage (129),
+ Height = Application.GetMinRealAverage (129),
X = btnReduceTemperature.X - Application.GetRealWidth (17),
Gravity = Gravity.CenterVertical,
UnSelectedImagePath = "AC/ACLeft.png",
@@ -1613,8 +1613,8 @@
acWindView.AddChidren (btnWindIcon);
Button btnACWindRight = new Button () {
- Width = Application.GetRealWidth (129),
- Height = Application.GetRealHeight (129),
+ Width = Application.GetMinRealAverage (129),
+ Height = Application.GetMinRealAverage (129),
X = btnAddTemperature.X - Application.GetRealWidth (17),
Gravity = Gravity.CenterVertical,
UnSelectedImagePath = "AC/ACRight.png",
@@ -1710,8 +1710,8 @@
title.Text = fh.Name;
Button FH_Heat = new Button () {
- Width = Application.GetRealWidth (120),
- Height = Application.GetRealHeight (120),
+ Width = Application.GetMinRealAverage (120),
+ Height = Application.GetMinRealAverage (120),
X = Application.GetRealWidth (20),
Y = Application.GetRealHeight (120),
UnSelectedImagePath = "FH/FH_Heat_on.png",
@@ -1736,8 +1736,8 @@
};
Button btnFHSwitch = new Button () {
- Width = Application.GetRealWidth (80),
- Height = Application.GetRealHeight (80),
+ Width = Application.GetMinRealAverage (80),
+ Height = Application.GetMinRealAverage (80),
X = Application.GetRealWidth (480 - 40 - 80),
Y = Application.GetRealHeight (140),
UnSelectedImagePath = "AC/ACClose.png",
@@ -1772,8 +1772,8 @@
dialogBodyLayout.AddChidren (fhTemperatureView);
Button btnReduceTemperature = new Button () {
- Width = Application.GetRealWidth (90),
- Height = Application.GetRealHeight (90),
+ Width = Application.GetMinRealAverage (90),
+ Height = Application.GetMinRealAverage (90),
X = Application.GetRealWidth (40),
Gravity = Gravity.CenterVertical,
UnSelectedImagePath = "AC/AC-.png",
@@ -1792,8 +1792,8 @@
};
fhTemperatureView.AddChidren (btnSetTemperature);
Button BtnAddTemperature = new Button () {
- Width = Application.GetRealWidth (90),
- Height = Application.GetRealHeight (90),
+ Width = Application.GetMinRealAverage (90),
+ Height = Application.GetMinRealAverage (90),
X = Application.GetRealWidth (480 - 90 - 40),
Gravity = Gravity.CenterVertical,
UnSelectedImagePath = "AC/AC+.png",
@@ -1863,8 +1863,8 @@
Button btnWindSpeedReduce = new Button () {
X = Application.GetRealWidth (100),
Y = btnWindSpeedTitle.Bottom,
- Width = Application.GetRealWidth (64),
- Height = Application.GetRealHeight (62),
+ Width = Application.GetMinRealAverage (64),
+ Height = Application.GetMinRealAverage (62),
UnSelectedImagePath = "Light/Light-.png",
SelectedImagePath = "Light/Light-On.png",
};
@@ -1883,8 +1883,8 @@
windBodyView.AddChidren (btnWindSpeedText);
Button btnWindSpeedAdd = new Button () {
- Width = Application.GetRealWidth (64),
- Height = Application.GetRealHeight (62),
+ Width = Application.GetMinRealAverage (64),
+ Height = Application.GetMinRealAverage (62),
UnSelectedImagePath = "Light/Light+.png",
SelectedImagePath = "Light/Light+On.png",
X = btnWindSpeedText.Right,
--
Gitblit v1.8.0