From 592974441a4df95fffd9167c90192da1a390b1c2 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 06 六月 2023 11:51:12 +0800
Subject: [PATCH] Merge branch 'Dev-Branch'
---
HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs | 112 +++++++++++++++++++++++++++++--------------------------
1 files changed, 59 insertions(+), 53 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
index cf03b0e..1b55639 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
@@ -104,7 +104,7 @@
var temp = (int)Convert.ToDouble(setTempTemp);
if (temp <= 0)
{
- //榛樿鍊兼敼鎴�16,2022骞�06鏈�10鏃�10:03:19 鎴愮敨瑕佹眰鐨�
+ //榛樿鍊兼敼鎴�16
temp = 16;
device.SetAttrState(FunctionAttributeKey.SetTemp, temp.ToString());
}
@@ -132,7 +132,8 @@
if (setTempAttr.curValue.ToString().Contains("."))
{
btnTemp.Text = setTempAttr.curValue.ToString().Split(".")[0];
- }else
+ }
+ else
{
btnTemp.Text = setTempAttr.curValue.ToString();
}
@@ -155,7 +156,7 @@
TextSize = CSS_FontSize.EmphasisFontSize_Secondary,
IsBold = true,
TextAlignment = TextAlignment.CenterLeft,
- Text = "掳C",
+ Text = acFunction.GetTempUnitString(device),
};
FrameWhiteCentet1.AddChidren(btnTempUint);
@@ -165,7 +166,7 @@
Y = btnTemp.Bottom,
Width = Application.GetRealWidth(120),
Height = Application.GetRealHeight(30),
- Text = Language.StringByID(StringId.Indoor) + " 20掳C",
+ Text = Language.StringByID(StringId.Indoor) + " 20" + acFunction.GetTempUnitString(device),
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextAlignment = TextAlignment.TopCenter,
@@ -302,16 +303,20 @@
#endif
btnTempUint.X = btnTemp.Right;
};
- setTempBar.OnStopTrackingTouchEvent = (sender,e) =>{
+ setTempBar.OnStopTrackingTouchEvent = (sender, e) => {
temp = e;
+ Dictionary<string, string> d = new Dictionary<string, string>();
device.SetAttrState(FunctionAttributeKey.SetTemp, e.ToString());
if (setTempAttr.step == "0.5")
{
- btnTemp.Text = (setTempAttr.min + ((double)e / 2)).ToString("0.0");
+ double ex = (double)e / 2;
+ btnTemp.Text = (setTempAttr.min + ((double)ex)).ToString("0.0");
+ d.Add(FunctionAttributeKey.SetTemp, (setTempAttr.min + ex).ToString());
}
else
{
btnTemp.Text = (setTempAttr.min + e).ToString();
+ d.Add(FunctionAttributeKey.SetTemp, (setTempAttr.min + e).ToString());
}
#if __IOS__
@@ -321,8 +326,6 @@
#endif
btnTempUint.X = btnTemp.Right;
controlTime = DateTime.Now;
- Dictionary<string, string> d = new Dictionary<string, string>();
- d.Add(FunctionAttributeKey.SetTemp, e.ToString());
Control.Ins.SendWriteCommand(device, d);
};
@@ -408,7 +411,7 @@
btnModeIcon.UnSelectedImagePath = acFunction.GetModeIconPath(m, false);
btnModeIcon.SelectedImagePath = acFunction.GetModeIconPath(m);
- btnModeText.Text = acFunction.GetModeAttrText( m);
+ btnModeText.Text = acFunction.GetModeAttrText(m);
if (modeList.IndexOf(m) < modeList.Count - 1)
{
@@ -666,7 +669,7 @@
TextSize = CSS_FontSize.TextFontSize,
};
modeChangeView.AddChidren(btnFanText);
- btnFanIcon.UnSelectedImagePath = acFunction.GetFanIconPath(m,false);
+ btnFanIcon.UnSelectedImagePath = acFunction.GetFanIconPath(m, false);
btnFanIcon.SelectedImagePath = acFunction.GetFanIconPath(m);
btnFanText.Text = acFunction.GetFanAttrText(m);
@@ -762,7 +765,7 @@
{
Y = Application.GetRealHeight(16),
Gravity = Gravity.CenterHorizontal,
- Width = Application.GetRealWidth(296+200),
+ Width = Application.GetRealWidth(296 + 200),
};
bodyView.AddChidren(contentView);
@@ -778,7 +781,8 @@
int index = 0;
List<FunctionAttributes> attrList = new List<FunctionAttributes>();
attrList.AddRange(device.attributes);
- attrList.Add(new FunctionAttributes() {
+ attrList.Add(new FunctionAttributes()
+ {
key = "+",
});
@@ -868,45 +872,45 @@
SelectedTextColor = CSS_Color.MainBackgroundColor,
SelectedBackgroundColor = CSS_Color.MainColor,
};
- if (attr.value.Count > 0)
- {
- btn.Text = attr.value[0];
- }
- if (index % 3 == 1)
- {
- btn.Gravity = Gravity.Center;
- }
- else if (index % 3 == 2)
- {
- btn.X = Application.GetRealWidth(208);
- }
- row.AddChidren(btn);
-
- btn.MouseUpEventHandler = (sender, e) =>
- {
- //if (!device.online)
- //{
- // new Tip()
- // {
- // CloseTime = 1,
- // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- // Direction = AMPopTipDirection.None,
- // }.Show(MainPage.BaseView);
- //}
- Dictionary<string, string> d = new Dictionary<string, string>();
- d.Add(attr.key, "");
- Control.Ins.SendWriteCommand(device, d);
-
- new System.Threading.Thread(() =>
+ if (attr.value.Count > 0)
{
- System.Threading.Thread.Sleep(2000);
- Application.RunOnMainThread(() =>
+ btn.Text = attr.value[0];
+ }
+ if (index % 3 == 1)
+ {
+ btn.Gravity = Gravity.Center;
+ }
+ else if (index % 3 == 2)
+ {
+ btn.X = Application.GetRealWidth(208);
+ }
+ row.AddChidren(btn);
+
+ btn.MouseUpEventHandler = (sender, e) =>
+ {
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ //}
+ Dictionary<string, string> d = new Dictionary<string, string>();
+ d.Add(attr.key, "");
+ Control.Ins.SendWriteCommand(device, d);
+
+ new System.Threading.Thread(() =>
{
- btn.IsSelected = false;
- });
- })
- { IsBackground = true }.Start();
- };
+ System.Threading.Thread.Sleep(2000);
+ Application.RunOnMainThread(() =>
+ {
+ btn.IsSelected = false;
+ });
+ })
+ { IsBackground = true }.Start();
+ };
}
@@ -1031,14 +1035,16 @@
{
//device = FunctionList.List.Functions.Find((obj) => obj.sid == device.sid);
- btnIndoorTemp.Text = Language.StringByID(StringId.Indoor) + " " + Convert.ToInt32(Convert.ToDouble(device.GetAttrState(FunctionAttributeKey.RoomTemp).Replace(",", "."))) + "掳C";
+ btnIndoorTemp.Text = Language.StringByID(StringId.Indoor) + " "
+ + Convert.ToInt32(Convert.ToDouble(device.GetAttrState(FunctionAttributeKey.RoomTemp).Replace(",", ".")))
+ + acFunction.GetTempUnitString(device);
btnMode.SelectedImagePath = acFunction.GetModeIconPath(device.GetAttrState(FunctionAttributeKey.Mode));
btnSwing.SelectedImagePath = acFunction.GetSwingIconPath(device.GetAttrState(FunctionAttributeKey.Swing));
btnWindSpeed.SelectedImagePath = acFunction.GetFanIconPath(device.GetAttrState(FunctionAttributeKey.FanSpeed));
btnMode.UnSelectedImagePath = acFunction.GetModeIconPath(device.GetAttrState(FunctionAttributeKey.Mode), false);
btnSwing.UnSelectedImagePath = acFunction.GetSwingIconPath(device.GetAttrState(FunctionAttributeKey.Swing), false);
btnWindSpeed.UnSelectedImagePath = acFunction.GetFanIconPath(device.GetAttrState(FunctionAttributeKey.FanSpeed), false);
-
+
if (device.GetAttribute(FunctionAttributeKey.SetTemp).step == "0.5")
{
var t = Convert.ToDouble(device.GetAttrState(FunctionAttributeKey.SetTemp).Replace(",", "."));
@@ -1056,7 +1062,7 @@
#if __IOS__
btnTemp.Width = btnTemp.GetTextWidth() + Application.GetRealWidth(10);
#else
- btnTemp.Width = btnTemp.GetTextWidth() + Application.GetRealWidth(5);
+ btnTemp.Width = btnTemp.GetTextWidth() + Application.GetRealWidth(5);
#endif
btnTempUint.X = btnTemp.Right;
@@ -1086,7 +1092,7 @@
setTempBar.IsClickable = false;
}
- if(device.GetAttrState(FunctionAttributeKey.Mode) == "dry")
+ if (device.GetAttrState(FunctionAttributeKey.Mode) == "dry")
{
setTempBar.IsOffline = true;
setTempBar.IsClickable = false;
--
Gitblit v1.8.0