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 | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserView/UserPage.cs b/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
index c7009e5..09ae903 100755
--- a/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
@@ -74,8 +74,11 @@
BackgroundColor = Shared.Common.ZigbeeColor.Current.MainColor;
Shared.Application.LocationAction += (lon, lat) =>
{
+ //GPS鍧愭爣杞垚楂樺痉鍧愭爣
+ double out_lng, out_lat;
+ HdlGpsLocationConvertLogic.Current.WGS84_to_GCJ02(lon, lat, out out_lng, out out_lat);
//涓婃姤缁忕含搴�
- Login.AccountLogic.Instance.ReceiveAppLatAndLon(lon.ToString(), lat.ToString());
+ Login.AccountLogic.Instance.ReceiveAppLatAndLon(out_lng.ToString(), out_lat.ToString());
};
}
@@ -92,7 +95,7 @@
if (Shared.Application.IsFullScreen == true)
{
//楂樼増鏈殑鑻规灉鏈哄瀷锛屽睆骞曞簳閮ㄤ細鏈変竴涓粦鑹茬殑鏉�
- ControlCommonResourse.BottomFrameHeight = Application.GetRealHeight(242);
+ ControlCommonResourse.BottomFrameHeight = Application.GetRealHeight(180);
}
#endif
//鐢ㄦ埛涓讳綋鐣岄潰锛堜腑闂撮儴鍒嗭級
@@ -350,7 +353,7 @@
public void ShowCategoryAutoListForm()
{
//鍏抽棴鍏ㄩ儴鐣岄潰,鐩村埌涓婚〉涓烘
- UserCenterLogic.CloseAllOpenForm();
+ UserCenterLogic.CloseAllOpenForm(null, false);
//寮哄埗鏄剧ず鑷姩鍖栧垪琛ㄧ晫闈�
UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex = 2;
--
Gitblit v1.8.0