From 06802250b4b9041d39d568c1dbe77684075006b2 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 11 三月 2020 10:03:44 +0800
Subject: [PATCH] 上传一个版本
---
ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs b/ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs
index 67b09b3..75f24f9 100755
--- a/ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs
@@ -63,9 +63,9 @@
/// </summary>
private Dictionary<int, DeviceConcreteType> typeIdDic;
/// <summary>
- /// 褰撳墠閫夋嫨鐨勫垎鏀� 1:鍦烘櫙 2:鍔熻兘
+ /// 褰撳墠閫夋嫨鐨勫垎鏀� 0:鍦烘櫙 1:鍔熻兘
/// </summary>
- private int NowSelectIndex = 1;
+ private int NowSelectIndex = 0;
#endregion
@@ -176,10 +176,13 @@
Height = Application.GetRealHeight(1607),
BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor
};
- bodyFrameLayout.AddChidren(functionSceneBodyView);
-
- //寮�濮嬪垵濮嬪寲鍦烘櫙鍔熻兘鍒囨崲鎺т欢
- btnSceneFunctionSwitch.InitControl();
+ bodyFrameLayout.AddChidren(functionSceneBodyView);
+
+ //寮�濮嬪垵濮嬪寲鍦烘櫙鍔熻兘鍒囨崲鎺т欢
+ var listTitle = new List<string>();
+ listTitle.Add(Language.StringByID(R.MyInternationalizationString.uScence));
+ listTitle.Add(Language.StringByID(R.MyInternationalizationString.uFunction));
+ btnSceneFunctionSwitch.InitControl(listTitle);
}
#endregion
@@ -192,11 +195,11 @@
{
functionSceneBodyView.RemoveAll();
- if (this.NowSelectIndex == 2)
+ if (this.NowSelectIndex == 1)
{
ShowFunction();
}
- else if (this.NowSelectIndex == 1)
+ else if (this.NowSelectIndex == 0)
{
ShowScene();
}
--
Gitblit v1.8.0