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 | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserView/UserPage.cs b/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
index 4ef083c..09ae903 100755
--- a/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
@@ -72,8 +72,14 @@
public UserPage()
{
BackgroundColor = Shared.Common.ZigbeeColor.Current.MainColor;
- //娣诲姞App鐨勭粡绾害涓婃姤浜嬩欢
- HdlOtherFunctionLogic.Current.AddAppLatAndLonEvent();
+ 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(out_lng.ToString(), out_lat.ToString());
+ };
}
/// <summary>
@@ -94,18 +100,18 @@
#endif
//鐢ㄦ埛涓讳綋鐣岄潰锛堜腑闂撮儴鍒嗭級
this.bodyFrameView = new NormalFrameLayout();
- bodyFrameView.Height = this.Height - HdlControlResourse.BottomFrameHeight;
+ bodyFrameView.Height = this.Height - UserCenter.ControlCommonResourse.BottomFrameHeight;
bodyFrameView.BackgroundColor = Shared.Common.ZigbeeColor.Current.MainColor;
this.AddChidren(bodyFrameView);
//鐢ㄦ埛鑿滃崟鐣岄潰锛堝簳閮ㄩ儴鍒嗭級
var bottomMenuFrame = new FrameLayout();
bottomMenuFrame.Gravity = Gravity.BottomCenter;
- bottomMenuFrame.Height = HdlControlResourse.BottomFrameHeight;
+ bottomMenuFrame.Height = ControlCommonResourse.BottomFrameHeight;
bottomMenuFrame.BackgroundColor = Shared.Common.ZigbeeColor.Current.GXCBottomColor;
this.AddChidren(bottomMenuFrame);
//搴曢儴鑿滃崟鐨勫ご閮ㄧ嚎
- var bottomLine = new NormalViewControl(bottomMenuFrame.Width, HdlControlResourse.BottomLineHeight, false);
+ var bottomLine = new NormalViewControl(bottomMenuFrame.Width, ControlCommonResourse.BottomLineHeight, false);
bottomLine.BackgroundColor = 0xffc8c8c9;
bottomMenuFrame.AddChidren(bottomLine);
@@ -347,9 +353,9 @@
public void ShowCategoryAutoListForm()
{
//鍏抽棴鍏ㄩ儴鐣岄潰,鐩村埌涓婚〉涓烘
- HdlFormLogic.Current.CloseAllOpenForm(null, false);
+ UserCenterLogic.CloseAllOpenForm(null, false);
//寮哄埗鏄剧ず鑷姩鍖栧垪琛ㄧ晫闈�
- HdlUserCenterResourse.ResidenceOption.CategoryPageSwitchIndex = 2;
+ UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex = 2;
this.nowSelectMenu = MenuSelectEnum.A鍒嗙被;
--
Gitblit v1.8.0