From cb1476f1197b8730038b4ef485f8f036e1d93422 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 09 六月 2021 16:49:32 +0800
Subject: [PATCH] 合并文本缺漏
---
HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs | 62 ++++++++++++++++++------------
1 files changed, 37 insertions(+), 25 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
index 31940db..9aa7f00 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
@@ -111,7 +111,7 @@
arcBar.IsOffline = device.GetAttrState(FunctionAttributeKey.OnOff) == "off";
arcBar.MinValue = device.GetAttribute(FunctionAttributeKey.SetTemp).min;
arcBar.MaxValue = device.GetAttribute(FunctionAttributeKey.SetTemp).max;
- arcBar.Progress = Convert.ToInt32(device.GetAttrState(FunctionAttributeKey.SetTemp));
+ arcBar.Progress = (int)Convert.ToDouble(device.GetAttrState(FunctionAttributeKey.SetTemp));
btnTemp = new Button()
{
@@ -122,7 +122,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = 50,
IsBold = true,
- Text = device.GetAttrState(FunctionAttributeKey.SetTemp),
+ Text = Convert.ToDouble( device.GetAttrState(FunctionAttributeKey.SetTemp)).ToString(),
TextAlignment = TextAlignment.Center,
};
FrameWhiteCentet1.AddChidren(btnTemp);
@@ -311,16 +311,18 @@
device.SetAttrState(FunctionAttributeKey.Mode, m);
btnMode.UnSelectedImagePath = acFunction.GetModeIconPath(m);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- btnMode.UnSelectedImagePath = btnModeIcon.UnSelectedImagePath;
+ //btnMode.UnSelectedImagePath = btnModeIcon.UnSelectedImagePath;
d.Add(FunctionAttributeKey.Mode, m);
Control.Ins.SendWriteCommand(device, d);
dialog.Close();
if (device.GetAttrState(FunctionAttributeKey.Mode) == "fan")
{
arcBar.IsClickable = false;
+ arcBar.IsOffline = true;
}
else
{
+ arcBar.IsOffline = false;
arcBar.IsClickable = true;
}
};
@@ -437,7 +439,7 @@
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add(FunctionAttributeKey.FanSpeed, m);
Control.Ins.SendWriteCommand(device, d);
- btnWindSpeed.UnSelectedImagePath = btnFanIcon.UnSelectedImagePath;
+ //btnWindSpeed.UnSelectedImagePath = btnFanIcon.UnSelectedImagePath;
dialog.Close();
};
btnFanIcon.MouseUpEventHandler = eventHandler1;
@@ -470,6 +472,7 @@
};
}
}
+
/// <summary>
/// 鍔犺浇棰濆瀵圭孩澶栨寜閽晫闈�
/// </summary>
@@ -485,8 +488,8 @@
var bodyView = new FrameLayout()
{
- Y = Application.GetRealHeight(463),
- Height = Application.GetRealHeight(375),
+ Y = Application.GetRealHeight(427),//667
+ Height = Application.GetRealHeight(240),
BackgroundColor = CSS_Color.MainBackgroundColor,
};
div.AddChidren(bodyView);
@@ -495,24 +498,25 @@
{
Y = Application.GetRealHeight(16),
Gravity = Gravity.CenterHorizontal,
- Width = Application.GetRealWidth(296),
+ Width = Application.GetRealWidth(296+200),
};
bodyView.AddChidren(contentView);
- var row = new FrameLayout()
- {
- Height = Application.GetRealHeight(60),
- };
- contentView.AddChidren(row);
+ var row = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(60),
+ Width = Application.GetRealWidth(296),
+ Gravity = Gravity.CenterHorizontal,
+ };
+ contentView.AddChidren(row);
- int index = 0;
+ int index = 0;
List<FunctionAttributes> attrList = new List<FunctionAttributes>();
attrList.AddRange(device.attributes);
attrList.Add(new FunctionAttributes() {
key = "+",
});
-
foreach (var attr in attrList)
{
@@ -532,6 +536,8 @@
row = new FrameLayout()
{
Height = Application.GetRealHeight(56),
+ Width = Application.GetRealWidth(296),
+ Gravity = Gravity.CenterHorizontal,
};
contentView.AddChidren(row);
}
@@ -570,7 +576,10 @@
btnAdd.MouseUpEventHandler = (sender, e) =>
{
dialog.Close();
- var addButton = new AcControlPage_AddIrButton();
+ Action action = () => {
+ LoadDialog_IrMoreView();
+ };
+ var addButton = new AcControlPage_AddIrButton(action);
MainPage.BasePageView.AddChidren(addButton);
addButton.Show(device);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -611,8 +620,8 @@
btn.MouseUpEventHandler = (sender, e) =>
{
- System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add(FunctionAttributeKey.Key, attr.key);
+ Dictionary<string, string> d = new Dictionary<string, string>();
+ d.Add(attr.key, "");
Control.Ins.SendWriteCommand(device, d);
new System.Threading.Thread(() =>
@@ -630,11 +639,6 @@
index++;
}
-
-
-
-
-
dialog.Show();
}
@@ -674,7 +678,7 @@
{
return;
}
- var temp = Convert.ToInt32(device.GetAttrState(FunctionAttributeKey.SetTemp));
+ var temp = (int)Convert.ToDouble(device.GetAttrState(FunctionAttributeKey.SetTemp));
if (temp <= device.GetAttribute(FunctionAttributeKey.Mode).min)
{
return;
@@ -693,7 +697,7 @@
{
return;
}
- var temp = Convert.ToInt32(device.GetAttrState(FunctionAttributeKey.SetTemp));
+ var temp = (int)Convert.ToDouble(device.GetAttrState(FunctionAttributeKey.SetTemp));
if (temp >= device.GetAttribute(FunctionAttributeKey.SetTemp).max)
{
return;
@@ -719,6 +723,14 @@
device.SetAttrState(FunctionAttributeKey.SetTemp, e.ToString());
btnTemp.Text = e.ToString();
};
+ //arcBar.MouseDownEventHandler = (sender, e) => {
+ // Console.WriteLine("ddd");
+ // MainPage.BasePageView.ScrollEnabled =false;
+ //};
+ //arcBar.MouseUpEventHandler = (sender, e) => {
+ // Console.WriteLine("ddd2");
+ // MainPage.BasePageView.ScrollEnabled = true;
+ //};
}
/// <summary>
/// 鎺у埗妯″紡浜嬩欢
@@ -775,7 +787,7 @@
{
Application.RunOnMainThread(() =>
{
- btnTemp.Text = device.GetAttrState(FunctionAttributeKey.SetTemp);
+ btnTemp.Text = Convert.ToDouble( device.GetAttrState(FunctionAttributeKey.SetTemp)).ToString();
btnIndoorTemp.Text = Language.StringByID(StringId.IndoorTemp) + Convert.ToInt32(Convert.ToDouble(device.GetAttrState(FunctionAttributeKey.RoomTemp))) + "掳C";
btnMode.UnSelectedImagePath = acFunction.GetModeIconPath(device.GetAttrState(FunctionAttributeKey.Mode));
btnWindSpeed.UnSelectedImagePath = acFunction.GetFanIconPath(device.GetAttrState(FunctionAttributeKey.FanSpeed));
--
Gitblit v1.8.0