From 5428935270159bfc42c2934ed7fb1091554fc9a4 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 09 七月 2020 17:12:42 +0800
Subject: [PATCH] 修改了 sokect
---
ZigbeeApp/Shared/Phone/UserView/UserPage.cs | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserView/UserPage.cs b/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
index f143967..a2fb881 100755
--- a/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
@@ -40,7 +40,7 @@
/// <summary>
/// 鐢ㄦ埛涓讳綋鐣岄潰锛堜腑闂撮儴鍒嗭級
/// </summary>
- private FrameLayout bodyFrameView = null;
+ private NormalFrameLayout bodyFrameView = null;
/// <summary>
/// 鐣岄潰缂撳瓨(2020.05.07:鍒囨崲鏃朵笉绉婚櫎鐣岄潰,鐩存帴闅愯棌)
/// </summary>
@@ -66,6 +66,7 @@
BackgroundColor = Shared.Common.ZigbeeColor.Current.MainColor;
Shared.Application.LocationAction += (lon, lat) =>
{
+ //涓婃姤缁忕含搴�
Login.AccountLogic.Instance.ReceiveAppLatAndLon(lon.ToString(), lat.ToString());
};
}
@@ -80,14 +81,14 @@
return;
}
#if iOS
- if (Shared.Application.PhoneType >= 10)
+ if (Shared.Application.IsFullScreen == true)
{
//楂樼増鏈殑鑻规灉鏈哄瀷锛屽睆骞曞簳閮ㄤ細鏈変竴涓粦鑹茬殑鏉�
ControlCommonResourse.BottomFrameHeight = Application.GetRealHeight(242);
}
#endif
//鐢ㄦ埛涓讳綋鐣岄潰锛堜腑闂撮儴鍒嗭級
- this.bodyFrameView = new FrameLayout();
+ this.bodyFrameView = new NormalFrameLayout();
bodyFrameView.Height = this.Height - UserCenter.ControlCommonResourse.BottomFrameHeight;
bodyFrameView.BackgroundColor = Shared.Common.ZigbeeColor.Current.MainColor;
this.AddChidren(bodyFrameView);
@@ -351,6 +352,21 @@
this.SetAllControlStatu();
}
+ /// <summary>
+ /// 鑾峰彇褰撳墠婵�娲荤殑鐣岄潰
+ /// </summary>
+ /// <returns></returns>
+ public EditorCommonForm GetNowActionForm()
+ {
+ int index = ((int)this.nowSelectMenu) - 1;
+ if (index != -1)
+ {
+ //璋冪敤姝ょ晫闈㈢殑婵�娲诲嚱鏁�
+ return this.listForm[index];
+ }
+ return null;
+ }
+
#endregion
#region 鈻� 缁撴瀯浣揰____________________________
--
Gitblit v1.8.0