From eb5a57942bae8eb57fd7fb61124c247bebb67e8e Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 19 六月 2020 10:18:28 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into dev-2020xm
---
Home0618/Shared/Phone/UserCenter/Device/Bind/PaneTargetsBaseForm.cs | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Home0618/Shared/Phone/UserCenter/Device/Bind/PaneTargetsBaseForm.cs b/Home0618/Shared/Phone/UserCenter/Device/Bind/PaneTargetsBaseForm.cs
index 9243056..d7e25e7 100755
--- a/Home0618/Shared/Phone/UserCenter/Device/Bind/PaneTargetsBaseForm.cs
+++ b/Home0618/Shared/Phone/UserCenter/Device/Bind/PaneTargetsBaseForm.cs
@@ -28,7 +28,7 @@
}
#endregion
- #region 鍙橀噺鐢虫槑
+ #region 鍙橀噺鐢虫槑
/// <summary>
/// 鎺у埗璁惧
/// </summary>
@@ -40,7 +40,7 @@
/// <summary>
/// 鏄剧ず琚粦瀹氳澶囨垨鍦烘櫙鐨剉iew
/// </summary>
- VerticalFrameRefreshControl midVerticalScrolViewLayout;
+ VerticalRefreshLayout midVerticalScrolViewLayout;
/// <summary>
/// 鏄剧ず鎴块棿鐨剉iew
/// </summary>
@@ -133,7 +133,7 @@
#endregion
- #region UI璁捐
+ #region UI璁捐
/// <summary>
/// 鐩爣椤垫樉绀�
/// </summary>
@@ -142,7 +142,7 @@
TitleUI();
//鏍囬鏍忎笅鐨刄I
MidFrameLayoutContent();
- //鍒濆鍖栬澶囨暟鎹�
+ //鍒濆鍖栬澶囨暟鎹�
InitData();
}
@@ -200,7 +200,7 @@
btnMidTopLayout.AddChidren(btnHorizontalScrolViewLayout);
//璁惧鏍�
- midVerticalScrolViewLayout = new VerticalFrameRefreshControl()
+ midVerticalScrolViewLayout = new VerticalRefreshLayout()
{
Y = btnMidTopLayout.Bottom,
Height = Application.GetRealHeight(1145),
@@ -742,7 +742,7 @@
ChooseFloorAction += (floorId, btnMethodText) =>
{
btnFloorText.Text = dicFloorList[floorId];
- //鑾峰彇妤煎眰涓埧闂村垪琛�
+ //鑾峰彇妤煎眰涓埧闂村垪琛�
supportRoomList = BindInfo.GetFloorRoomList();
//鑾峰彇鏈湴鏈垎閰嶇殑鏀寔褰撳墠绫诲瀷鐨勭粦瀹氳澶囧垪琛�
undistruibuteDevList = BindInfo.GetUndistributeDeviceList(undistruibuteDevList, curDeviceBindType);
@@ -768,7 +768,7 @@
{
foreach (var dev in targetList)
{
- //鑾峰彇鏈湴璁惧鍒楄〃
+ //鑾峰彇鏈湴璁惧鍒楄〃
var localDeviceList = Shared.Common.LocalDevice.Current.listAllDevice;
var tempDev = localDeviceList.Find(obj => obj.DeviceAddr == dev.DeviceAddr && obj.DeviceEpoint == dev.DeviceEpoint);
if (tempDev != null)
@@ -1450,7 +1450,7 @@
{
return;
}
- //鑾峰彇鏈湴璁惧鍒楄〃
+ //鑾峰彇鏈湴璁惧鍒楄〃
var localDeviceList = Shared.Common.LocalDevice.Current.listAllDevice;
var tempDev = localDeviceList.Find(obj => obj.DeviceAddr == bindDev.DeviceAddr && obj.DeviceEpoint == bindDev.DeviceEpoint);
if (tempDev != null)
--
Gitblit v1.8.0