From 561052e04a4bde86e963c89e10f7614df38fd002 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期三, 04 九月 2024 10:58:21 +0800
Subject: [PATCH] 地暖面板，新增SPK
---
HDL_ON/UI/UI2/FuntionControlView/Acst/WaterHeaterJinmaoPage.cs | 75 ++++++++++++++-----------------------
1 files changed, 28 insertions(+), 47 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Acst/WaterHeaterJinmaoPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Acst/WaterHeaterJinmaoPage.cs
index ae12336..2202ec8 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Acst/WaterHeaterJinmaoPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Acst/WaterHeaterJinmaoPage.cs
@@ -10,7 +10,7 @@
{
public class WaterHeaterJinmaoPage : FrameLayout
{
- FrameLayout bodyView;
+ static WaterHeaterJinmaoPage bodyView;
VerticalScrolViewLayout contentView;
FrameLayout bottomView;
Function function;
@@ -255,12 +255,9 @@
TextAlignment = TextAlignment.TopCenter,
Text = function.GetAttrState(WaterHeaterJinmao_AttrEnum.temp.ToString(), "---"),
};
-#if __IOS__
btnTempValues.Width = btnTempValues.GetTextWidth() + Application.GetRealWidth(8);
-#else
- btnTempValues.Width = btnTempValues.GetTextWidth();
-#endif
btnTempValues.Gravity = Gravity.CenterHorizontal;
+
infoView_Temp_View.AddChidren(btnTempValues);
btnTempValuesUint = new Button()
@@ -433,11 +430,7 @@
TextAlignment = TextAlignment.TopCenter,
Text = function.GetAttrState(WaterHeaterJinmao_AttrEnum.set_temp.ToString(), "---"),
};
-#if __IOS__
setTemp_ValuesButton.Width = setTemp_ValuesButton.GetTextWidth() + Application.GetRealWidth(8);
-#else
- setTemp_ValuesButton.Width = setTemp_ValuesButton.GetTextWidth();
-#endif
setTemp_ValuesButton.Gravity = Gravity.CenterHorizontal;
setTempView.AddChidren(setTemp_ValuesButton);
@@ -733,11 +726,7 @@
TextAlignment = TextAlignment.BottomLeft,
IsBold = true,
};
-#if __IOS__
socialContribution_Info1_ValuesButton.Width = socialContribution_Info1_ValuesButton.GetTextWidth() + Application.GetRealWidth(8);
-#else
- socialContribution_Info1_ValuesButton.Width = socialContribution_Info1_ValuesButton.GetTextWidth();
-#endif
socialContribution_InfoView_1.AddChidren(socialContribution_Info1_ValuesButton);
socialContribution_Info1_UintButton = new Button()
@@ -803,11 +792,7 @@
TextAlignment = TextAlignment.BottomLeft,
IsBold = true,
};
-#if __IOS__
socialContribution_Info2_ValuesButton.Width = socialContribution_Info2_ValuesButton.GetTextWidth() + Application.GetRealWidth(8);
-#else
- socialContribution_Info2_ValuesButton.Width = socialContribution_Info2_ValuesButton.GetTextWidth();
-#endif
socialContribution_InfoView_2.AddChidren(socialContribution_Info2_ValuesButton);
@@ -874,11 +859,7 @@
TextAlignment = TextAlignment.BottomLeft,
IsBold = true,
};
-#if __IOS__
socialContribution_Info3_ValuesButton.Width = socialContribution_Info3_ValuesButton.GetTextWidth() + Application.GetRealWidth(8);
-#else
- socialContribution_Info3_ValuesButton.Width = socialContribution_Info3_ValuesButton.GetTextWidth();
-#endif
socialContribution_InfoView_3.AddChidren(socialContribution_Info3_ValuesButton);
socialContribution_Info3_UintButton = new Button()
@@ -1026,84 +1007,84 @@
/// 鏇存柊鐣岄潰鐘舵��
/// </summary>
/// <param name="temp"></param>
- public void UpdateStatus(Function temp)
+ public static void UpdateStatus(Function temp)
{
if (bodyView == null)
{
return;
}
//鍏嶈垂鐑按
- if (function.GetAttrState(WaterHeaterJinmao_AttrEnum.mode_free.ToString()) != temp.GetAttrState(WaterHeaterJinmao_AttrEnum.mode_free.ToString()))
+ if (bodyView.function.GetAttrState(WaterHeaterJinmao_AttrEnum.mode_free.ToString()) != temp.GetAttrState(WaterHeaterJinmao_AttrEnum.mode_free.ToString()))
{
- function.SetAttrState(WaterHeaterJinmao_AttrEnum.mode_free.ToString(), temp.GetAttrState(WaterHeaterJinmao_AttrEnum.mode_free.ToString()));
+ bodyView.function.SetAttrState(WaterHeaterJinmao_AttrEnum.mode_free.ToString(), temp.GetAttrState(WaterHeaterJinmao_AttrEnum.mode_free.ToString()));
Application.RunOnMainThread(() =>
{
- updateFreeMode();
+ bodyView.updateFreeMode();
});
}
//鐑按娓╁害
- if (function.GetAttrState(WaterHeaterJinmao_AttrEnum.temp.ToString()) != temp.GetAttrState(WaterHeaterJinmao_AttrEnum.temp.ToString()))
+ if (bodyView.function.GetAttrState(WaterHeaterJinmao_AttrEnum.temp.ToString()) != temp.GetAttrState(WaterHeaterJinmao_AttrEnum.temp.ToString()))
{
- function.SetAttrState(WaterHeaterJinmao_AttrEnum.temp.ToString(), temp.GetAttrState(WaterHeaterJinmao_AttrEnum.temp.ToString()));
+ bodyView.function.SetAttrState(WaterHeaterJinmao_AttrEnum.temp.ToString(), temp.GetAttrState(WaterHeaterJinmao_AttrEnum.temp.ToString()));
Application.RunOnMainThread(() =>
{
- updateTemp();
+ bodyView.updateTemp();
});
}
//鐑按鍣ㄦā寮�
- if (function.GetAttrState(WaterHeaterJinmao_AttrEnum.mode.ToString()) != temp.GetAttrState(WaterHeaterJinmao_AttrEnum.mode.ToString()))
+ if (bodyView.function.GetAttrState(WaterHeaterJinmao_AttrEnum.mode.ToString()) != temp.GetAttrState(WaterHeaterJinmao_AttrEnum.mode.ToString()))
{
- function.SetAttrState(WaterHeaterJinmao_AttrEnum.mode.ToString(), temp.GetAttrState(WaterHeaterJinmao_AttrEnum.mode.ToString()));
+ bodyView.function.SetAttrState(WaterHeaterJinmao_AttrEnum.mode.ToString(), temp.GetAttrState(WaterHeaterJinmao_AttrEnum.mode.ToString()));
Application.RunOnMainThread(() =>
{
- updateModeUI();
+ bodyView.updateModeUI();
});
}
//鐑按鍣ㄨ缃俯搴�
- if (function.GetAttrState(WaterHeaterJinmao_AttrEnum.set_temp.ToString()) != temp.GetAttrState(WaterHeaterJinmao_AttrEnum.set_temp.ToString()))
+ if (bodyView.function.GetAttrState(WaterHeaterJinmao_AttrEnum.set_temp.ToString()) != temp.GetAttrState(WaterHeaterJinmao_AttrEnum.set_temp.ToString()))
{
- function.SetAttrState(WaterHeaterJinmao_AttrEnum.set_temp.ToString(), temp.GetAttrState(WaterHeaterJinmao_AttrEnum.set_temp.ToString()));
+ bodyView.function.SetAttrState(WaterHeaterJinmao_AttrEnum.set_temp.ToString(), temp.GetAttrState(WaterHeaterJinmao_AttrEnum.set_temp.ToString()));
Application.RunOnMainThread(() =>
{
- updateSetTemp();
+ bodyView.updateSetTemp();
});
}
//鐑按娴侀噺
- if (function.GetAttrState(WaterHeaterJinmao_AttrEnum.flow.ToString()) != temp.GetAttrState(WaterHeaterJinmao_AttrEnum.flow.ToString()))
+ if (bodyView.function.GetAttrState(WaterHeaterJinmao_AttrEnum.flow.ToString()) != temp.GetAttrState(WaterHeaterJinmao_AttrEnum.flow.ToString()))
{
Application.RunOnMainThread(() =>
{
- updateFlow();
+ bodyView.updateFlow();
});
}
//鐑按鎬婚噺
- if (function.GetAttrState(WaterHeaterJinmao_AttrEnum.volume.ToString()) != temp.GetAttrState(WaterHeaterJinmao_AttrEnum.volume.ToString()) ||
- function.GetAttrState(WaterHeaterJinmao_AttrEnum.recycl_volume.ToString()) != temp.GetAttrState(WaterHeaterJinmao_AttrEnum.recycl_volume.ToString()))
+ if (bodyView.function.GetAttrState(WaterHeaterJinmao_AttrEnum.volume.ToString()) != temp.GetAttrState(WaterHeaterJinmao_AttrEnum.volume.ToString()) ||
+ bodyView.function.GetAttrState(WaterHeaterJinmao_AttrEnum.recycl_volume.ToString()) != temp.GetAttrState(WaterHeaterJinmao_AttrEnum.recycl_volume.ToString()))
{
Application.RunOnMainThread(() =>
{
- updateVolume();
+ bodyView.updateVolume();
});
}
//绀句細璐＄尞-鑺傜數閲�
- if (function.GetAttrState(WaterHeaterJinmao_AttrEnum.energy_electricity.ToString()) != temp.GetAttrState(WaterHeaterJinmao_AttrEnum.energy_electricity.ToString()))
+ if (bodyView.function.GetAttrState(WaterHeaterJinmao_AttrEnum.energy_electricity.ToString()) != temp.GetAttrState(WaterHeaterJinmao_AttrEnum.energy_electricity.ToString()))
{
- updateSocialContribution1();
+ bodyView.updateSocialContribution1();
}
//绀句細璐＄尞-co2
- if (function.GetAttrState(WaterHeaterJinmao_AttrEnum.co2.ToString()) != temp.GetAttrState(WaterHeaterJinmao_AttrEnum.co2.ToString()))
+ if (bodyView.function.GetAttrState(WaterHeaterJinmao_AttrEnum.co2.ToString()) != temp.GetAttrState(WaterHeaterJinmao_AttrEnum.co2.ToString()))
{
- updateSocialContribution2();
+ bodyView.updateSocialContribution2();
}
//绀句細璐＄尞-妞嶆爲
- if (function.GetAttrState(WaterHeaterJinmao_AttrEnum.trees.ToString()) != temp.GetAttrState(WaterHeaterJinmao_AttrEnum.trees.ToString()))
+ if (bodyView.function.GetAttrState(WaterHeaterJinmao_AttrEnum.trees.ToString()) != temp.GetAttrState(WaterHeaterJinmao_AttrEnum.trees.ToString()))
{
- updateSocialContribution3();
+ bodyView.updateSocialContribution3();
}
//寮�鍏虫寜閽�
- if (function.GetAttrState(FunctionAttributeKey.OnOff.ToString()) != temp.GetAttrState(FunctionAttributeKey.OnOff.ToString()))
+ if (bodyView.function.GetAttrState(FunctionAttributeKey.OnOff.ToString()) != temp.GetAttrState(FunctionAttributeKey.OnOff.ToString()))
{
- updatePowerButton();
+ bodyView.updatePowerButton();
}
}
--
Gitblit v1.8.0