From 9904031f5291daaf56985146bb671f25e18ebbdf Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 02 四月 2020 19:51:31 +0800
Subject: [PATCH] 最新代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs | 65 ++++++++++++++++++++++++--------
1 files changed, 48 insertions(+), 17 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs
index 0557f56..cf71a30 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs
@@ -55,6 +55,17 @@
}
/// <summary>
+ /// 鍒濆鍖栨帶浠�(閽堝鐨勬槸缃戝叧)
+ /// </summary>
+ /// <param name="i_caption">鏍囬鏂囨湰</param>
+ /// <param name="i_gateway">缃戝叧瀵硅薄</param>
+ public void InitControl(string i_caption, ZigBee.Device.ZbGateway i_gateway)
+ {
+ var room = HdlGatewayLogic.Current.GetRoomByGateway(i_gateway);
+ this.InitControl(i_caption, room);
+ }
+
+ /// <summary>
/// 鍒濆鍖栨帶浠�(閽堝鐨勬槸鍥炶矾)
/// </summary>
/// <param name="i_caption">鏍囬鏂囨湰</param>
@@ -161,23 +172,29 @@
var dicFloor = HdlRoomLogic.Current.GetFloorSortList();
if (dicFloor.Count == 0)
{
+ //绗竴浣嶉粯璁ゆ坊鍔犳湭鍒嗛厤
+ var listKeys = new List<string>() { "" };
+ var listName = new List<string>() { Language.StringByID(R.MyInternationalizationString.uUndistributed) };
+ //鎴块棿鍚嶅瓧鍜屼富閿敹闆�
var listRoom = HdlRoomLogic.Current.GetFloorSortRoom(string.Empty, false);
- if (listRoom.Count > 0)
+ foreach (var myRoom in listRoom)
{
- //鎴块棿鍚嶅瓧鍜屼富閿敹闆�
- var listName = new List<string>();
- var listKeys = new List<string>();
- foreach (var myRoom in listRoom)
- {
- listName.Add(myRoom.Name);
- listKeys.Add(myRoom.Id);
- }
- listRoomName.Add(listName);
- listRoomKeys.Add(listKeys);
+ listName.Add(myRoom.Name);
+ listKeys.Add(myRoom.Id);
}
+ listRoomName.Add(listName);
+ listRoomKeys.Add(listKeys);
}
else
{
+ //绗竴浣嶉粯璁ゆ坊鍔犳湭鍒嗛厤(鏈垎閰嶆斁鍦ㄦゼ灞傞偅涓彍鍗�)
+ var listKeys = new List<string>() { "" };
+ var listName = new List<string>() { "" };
+ listRoomName.Add(listName);
+ listRoomKeys.Add(listKeys);
+ this.listFloorKeys.Add("");
+ this.listFloorName.Add(Language.StringByID(R.MyInternationalizationString.uUndistributed));
+
foreach (string fKeys in dicFloor.Keys)
{
var listRoom = HdlRoomLogic.Current.GetFloorSortRoom(fKeys, false);
@@ -187,8 +204,8 @@
this.listFloorKeys.Add(fKeys);
this.listFloorName.Add(dicFloor[fKeys]);
//鎴块棿鍚嶅瓧鍜屼富閿敹闆�
- var listName = new List<string>();
- var listKeys = new List<string>();
+ listName = new List<string>();
+ listKeys = new List<string>();
foreach (var myRoom in listRoom)
{
listName.Add(myRoom.Name);
@@ -222,9 +239,16 @@
//鏃犳ゼ灞傛ā寮�
PickerView.Show(this.listRoomName[0], (value) =>
{
- //妤煎眰+鎴块棿
- txtView.Text = this.listRoomName[0][value];
RoomKey = this.listRoomKeys[0][value];
+ if (RoomKey != string.Empty)
+ {
+ //鎴块棿
+ txtView.Text = this.listRoomName[0][value];
+ }
+ else
+ {
+ txtView.Text = Language.StringByID(R.MyInternationalizationString.uDeviceNotAssignedRoom);
+ }
this.SelectRoomEvent?.Invoke(RoomKey);
}, index2, i_caption,
@@ -236,10 +260,17 @@
//鏈夋ゼ灞傛ā寮�
PickerView.ShowSecondary(this.listFloorName, this.listRoomName, (value1, value2) =>
{
- //妤煎眰+鎴块棿
- txtView.Text = this.listFloorName[value1] + " " + this.listRoomName[value1][value2];
FloorKey = this.listFloorKeys[value1];
RoomKey = this.listRoomKeys[value1][value2];
+ if (RoomKey != string.Empty)
+ {
+ //妤煎眰+鎴块棿
+ txtView.Text = this.listFloorName[value1] + " " + this.listRoomName[value1][value2];
+ }
+ else
+ {
+ txtView.Text = Language.StringByID(R.MyInternationalizationString.uDeviceNotAssignedRoom);
+ }
this.SelectRoomEvent?.Invoke(RoomKey);
}, index1, index2, i_caption,
--
Gitblit v1.8.0