From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundContentForDevice.cs | 43 ++++++++++++++++++++++---------------------
1 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundContentForDevice.cs b/ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundContentForDevice.cs
index b2df8fa..ddf78a0 100755
--- a/ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundContentForDevice.cs
+++ b/ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundContentForDevice.cs
@@ -135,6 +135,13 @@
else
{
tipLayout.Visible = false;
+ }
+
+ if (listView.ChildrenCount > 5)
+ {
+ TextView textView = new TextView();
+ textView.Height = Application.GetRealHeight(127 * 3);
+ listView.AddChidren(textView);
}
}
catch (Exception ex)
@@ -350,7 +357,7 @@
/// </summary>
private NormalViewControl btnName = null;
- private IconViewControl Right_icon = null;
+ private MostRightIconControl Right_icon = null;
/// <summary>
@@ -373,14 +380,11 @@
//鏄剧ず鏂囨湰
btnName = this.AddLeftCaption(string.Empty, 700);
btnName.Height = Application.GetRealHeight(60);
- btnName.TextSize = 17;
+ btnName.TextSize = 14;
btnName.Y = Application.GetRealHeight(57);
btnName.Text = scene.SceneName;
- Right_icon = this.AddRightArrow();
- Right_icon.Width = Application.GetRealWidth(115);
- Right_icon.Height = Application.GetRealHeight(115);
+ Right_icon = this.AddMostRightEmptyIcon(58, 58);
Right_icon.Gravity = Gravity.CenterVertical;
- Right_icon.X = Right_icon.X - Application.GetRealWidth(60);
this.ButtonClickEvent += (sender, e) =>
{
@@ -399,13 +403,13 @@
{
if (bol)
{
- Right_icon.SelectedImagePath = "SmartSound/CheckBoxSel.png";
- Right_icon.UnSelectedImagePath = "SmartSound/CheckBoxSel.png";
+ Right_icon.SelectedImagePath = "Item/ItemSelected.png";
+ Right_icon.UnSelectedImagePath = "Item/ItemSelected.png";
}
else
{
- Right_icon.SelectedImagePath = "SmartSound/CheckBoxDef.png";
- Right_icon.UnSelectedImagePath = "SmartSound/CheckBoxDef.png";
+ Right_icon.SelectedImagePath = "Item/ItemUnSelected.png";
+ Right_icon.UnSelectedImagePath = "Item/ItemUnSelected.png";
}
}
catch (Exception e)
@@ -432,7 +436,7 @@
/// </summary>
private NormalViewControl btnName = null;
- private IconViewControl Right_icon = null;
+ private MostRightIconControl Right_icon = null;
/// <summary>
@@ -455,14 +459,11 @@
//鏄剧ず鏂囨湰
btnName = this.AddLeftCaption(string.Empty, 700);
btnName.Height = Application.GetRealHeight(60);
- btnName.TextSize = 17;
+ btnName.TextSize = 14;
btnName.Y = Application.GetRealHeight(57);
btnName.Text = device.DeviceName;
- Right_icon = this.AddRightArrow();
- Right_icon.Width = Application.GetRealWidth(115);
- Right_icon.Height = Application.GetRealHeight(115);
+ Right_icon = this.AddMostRightEmptyIcon(58, 58);
Right_icon.Gravity = Gravity.CenterVertical;
- Right_icon.X = Right_icon.X - Application.GetRealWidth(60);
this.ButtonClickEvent += (sender, e) =>
{
@@ -481,14 +482,14 @@
{
if (bol)
{
- Right_icon.SelectedImagePath = "SmartSound/CheckBoxSel.png";
- Right_icon.UnSelectedImagePath = "SmartSound/CheckBoxSel.png";
+ Right_icon.SelectedImagePath = "Item/ItemSelected.png";
+ Right_icon.UnSelectedImagePath = "Item/ItemSelected.png";
}
else
{
- Right_icon.SelectedImagePath = "SmartSound/CheckBoxDef.png";
- Right_icon.UnSelectedImagePath = "SmartSound/CheckBoxDef.png";
- }
+ Right_icon.SelectedImagePath = "Item/ItemUnSelected.png";
+ Right_icon.UnSelectedImagePath = "Item/ItemUnSelected.png";
+ }
}
catch (Exception e)
{
--
Gitblit v1.8.0