From d87400af518ebc9274f4447f06476959c3aa5102 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 14 七月 2020 16:29:42 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into dev-2020xm
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs
old mode 100755
new mode 100644
index 5c66c54..e96f1f3
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs
@@ -17,9 +17,13 @@
/// </summary>
public Action FloorAction = null;
/// <summary>
- /// 閫変腑鐨勬ゼ灞傚洖璋僛
+ /// 閫変腑鐨勬ゼ灞傚洖璋�
/// </summary>
public Action<string, Button> ChooseFloorAction = null;
+ /// <summary>
+ /// 閲嶆柊鍔犺浇
+ /// </summary>
+ public Action ReLoadAction = null;
public FrameLayout topFrameLayout = new FrameLayout { Height = Application.GetRealHeight(184), BackgroundColor = ZigbeeColor.Current.XMTopFrameLayout };
public FrameLayout midFrameLayout = new FrameLayout { Height = Application.GetRealHeight(1925 - 184), BackgroundColor = ZigbeeColor.Current.XMMidFrameLayout };
@@ -95,7 +99,7 @@
btnTitle.Text = titleText;
}
/// <summary>
- /// 闂ㄩ攣涓儴甯冨眬
+ /// 涓儴甯冨眬
/// </summary>
/// <param name="frameLayout"></param>
public void MidFrameLayout(FrameLayout frameLayout)
@@ -106,7 +110,7 @@
}
/// <summary>
- /// 闂ㄩ攣搴曢儴甯冨眬
+ /// 搴曢儴甯冨眬
/// </summary>
/// <param name="frameLayout"></param>
public void BottomFrameLayout(FrameLayout frameLayout)
@@ -120,9 +124,31 @@
this.midFrameLayout.AddChidren(bottomFrameLayout1);
}
+ /// <summary>
+ /// 鏄剧ず閲嶆柊鍔犺浇鐨勭晫闈�(涓昏鏄敤鍦ㄧ晫闈㈠姞杞介敊璇椂锛屽啀娆″姞杞�)
+ /// </summary>
+ public void ShowReLoadView()
+ {
+ var frame = new FrameLayout();
+ frame.BackgroundColor = UserCenterColor.Current.White;
+ frame.Tag = "ReLoadView";
+ this.midFrameLayout.AddChidren(frame);
+
+ //閲嶆柊鍔犺浇
+ var btnReLoad = new BottomClickButton();
+ btnReLoad.Gravity = Gravity.Center;
+ btnReLoad.TextID = R.MyInternationalizationString.uDoReload;
+ frame.AddChidren(btnReLoad);
+ btnReLoad.ButtonClickEvent += (sender, e) =>
+ {
+ ReLoadAction?.Invoke();
+ ReLoadAction = null;
+ };
+ }
+
/// <summary>
/// 娣诲姞妤煎眰UI
- /// </summary>
+ /// </summary>
public void BindDownFrameLayout(FrameLayout frameLayout, Panel curControlDev, Dictionary<string, string> dicFloorList, ref Button btnFloorText)
{
var btnAddFrameLayout = new FrameLayout
@@ -134,7 +160,6 @@
btnFloorText = new Button
{
Width = Application.GetRealWidth(300 - 69 - 58),
- Text = Language.StringByID(R.MyInternationalizationString.FirstFloor),
TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
TextSize = 14,
IsBold = true,
@@ -317,4 +342,4 @@
}
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0