From 136b9e2fc48249a5ff89874f1080ba94130e7a9e Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 19 五月 2020 11:12:29 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into dev-2020xm
---
ZigbeeApp/Shared/Phone/MainPage/ControlForm/Base/DeviceDetailCardCommonForm.cs | 43 +++++++++++++++++++++++++++++--------------
1 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/Base/DeviceDetailCardCommonForm.cs b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/Base/DeviceDetailCardCommonForm.cs
index a118bf0..d73a1b9 100644
--- a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/Base/DeviceDetailCardCommonForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/Base/DeviceDetailCardCommonForm.cs
@@ -16,15 +16,15 @@
/// <summary>
/// 鐣岄潰鍏抽棴浜嬩欢
/// </summary>
- public Action<CommonDevice, Common.Room> FormCloseEvent = null;
+ public Action<CommonDevice> FormCloseEvent = null;
/// <summary>
/// 璁惧瀵硅薄
/// </summary>
public CommonDevice device = null;
/// <summary>
- /// 鎴块棿瀵硅薄
+ /// 褰撳墠閫夋嫨鐨勬埧闂村璞�(鍐嶆鍒锋柊鐣岄潰鏃�,杩欎釜涓滆タ鏈夊彲鑳芥槸null)
/// </summary>
- public Common.Room room = null;
+ public Common.Room nowSelectRoom = null;
/// <summary>
/// 鐘舵�佹帶浠�
/// </summary>
@@ -66,13 +66,13 @@
/// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
/// </summary>
/// <param name="i_device">璁惧瀵硅薄</param>
- /// <param name="i_room">鎴块棿</param>
+ /// <param name="i_nowSelectRoom">鎴块棿</param>
/// <param name="i_backWidth">鐧借壊鑳屾櫙鐨勫搴�(闈炵湡瀹炲��)</param>
/// <param name="i_backHeight">鐧借壊鑳屾櫙鐨勯珮搴�(闈炵湡瀹炲��)</param>
- public void ShowForm(CommonDevice i_device, Common.Room i_room, int i_backWidth, int i_backHeight)
+ public void ShowForm(CommonDevice i_device, Common.Room i_nowSelectRoom, int i_backWidth, int i_backHeight)
{
this.CurrentText = Language.StringByID(R.MyInternationalizationString.Current) + " ";
- this.room = i_room;
+ this.nowSelectRoom = i_nowSelectRoom;
this.backFrameWidth = i_backWidth;
this.backFrameHeight = i_backHeight;
@@ -84,7 +84,7 @@
btnMore.ButtonClickEvent += (sender, e) =>
{
var detailInfo = new DeviceDetailInfoForm();
- detailInfo.AddForm(device, room);
+ detailInfo.AddForm(device, nowSelectRoom);
};
//鍒濆鍖栦腑閮ㄤ俊鎭�
@@ -166,7 +166,15 @@
btnRoomName.TextSize = 12;
btnRoomName.TextColor = UserCenterColor.Current.White;
btnRoomName.Gravity = Gravity.CenterVertical;
- btnRoomName.Text = this.room.Name;
+ if (this.nowSelectRoom != null)
+ {
+ btnRoomName.Text = this.nowSelectRoom.Name;
+ }
+ else
+ {
+ //鏈垎閰�
+ btnRoomName.TextID = R.MyInternationalizationString.uDeviceNotAssignedRoom;
+ }
frameRoomBlack.AddChidren(btnRoomName);
//鏀惰棌
@@ -328,9 +336,9 @@
public override int FormActionAgainEvent()
{
//濡傛灉涓嶆槸鍠滅埍鎴块棿鐨勮瘽,瀹冪殑鎴块棿鏈夊彲鑳借鍒囨崲浜�
- if (this.room.IsLove == false)
+ if (this.nowSelectRoom == null || this.nowSelectRoom.IsLove == false)
{
- this.room = HdlRoomLogic.Current.GetRoomByDevice(this.device);
+ this.nowSelectRoom = HdlRoomLogic.Current.GetRoomByDevice(this.device);
}
//濡傛灉鍔熻兘绫诲瀷鍙樻洿浜�
if (this.nowDeviceFuncType != this.device.DfunctionType)
@@ -344,8 +352,15 @@
this.btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceEpointName(this.device);
btnDeviceName.Width = btnDeviceName.GetRealWidthByText();
btnDeviceName.Gravity = Gravity.CenterHorizontal;
-
- this.btnRoomName.Text = this.room.Name;
+ if (this.nowSelectRoom == null)
+ {
+ //鏈垎閰�
+ this.btnRoomName.TextID = R.MyInternationalizationString.uDeviceNotAssignedRoom;
+ }
+ else
+ {
+ this.btnRoomName.Text = this.nowSelectRoom.Name;
+ }
}
return 1;
@@ -365,7 +380,7 @@
HdlGatewayReceiveLogic.Current.RemoveEvent("DeviceDetailCardAttribute" + mainKeys);
//鍥炶皟鍑芥暟
- this.FormCloseEvent?.Invoke(this.device, this.room);
+ this.FormCloseEvent?.Invoke(this.device);
this.FormCloseEvent = null;
base.CloseFormBefore();
@@ -389,7 +404,7 @@
/// </summary>
/// <param name="text"></param>
public void SetPmTwoPointFiveStatuText(string text)
- {
+ {
this.btnStatu.Text = text;
}
--
Gitblit v1.8.0