From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/UserView/UserPage.cs | 40 +++++++++++++++++++++++++++++++++-------
1 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserView/UserPage.cs b/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
index 86a34af..09ae903 100755
--- a/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
@@ -52,7 +52,15 @@
/// <summary>
/// 濡傛灉璁剧疆姝ゅ彉閲忎负true,鍒欏湪鍗曞嚮搴曢儴鑿滃崟鏃�,寮哄埗鏃犳潯浠跺叏閮ㄥ埛鏂�
/// </summary>
- public bool RefreshForm = false;
+ public bool RefreshAllForm = false;
+ /// <summary>
+ /// 鍒锋柊涓婚〉
+ /// </summary>
+ public bool RefreshMainPageForm = false;
+ /// <summary>
+ /// 鍒锋柊鍒嗙被
+ /// </summary>
+ public bool RefreshCategoryForm = false;
#endregion
@@ -66,7 +74,11 @@
BackgroundColor = Shared.Common.ZigbeeColor.Current.MainColor;
Shared.Application.LocationAction += (lon, lat) =>
{
- Login.AccountLogic.Instance.ReceiveAppLatAndLon(lon.ToString(), lat.ToString());
+ //GPS鍧愭爣杞垚楂樺痉鍧愭爣
+ double out_lng, out_lat;
+ HdlGpsLocationConvertLogic.Current.WGS84_to_GCJ02(lon, lat, out out_lng, out out_lat);
+ //涓婃姤缁忕含搴�
+ Login.AccountLogic.Instance.ReceiveAppLatAndLon(out_lng.ToString(), out_lat.ToString());
};
}
@@ -83,7 +95,7 @@
if (Shared.Application.IsFullScreen == true)
{
//楂樼増鏈殑鑻规灉鏈哄瀷锛屽睆骞曞簳閮ㄤ細鏈変竴涓粦鑹茬殑鏉�
- ControlCommonResourse.BottomFrameHeight = Application.GetRealHeight(242);
+ ControlCommonResourse.BottomFrameHeight = Application.GetRealHeight(180);
}
#endif
//鐢ㄦ埛涓讳綋鐣岄潰锛堜腑闂撮儴鍒嗭級
@@ -229,20 +241,20 @@
/// <param name="handClick">鏄惁鏄墜鍔ㄧ偣鍑�</param>
private void BottomMenuClickEvent(MenuSelectEnum selectEnum, bool handClick)
{
- if (this.RefreshForm == false && selectEnum == this.nowSelectMenu && handClick == true)
+ if (this.RefreshAllForm == false && selectEnum == this.nowSelectMenu && handClick == true)
{
//鎵嬪姩鐐瑰嚮鍚屼竴涓彍鍗�,鍒欎笉鍋氬鐞�
return;
}
//濡傛灉寮哄埗鎸囧畾鍒锋柊鐣岄潰鐨勮瘽
- if (this.RefreshForm == true)
+ if (this.RefreshAllForm == true)
{
//鍏ㄩ儴鍒锋柊
this.listForm = new List<EditorCommonForm>() { null, null, null };
this.bodyFrameView.RemoveAll();
- this.RefreshForm = false;
+ this.RefreshAllForm = false;
}
this.nowSelectMenu = selectEnum;
@@ -252,6 +264,13 @@
{
//宸︽粦鑿滃崟鍙�
CommonPage.Instance.IsDrawerLockMode = false;
+ if (this.RefreshMainPageForm == true)
+ {
+ //鍒锋柊涓婚〉
+ listForm[0]?.CloseForm();
+ listForm[0] = null;
+ this.RefreshMainPageForm = false;
+ }
if (listForm[0] == null)
{
var form = new MainPage.HomeMainPageForm();
@@ -265,6 +284,13 @@
{
//宸︽粦鑿滃崟涓嶅彲
CommonPage.Instance.IsDrawerLockMode = true;
+ if (this.RefreshCategoryForm == true)
+ {
+ //鍒锋柊鍒嗙被
+ listForm[1]?.CloseForm();
+ listForm[1] = null;
+ this.RefreshCategoryForm = false;
+ }
if (listForm[1] == null)
{
var form = new Category.CategoryMainForm();
@@ -327,7 +353,7 @@
public void ShowCategoryAutoListForm()
{
//鍏抽棴鍏ㄩ儴鐣岄潰,鐩村埌涓婚〉涓烘
- UserCenterLogic.CloseAllOpenForm();
+ UserCenterLogic.CloseAllOpenForm(null, false);
//寮哄埗鏄剧ず鑷姩鍖栧垪琛ㄧ晫闈�
UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex = 2;
--
Gitblit v1.8.0