From 23532fa8ad34c89b6d24b01eaef6475fd0aad898 Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期三, 15 四月 2020 18:08:24 +0800 Subject: [PATCH] ??????? --- ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs | 41 +++-------------------------------------- 1 files changed, 3 insertions(+), 38 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs index bb2ab6f..d97b76c 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs @@ -734,41 +734,6 @@ #endregion - #region 鈻� 瀛愭帶浠剁殑Y杞村潗鏍嘷___________________ - - /// <summary> - /// 鎸囧畾浣嶇疆绫诲瀷鑾峰彇Rowlayout鐨勫瓙鎺т欢鐨刌杞村潗鏍�(璇风‘淇濆瓙鎺т欢涓嶅ぇ浜庣埗瀹瑰櫒) - /// </summary> - /// <param name="fatherCtrHeight">鐖舵帶浠剁殑鐪熷疄楂樺害</param> - /// <param name="ctrHeight">瀛愭帶浠剁殑鐪熷疄楂樺害</param> - /// <param name="alignment">浣嶇疆瀵归綈鏂瑰紡</param> - /// <param name="Space">涓婁笅闂寸殑绌虹櫧闂磋窛,鐪佺暐鏃讹紝鍙栬鎺т欢鍏遍�氬彉閲忕殑鍊笺�傝缃负-1鏃讹紝涓嶈绠楃┖鐧介棿璺�</param> - /// <returns></returns> - public static int GetControlChidrenYaxis(int fatherCtrHeight, int ctrHeight, UViewAlignment alignment, int Space = 0) - { - if (Space < 0) - { - //涓嶈绠楅棿璺濆�� - Space = 0; - } - - if (alignment == UViewAlignment.Center) - { - return fatherCtrHeight / 2 - ctrHeight / 2; - } - else if (alignment == UViewAlignment.Top) - { - return (fatherCtrHeight / 2 - Space / 2) / 2 - ctrHeight / 2; - } - else - { - int top = fatherCtrHeight / 2 + Space / 2; - return top + (fatherCtrHeight - top) / 2 - ctrHeight / 2; - } - } - - #endregion - #region 鈻� 鎷兼帴淇℃伅___________________________ /// <summary> @@ -918,14 +883,14 @@ //鍒濆鍖栨湰鍦扮殑璁惧淇℃伅 Common.LocalDevice.Current.ReFreshByLocal(); + //鍒濆鍖栨埧闂�(閮洩鍩庨偅杈逛笉鍋氬鐞�,闇�瑕佽繖閲岀壒娈婃墽琛屼竴姝�) + HdlRoomLogic.Current.RefreshAllRoomByLocation(); + if (hadNet == true) { //鍚屾浜戠鐨勭綉鍏砳d锛屽鏋滄湰鍦版嫢鏈変簯绔笉瀛樺湪鐨刬d锛屽垯琛ㄧず搴旇琚崲缁戜簡锛岀洿鎺ュ垹闄� HdlGatewayLogic.Current.SynchronizeDbGateway(); } - - //鍒濆鍖栨埧闂�(閮洩鍩庨偅杈逛笉鍋氬鐞�,闇�瑕佽繖閲岀壒娈婃墽琛屼竴姝�) - HdlRoomLogic.Current.RefreshAllRoomByLocation(); //鍒锋柊APP鍓嶄竴娆¢�夋嫨鐨勭綉鍏矷D(鍙互鍙嶅璋冪敤,闇�瑕佸湪缃戝叧鍒濆鍖栧畬浜嗕箣鍚庢墠鑳借皟鐢�) HdlGatewayLogic.Current.RefreshAppOldSelectGatewayId(); -- Gitblit v1.8.0