From eb424d24e39bab4a245725f35deab3f234ea0f13 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 13 十二月 2019 10:48:50 +0800
Subject: [PATCH] 2019.12.13
---
ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs b/ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs
index 709f0be..813d7c9 100644
--- a/ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs
@@ -244,14 +244,15 @@
public void ShowFunction(bool selectAll)
{
SelectAll = selectAll;
+
+ var devList = Common.Room.AllRoomDeviceUIList;
+
//閫夋嫨鍔熻兘--鐩存帴浠庢埧闂寸殑devicelist涓幏鍙�
- Shared.Common.Room.GetAllRoomDeviceUIList();
- Shared.Common.Room.GetAllRoomDeviceTypeList();
- if (Common.Room.AllRoomDeviceUIList == null)
+ if (devList == null)
{
return;
}
- if (Common.Room.AllRoomDeviceUIList.Count == 0)
+ if (devList.Count == 0)
{
ShowNoFunctionTip();
}
@@ -280,6 +281,7 @@
tempFunctionTypeBtn = new FunctionButton();
+ tempFunctionTypeBtn.Init("", "");
foreach (var deviceType in Common.Room.AllRoomDeviceTypeList)
{
@@ -300,11 +302,10 @@
typeRowLayout.AddChidren(functionTypeIMG);
- functionTypeIMG.ImageBtn.MouseUpEventHandler += ShowSameTypeFunction;
- functionTypeIMG.NameBtn.MouseUpEventHandler += ShowSameTypeFunction;
- functionTypeIMG.ImageBG.MouseUpEventHandler += ShowSameTypeFunction;
+ functionTypeIMG.ClickBtn.MouseUpEventHandler += ShowSameTypeFunction;
+
- if (deviceType == Shared.Common.Room.AllRoomDeviceUIList[0].CommonDevice.Type)
+ if (deviceType == devList[0].CommonDevice.Type)
{
ShowSameTypeFunction(functionTypeIMG.ImageBtn, null);
}
@@ -320,7 +321,6 @@
private void ShowSameTypeFunction(object typeSender, MouseEventArgs mouseEventArgs)
{
//閫夋嫨鍔熻兘--鐩存帴浠庢埧闂寸殑devicelist涓幏鍙�
- Shared.Common.Room.GetAllRoomDeviceUIList();
tempFunctionTypeBtn.IsSelected = false;
tempFunctionTypeBtn = (typeSender as Button).Parent as FunctionButton;
((typeSender as Button).Parent as FunctionButton).IsSelected = true;
@@ -436,8 +436,7 @@
Height = Application.GetRealHeight(200),
Width = Application.GetRealWidth(700),
Gravity = Gravity.CenterHorizontal,
- TextID = R.MyInternationalizationString.NoFunction,
- //Text = "娌℃湁鍔熻兘 \n 璇峰湪涓汉涓績涓�--璁惧绠＄悊澶勬坊鍔�",
+ Text= Language.StringByID(R.MyInternationalizationString.NoFunction_Tip).Replace("{\\r\\n}", "\r\n"),
TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor,
TextAlignment = TextAlignment.Center,
IsMoreLines = true
@@ -616,7 +615,7 @@
Height = Application.GetRealHeight(200),
Width = Application.GetRealWidth(700),
Gravity = Gravity.CenterHorizontal,
- TextID = R.MyInternationalizationString.NoScene,
+ Text = Language.StringByID(R.MyInternationalizationString.NoScene_Tip).Replace("{\\r\\n}", "\r\n"),
TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor,
TextAlignment = TextAlignment.Center,
IsMoreLines = true
--
Gitblit v1.8.0