From 43110ef19b9e69d5afd7ce0a978565786baa87b5 Mon Sep 17 00:00:00 2001
From: lss <lsc@hdlchina.com.cn>
Date: 星期三, 27 四月 2022 14:13:53 +0800
Subject: [PATCH] 修复红米手机闪退问题
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/SceneControls/SceneRoomControl.cs | 188 +++++++++++++++++++++++-----------------------
1 files changed, 94 insertions(+), 94 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/SceneControls/SceneRoomControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/SceneControls/SceneRoomControl.cs
old mode 100755
new mode 100644
index f9d213d..afd04bb
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/SceneControls/SceneRoomControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/SceneControls/SceneRoomControl.cs
@@ -1,94 +1,94 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Shared.Phone.UserCenter
-{
- /// <summary>
- /// 鍋氭垚涓�涓満鏅�+鎴块棿鐨勮鎺т欢
- /// </summary>
- public class SceneRoomControl : RowLayoutControl
- {
- #region 鈻� 鍙橀噺澹版槑___________________________
-
- /// <summary>
- /// 鍦烘櫙ID
- /// </summary>
- private int SceneId = 0;
- /// <summary>
- /// 鍦烘櫙鍚嶅瓧
- /// </summary>
- private string SceneName = string.Empty;
- /// <summary>
- /// 鍦烘櫙
- /// </summary>
- public Common.SceneUI Scene
- {
- get
- {
- return HdlSceneLogic.Current.GetSceneUIBySceneId(SceneId);
- }
- }
-
- #endregion
-
- #region 鈻� 鍒濆鍖朹____________________________
-
- /// <summary>
- /// 鍋氭垚涓�涓満鏅�+鎴块棿鐨勮鎺т欢
- /// </summary>
- /// <param name="i_SceneId">鍦烘櫙ID</param>
- /// <param name="i_SceneName">鍦烘櫙鍚�</param>
- /// <param name="i_chidrenYaxis">瀛愭帶浠禮杞村亸绉婚噺(鐪熷疄鍊�,鏈変簺鐣岄潰闇�瑕佽繖绉嶇壒娈婃搷浣�)</param>
- public SceneRoomControl(int i_SceneId, string i_SceneName, int i_chidrenYaxis) : base(i_chidrenYaxis)
- {
- this.SceneId = i_SceneId;
- this.SceneName = i_SceneName;
-
- var sceneTemp = this.Scene;
- if (sceneTemp != null && string.IsNullOrEmpty(i_SceneName) == false)
- {
- sceneTemp.Name = i_SceneName;
- }
- }
-
- /// <summary>
- /// 鍒濆鍖栧唴閮ㄦ帶浠�
- /// </summary>
- public void InitControl()
- {
- //鍥炬爣
- var btnIcon = frameTable.AddLeftIcon(81);
- btnIcon.UnSelectedImagePath = "Scene/SceneIcon.png";
-
- //鍦烘櫙
- var btnSceneName = frameTable.AddLeftCaption(this.SceneName, 600, 60);
- btnSceneName.TextSize = 15;
- //杩欎釜鍧愭爣鏈夌偣鐗规畩
- btnSceneName.Y = Application.GetRealHeight(12) + this.chidrenYaxis;
- frameTable.AddChidren(btnSceneName, ChidrenBindMode.BindEventOnly);
-
- //鎴块棿
- var btnRoom = frameTable.AddLeftCaption("", 600, 50, true);
- //杩欎釜鍧愭爣鏈夌偣鐗规畩
- btnRoom.Y = Application.GetRealHeight(72) + this.chidrenYaxis;
- btnRoom.TextSize = 12;
- btnRoom.TextColor = UserCenterColor.Current.TextGrayColor1;
- frameTable.AddChidren(btnRoom, ChidrenBindMode.BindEventOnly);
-
- var room = HdlRoomLogic.Current.GetRoomBySceneId(this.SceneId);
- if (room != null)
- {
- btnRoom.Text = room.Name;
- }
- else
- {
- //鏈垎閰嶅尯鍩�
- btnRoom.Text = Language.StringByID(R.MyInternationalizationString.uDeviceNotAssignedRoom);
- }
-
- }
-
- #endregion
- }
-}
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Shared.Phone.UserCenter
+{
+ /// <summary>
+ /// 鍋氭垚涓�涓満鏅�+鎴块棿鐨勮鎺т欢
+ /// </summary>
+ public class SceneRoomControl : RowLayoutControl
+ {
+ #region 鈻� 鍙橀噺澹版槑___________________________
+
+ /// <summary>
+ /// 鍦烘櫙ID
+ /// </summary>
+ private int SceneId = 0;
+ /// <summary>
+ /// 鍦烘櫙鍚嶅瓧
+ /// </summary>
+ private string SceneName = string.Empty;
+ /// <summary>
+ /// 鍦烘櫙
+ /// </summary>
+ public Common.SceneUI Scene
+ {
+ get
+ {
+ return HdlSceneLogic.Current.GetSceneUIBySceneId(SceneId);
+ }
+ }
+
+ #endregion
+
+ #region 鈻� 鍒濆鍖朹____________________________
+
+ /// <summary>
+ /// 鍋氭垚涓�涓満鏅�+鎴块棿鐨勮鎺т欢
+ /// </summary>
+ /// <param name="i_SceneId">鍦烘櫙ID</param>
+ /// <param name="i_SceneName">鍦烘櫙鍚�</param>
+ /// <param name="i_chidrenYaxis">瀛愭帶浠禮杞村亸绉婚噺(銆愬垪琛ㄦ帶浠剁殑rowSpace/2銆戝嵆鍙�,涓嶆噦榛樿涓�0鍗冲彲)</param>
+ public SceneRoomControl(int i_SceneId, string i_SceneName, int i_chidrenYaxis) : base(i_chidrenYaxis)
+ {
+ this.SceneId = i_SceneId;
+ this.SceneName = i_SceneName;
+
+ var sceneTemp = this.Scene;
+ if (sceneTemp != null && string.IsNullOrEmpty(i_SceneName) == false)
+ {
+ sceneTemp.Name = i_SceneName;
+ }
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栧唴閮ㄦ帶浠�
+ /// </summary>
+ public void InitControl()
+ {
+ //鍥炬爣
+ var btnIcon = frameTable.AddLeftIcon(81);
+ btnIcon.UnSelectedImagePath = "Scene/SceneIcon.png";
+
+ //鍦烘櫙
+ var btnSceneName = frameTable.AddLeftCaption(this.SceneName, 600, 60);
+ btnSceneName.TextSize = 15;
+ //杩欎釜鍧愭爣鏈夌偣鐗规畩
+ btnSceneName.Y = Application.GetRealHeight(12) + this.chidrenYaxis;
+ frameTable.AddChidren(btnSceneName, ChidrenBindMode.BindEvent);
+
+ //鎴块棿
+ var btnRoom = frameTable.AddLeftCaption("", 600, 50, true);
+ //杩欎釜鍧愭爣鏈夌偣鐗规畩
+ btnRoom.Y = Application.GetRealHeight(72) + this.chidrenYaxis;
+ btnRoom.TextSize = 12;
+ btnRoom.TextColor = UserCenterColor.Current.TextGrayColor1;
+ frameTable.AddChidren(btnRoom, ChidrenBindMode.BindEvent);
+
+ var room = HdlRoomLogic.Current.GetRoomBySceneId(this.SceneId);
+ if (room != null)
+ {
+ btnRoom.Text = HdlRoomLogic.Current.GetRoomName(room);
+ }
+ else
+ {
+ //鏈垎閰嶅尯鍩�
+ btnRoom.Text = Language.StringByID(R.MyInternationalizationString.uDeviceNotAssignedRoom);
+ }
+
+ }
+
+ #endregion
+ }
+}
--
Gitblit v1.8.0