From 0891d90cd0d435338cc2851fd0830cd318a17fff Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 23 十二月 2020 14:25:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/WJC' into NewFilePath
---
HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs | 89 ++++++++++++++++++++++++++------------------
1 files changed, 52 insertions(+), 37 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
index 0a3904f..6f0fee4 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
@@ -25,7 +25,7 @@
/// <summary>
/// 绌鸿皟娓╁害鎺у埗鎺т欢
/// </summary>
- ArcSeekBar arcBar;
+ DiyArcSeekBar arcBar;
/// <summary>
/// 鍑忓彿鎸夐挳
/// </summary>
@@ -132,29 +132,41 @@
Height = Application.GetMinRealAverage(40),
SelectedImagePath = "Collection/CollectionIcon.png",
UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
- IsSelected = aC.collection
+ IsSelected = aC.collect
};
- controlView.AddChidren(btnCollection);
+ //controlView.AddChidren(btnCollection);
+ //2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
+ if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ {
+ controlView.AddChidren(btnCollection);
+ }
- arcBar = new ArcSeekBar()
+ arcBar = new DiyArcSeekBar()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(120),
- Width = Application.GetRealWidth(280),
- Height = Application.GetRealWidth(280),
OpenAngle = 160,
- ThumbColor = CSS_Color.AuxiliaryColor1,
- ThumbModeFill = true,
- ProgressBarColor = aC.on_off == "on"? CSS_Color.MainColor :CSS_Color.PromptingColor2,
- ThumbRadius = Application.GetRealWidth(12),
- ArcWidthWithDefaultStyle = Application.GetRealWidth(12),
+ ThumbImagePath = aC.trait_on_off.curValue.ToString() == "on" ? "FunctionIcon/AC/DiyThumbIconOn.png" : "FunctionIcon/AC/DiyThumbIcon.png",
+ ThumbImageHeight = Application.GetRealWidth(50),
+ ProgressBarColor = CSS_Color.MainColor,
+ OfflineProgressBarColor = CSS_Color.PromptingColor2,
+ IsOffline = aC.trait_on_off.curValue.ToString() == "off",
MinValue = 16,
- MaxValue = 38,
- Progress = aC.curTemp,
- ProgressBarUnitSring = "掳C",
- IsClickable = true,
- ProgressTextColor = 0x00000000,
+ MaxValue = 32,
+ //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
+ Y = Application.GetRealHeight(120 + 40),
+ Width = Application.GetRealWidth(260 - 40),
+ Height = Application.GetRealWidth(260 - 40),
+ SeekBarPadding = Application.GetRealWidth(7),
+#endif
+
};
controlView.AddChidren(arcBar);
@@ -167,7 +179,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = 50,
IsBold = true,
- Text = aC.curTemp.ToString(),
+ Text = aC.trait_temp.curValue.ToString(),
TextAlignment = TextAlignment.Center,
};
controlView.AddChidren(btnTemp);
@@ -177,7 +189,7 @@
X = btnTemp.Right,
Y = btnTemp.Y,
Width = Application.GetRealWidth(30),
- Height = Application.GetRealWidth(20),
+ Height = Application.GetRealHeight(30),
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.EmphasisFontSize_Secondary,
IsBold = true,
@@ -246,12 +258,17 @@
Height = Application.GetRealWidth(40),
UnSelectedImagePath = "Public/PowerClose.png",
SelectedImagePath = "Public/PowerOpen.png",
- IsSelected = aC.on_off == "on"
+ IsSelected = aC.trait_on_off.curValue.ToString() == "on"
};
controlView.AddChidren(btnSwitch);
LoadEventList();
- new TopViewDiv(bodyView,aC.name).LoadTopView(aC, actionRefresh);
+ new TopViewDiv(bodyView,Language.StringByID(StringId.AC)).LoadTopView_FunctionTop(aC, actionRefresh);
+ new System.Threading.Thread(() =>
+ {
+ DriverLayer.Control.Ins.SendReadCommand(aC);
+ })
+ { IsBackground = true }.Start();
}
/// <summary>
/// 鍔犺浇淇敼妯″紡鍖哄煙
@@ -274,8 +291,6 @@
Width = Application.GetRealWidth(160),
Height = Application.GetRealHeight(287),
BackgroundImagePath = "FunctionIcon/AC/DivBg1.png",
- Animate = Animate.DownToUp,
- AnimateSpeed = 0.3f
};
dialogView.AddChidren(modeChangeView);
@@ -303,28 +318,29 @@
};
modeChangeView.AddChidren(btnLine);
- foreach(var m in aC.modeList)
+ foreach(var m in aC.trait_mode.value)
{
Button btnModeIcon = new Button()
{
X = btnTitle.X,
- Y = Application.GetRealHeight(44 * (aC.modeList.IndexOf(m) + 1) + 10 + 8),
+ Y = Application.GetRealHeight(44 * (aC.trait_mode.value.IndexOf(m) + 1) + 10 + 8),
Width = Application.GetRealWidth(24),
Height = Application.GetRealWidth(24),
- IsSelected = aC.trait_mode.curValues == m,
+ IsSelected = aC.trait_mode.curValue.ToString() == m,
};
modeChangeView.AddChidren(btnModeIcon);
Button btnModeText = new Button()
{
X = Application.GetRealWidth(12) + btnModeIcon.Right,
- Y = Application.GetRealHeight(44 * (aC.modeList.IndexOf(m) + 1) + 8),
+ Y = Application.GetRealHeight(44 * (aC.trait_mode.value.IndexOf(m) + 1) + 8),
Height = Application.GetRealHeight(44),
Width = Application.GetRealWidth(70),
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.FirstLevelTitleColor,
SelectedTextColor = CSS_Color.MainColor,
- IsSelected = aC.trait_mode.curValues == m,
+ IsSelected = aC.trait_mode.curValue.ToString() == m,
+ TextSize = CSS_FontSize.TextFontSize,
};
modeChangeView.AddChidren(btnModeText);
@@ -357,7 +373,7 @@
break;
}
- if(aC.modeList.IndexOf(m) < aC.modeList.Count-1)
+ if(aC.trait_mode.value.IndexOf(m) < aC.trait_mode.value.Count-1)
{
modeChangeView.AddChidren(new Button()
{
@@ -396,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.DownToUp,
};
dialogView.AddChidren(modeChangeView);
@@ -426,28 +440,29 @@
};
modeChangeView.AddChidren(btnLine);
- foreach (var m in aC.fan_List)
+ foreach (var m in aC.trait_fan.value)
{
Button btnFanIcon = new Button()
{
X = btnTitle.X,
- Y = Application.GetRealHeight(44 * (aC.fan_List.IndexOf(m) + 1) + 10 + 8),
+ Y = Application.GetRealHeight(44 * (aC.trait_fan.value.IndexOf(m) + 1) + 10 + 8),
Width = Application.GetRealWidth(24),
Height = Application.GetRealWidth(24),
- IsSelected = aC.trait_fan.curValues.ToString() == m,
+ IsSelected = aC.trait_fan.curValue.ToString() == m,
};
modeChangeView.AddChidren(btnFanIcon);
Button btnFanText = new Button()
{
X = Application.GetRealWidth(12) + btnFanIcon.Right,
- Y = Application.GetRealHeight(44 * (aC.fan_List.IndexOf(m) + 1) + 8),
+ Y = Application.GetRealHeight(44 * (aC.trait_fan.value.IndexOf(m) + 1) + 8),
Height = Application.GetRealHeight(44),
Width = Application.GetRealWidth(70),
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.FirstLevelTitleColor,
SelectedTextColor = CSS_Color.MainColor,
- IsSelected = aC.trait_fan.curValues.ToString() == m,
+ IsSelected = aC.trait_fan.curValue.ToString() == m,
+ TextSize = CSS_FontSize.TextFontSize,
};
modeChangeView.AddChidren(btnFanText);
@@ -475,7 +490,7 @@
break;
}
- if (aC.modeList.IndexOf(m) < aC.modeList.Count - 1)
+ if (aC.trait_fan.value.IndexOf(m) < aC.trait_fan.value.Count - 1)
{
modeChangeView.AddChidren(new Button()
{
--
Gitblit v1.8.0