From 2450c12c825ad4d78d1572da2fa421706db2df2f Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 18 六月 2020 16:01:14 +0800
Subject: [PATCH] 新代码
---
ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundContentForDevice.cs | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundContentForDevice.cs b/ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundContentForDevice.cs
index 052b1bd..b2df8fa 100755
--- a/ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundContentForDevice.cs
+++ b/ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundContentForDevice.cs
@@ -19,7 +19,12 @@
/// </summary>
private FrameLayout TipLayout = null;
- private List<string> TabList = new List<string>() { "鐏厜", "绐楀笜" };
+ private List<string> TabList = new List<string>()
+ {
+ Language.StringByID(R.MyInternationalizationString.uLight),
+ Language.StringByID(R.MyInternationalizationString.uDeviceBelongId100),
+ Language.StringByID(R.MyInternationalizationString.AC)
+ };
private int CurrentSelectIndex = 0;
@@ -40,13 +45,10 @@
/// </summary>
public void ShowForm()
{
-
//璁剧疆鏍囬淇℃伅
base.SetTitleText(CurrentRoom.RoomName);
-
//鍒濆鍖栦腑閮ㄦ帶浠�
this.InitMiddleFrame();
-
}
private void InitMiddleFrame()
@@ -167,8 +169,6 @@
listView.Y= tab_layout.Height;
listView.Height=ContentLayout.Height- tab_layout.Height;
-
-
Buttons.Clear();
//娣诲姞鍔熻兘椤�
@@ -208,12 +208,12 @@
switch (CurrentSelectIndex)
{
- case 0:// 鐏厜
+ case 0: // 鐏厜
{
for (int i = 0; i < CurrentRoom.DeviceList.Count; i++)
{
SmartSound.Device device = CurrentRoom.DeviceList[i];
- //鐏厜
+ // 鐏厜
if (device.DeviceType == 1 || device.DeviceType == 2 || device.DeviceType == 3)
{
var deviceRowLayout = new DeviceRowLayout(this, device);
@@ -238,6 +238,28 @@
}
}
break;
+ case 2: // 绌鸿皟
+ {
+ for (int i = 0; i < CurrentRoom.DeviceList.Count; i++)
+ {
+ SmartSound.Device device = CurrentRoom.DeviceList[i];
+ //
+ if (device.DeviceType == 7)
+ {
+ var deviceRowLayout = new DeviceRowLayout(this, device);
+ listView.AddChidren(deviceRowLayout);
+ deviceRowLayout.InitControl();
+ }
+ }
+ }
+ break;
+ }
+
+ if (listView.ChildrenCount > 5)
+ {
+ TextView textView = new TextView();
+ textView.Height = Application.GetRealHeight(127 * 3);
+ listView.AddChidren(textView);
}
if (listView.ChildrenCount == 0)
--
Gitblit v1.8.0