From d78515ac4ac8cf4a1785d9df18058d6724f12b79 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 14 一月 2021 19:34:59 +0800
Subject: [PATCH] 合并xm2021-01-13 wjc2021-02-06
---
ZigbeeApp/Shared/Phone/SmartSound/Widget/SoundRowLayout.cs | 44 ++++++++++++++++++++++++--------------------
1 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/SmartSound/Widget/SoundRowLayout.cs b/ZigbeeApp/Shared/Phone/SmartSound/Widget/SoundRowLayout.cs
index d329d50..8569384 100755
--- a/ZigbeeApp/Shared/Phone/SmartSound/Widget/SoundRowLayout.cs
+++ b/ZigbeeApp/Shared/Phone/SmartSound/Widget/SoundRowLayout.cs
@@ -12,7 +12,9 @@
/// 鍒犻櫎鎸夐挳
/// </summary>
public NormalViewControl btnDelect = null;
-
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
public NormalViewControl btnRemark = null;
/// <summary>
/// 鍥剧墖璺緞
@@ -20,13 +22,10 @@
public string ImagePath = "SmartSound/SoundIcon.png";
/// <summary>
- /// 鏅鸿兘闊崇璐﹀彿
- /// </summary>
- public string Account = "";
- /// <summary>
- /// 鏅鸿兘闊崇澶囨敞
+ /// 鏅鸿兘闊崇澶囨敞鍚嶇О
/// </summary>
public string Remark = "";
+
public SoundRowLayout()
{
@@ -38,25 +37,30 @@
/// </summary>
public void InitControl()
{
- //鍥炬爣
- var btnIcon = frameTable.AddLeftIcon(81);
+ try
+ {
+ //鍥炬爣
+ var btnIcon = frameTable.AddLeftIcon(81);
- btnIcon.UnSelectedImagePath = ImagePath;
- btnIcon.SelectedImagePath = ImagePath;
+ btnIcon.UnSelectedImagePath = ImagePath;
+ btnIcon.SelectedImagePath = ImagePath;
- //璁惧
- var btnAccount = frameTable.AddTopView(Account, 800);
- //鎴块棿
- btnRemark = frameTable.AddBottomView(Remark, 800);
- //搴曠嚎
- frameTable.AddBottomLine();
+ //澶囨敞鍚嶇О鎸夐挳
+ btnRemark = frameTable.AddLeftCaption(Remark, 800);
- btnRename = base.AddEditorControl();
- btnRename.Text = "閲嶅懡鍚�";
+ //搴曠嚎
+ frameTable.AddBottomLine();
- btnDelect = base.AddDeleteControl();
- btnDelect.Text = "瑙ｉ櫎缁戝畾";
+ btnRename = base.AddEditorControl();
+ btnRename.Text = "閲嶅懡鍚�";
+ btnDelect = base.AddDeleteControl();
+ btnDelect.Text = "瑙ｉ櫎缁戝畾";
+ }
+ catch (Exception e)
+ {
+ //
+ }
}
}
}
--
Gitblit v1.8.0