From 775bf2d08b8a7a9f22d445b77106ce67d0c75fc0 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 29 一月 2021 11:22:29 +0800
Subject: [PATCH] 2021-01-29 1.增加萤石云功能相关库和资源文件，目前有冲突还无法编译
---
HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs | 51 ++++++++++++++++++++++-----------------------------
1 files changed, 22 insertions(+), 29 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
index 9c61396..cf1c52e 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
@@ -143,37 +143,30 @@
arcBar = new DiyArcSeekBar()
{
-#if __IOS__
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(120+25),
- Width = Application.GetRealWidth(260-40),
- Height = Application.GetRealWidth(260-40),
OpenAngle = 160,
ThumbImagePath = aC.trait_on_off.curValue.ToString() == "on" ? "FunctionIcon/AC/DiyThumbIconOn.png" : "FunctionIcon/AC/DiyThumbIcon.png",
ThumbImageHeight = Application.GetRealWidth(50),
- ProgressBarColor = aC.trait_on_off.curValue.ToString() == "on"? CSS_Color.MainColor :CSS_Color.PromptingColor2,
- MinValue = 16,
- MaxValue = 38,
- Progress = Convert.ToInt32( aC.trait_temp.curValue),
- IsClickable = aC.trait_on_off.curValue.ToString() == "on" ,
+ ProgressBarColor = CSS_Color.MainColor,
+ OfflineProgressBarColor = CSS_Color.PromptingColor2,
+ IsOffline = aC.trait_on_off.curValue.ToString() == "off",
+ MinValue = aC.trait_temp.min,
+ MaxValue = aC.trait_temp.max,
+ //IsClickable = aC.trait_on_off.curValue.ToString() == "on",
ArcColor = CSS_Color.BackgroundColor,
+ Progress = Convert.ToInt32(aC.trait_temp.curValue),
+#if __IOS__
+ Y = Application.GetRealHeight(120 + 25),
+ Width = Application.GetRealWidth(260 - 40),
+ Height = Application.GetRealWidth(260 - 40),
SeekBarPadding = Application.GetRealWidth(8),
#else
- Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(120 + 40),
Width = Application.GetRealWidth(260 - 40),
Height = Application.GetRealWidth(260 - 40),
- OpenAngle = 160,
- ThumbImagePath = aC.trait_on_off.curValue.ToString() == "on" ? "FunctionIcon/AC/DiyThumbIconOn.png" : "FunctionIcon/AC/DiyThumbIcon.png",
- ThumbImageHeight = Application.GetRealWidth(50),
- ProgressBarColor = aC.trait_on_off.curValue.ToString() == "on" ? CSS_Color.MainColor : CSS_Color.PromptingColor2,
- MinValue = 16,
- MaxValue = 38,
- Progress = Convert.ToInt32( aC.trait_temp.curValue),
- IsClickable = aC.trait_on_off.curValue.ToString() == "on",
- ArcColor = CSS_Color.BackgroundColor,
SeekBarPadding = Application.GetRealWidth(7),
#endif
+
};
controlView.AddChidren(arcBar);
@@ -209,7 +202,7 @@
{
Gravity = Gravity.CenterHorizontal,
Y = btnTemp.Bottom,
- Width = Application.GetRealWidth(100),
+ Width = Application.GetRealWidth(120),
Height = Application.GetRealHeight(20),
Text = Language.StringByID(StringId.IndoorTemp) + "20掳C",
TextColor = CSS_Color.PromptingColor1,
@@ -260,9 +253,9 @@
btnSwitch = new Button()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(462),
- Width = Application.GetRealWidth(40),
- Height = Application.GetRealWidth(40),
+ Y = Application.GetRealHeight(466),
+ Width = Application.GetRealWidth(32),
+ Height = Application.GetRealWidth(32),
UnSelectedImagePath = "Public/PowerClose.png",
SelectedImagePath = "Public/PowerOpen.png",
IsSelected = aC.trait_on_off.curValue.ToString() == "on"
@@ -271,7 +264,11 @@
LoadEventList();
new TopViewDiv(bodyView,Language.StringByID(StringId.AC)).LoadTopView_FunctionTop(aC, actionRefresh);
- DriverLayer.Control.Ins.SendReadCommand(aC);
+ new System.Threading.Thread(() =>
+ {
+ DriverLayer.Control.Ins.SendReadCommand(aC);
+ })
+ { IsBackground = true }.Start();
}
/// <summary>
/// 鍔犺浇淇敼妯″紡鍖哄煙
@@ -294,8 +291,6 @@
Width = Application.GetRealWidth(160),
Height = Application.GetRealHeight(287),
BackgroundImagePath = "FunctionIcon/AC/DivBg1.png",
- Animate = Animate.UpToDown,
- AnimateSpeed = 0.3f
};
dialogView.AddChidren(modeChangeView);
@@ -340,7 +335,7 @@
X = Application.GetRealWidth(12) + btnModeIcon.Right,
Y = Application.GetRealHeight(44 * (aC.trait_mode.value.IndexOf(m) + 1) + 8),
Height = Application.GetRealHeight(44),
- Width = Application.GetRealWidth(70),
+ Width = Application.GetRealWidth(90),
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.FirstLevelTitleColor,
SelectedTextColor = CSS_Color.MainColor,
@@ -417,9 +412,7 @@
Y = Application.GetRealHeight(172),
Width = Application.GetRealWidth(160),
Height = Application.GetRealHeight(243),
- AnimateSpeed = 0.3f,
BackgroundImagePath = "FunctionIcon/AC/DivBg2.png",
- Animate = Animate.UpToDown,
};
dialogView.AddChidren(modeChangeView);
--
Gitblit v1.8.0