From dc0309e64f02227d8e1468b7326c07955f804612 Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期三, 22 六月 2022 11:22:18 +0800
Subject: [PATCH] 修改引用路径
---
ZigbeeApp/Shared/Phone/UserView/UserPage.cs | 115 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 94 insertions(+), 21 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserView/UserPage.cs b/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
old mode 100644
new mode 100755
index f0f4d8d..09ae903
--- 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>
@@ -49,6 +49,18 @@
/// 鎺т欢缂撳瓨(鐪嬩笉鎳傜殑璇�,涓嶈鍔ㄥ畠)
/// </summary>
private List<ButtonBase> listButton = new List<ButtonBase>();
+ /// <summary>
+ /// 濡傛灉璁剧疆姝ゅ彉閲忎负true,鍒欏湪鍗曞嚮搴曢儴鑿滃崟鏃�,寮哄埗鏃犳潯浠跺叏閮ㄥ埛鏂�
+ /// </summary>
+ public bool RefreshAllForm = false;
+ /// <summary>
+ /// 鍒锋柊涓婚〉
+ /// </summary>
+ public bool RefreshMainPageForm = false;
+ /// <summary>
+ /// 鍒锋柊鍒嗙被
+ /// </summary>
+ public bool RefreshCategoryForm = false;
#endregion
@@ -62,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());
};
}
@@ -76,14 +92,14 @@
return;
}
#if iOS
- if (Shared.Application.PhoneType >= 10)
- {
- //楂樼増鏈殑鑻规灉鏈哄瀷锛屽睆骞曞簳閮ㄤ細鏈変竴涓粦鑹茬殑鏉�
- ControlCommonResourse.BottomFrameHeight = Application.GetRealHeight(242);
+ if (Shared.Application.IsFullScreen == true)
+ {
+ //楂樼増鏈殑鑻规灉鏈哄瀷锛屽睆骞曞簳閮ㄤ細鏈変竴涓粦鑹茬殑鏉�
+ ControlCommonResourse.BottomFrameHeight = Application.GetRealHeight(180);
}
#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);
@@ -214,10 +230,10 @@
this.BottomMenuClickEvent(MenuSelectEnum.A涓婚〉, false);
}
-#endregion
+ #endregion
-#region 鈻� 涓�鑸柟娉昣__________________________
-
+ #region 鈻� 涓�鑸柟娉昣__________________________
+
/// <summary>
/// 搴曢儴鑿滃崟鐨勭偣鍑讳簨浠�
/// </summary>
@@ -225,11 +241,22 @@
/// <param name="handClick">鏄惁鏄墜鍔ㄧ偣鍑�</param>
private void BottomMenuClickEvent(MenuSelectEnum selectEnum, bool handClick)
{
- if (selectEnum == this.nowSelectMenu && handClick == true)
+ if (this.RefreshAllForm == false && selectEnum == this.nowSelectMenu && handClick == true)
{
//鎵嬪姩鐐瑰嚮鍚屼竴涓彍鍗�,鍒欎笉鍋氬鐞�
return;
}
+
+ //濡傛灉寮哄埗鎸囧畾鍒锋柊鐣岄潰鐨勮瘽
+ if (this.RefreshAllForm == true)
+ {
+ //鍏ㄩ儴鍒锋柊
+ this.listForm = new List<EditorCommonForm>() { null, null, null };
+ this.bodyFrameView.RemoveAll();
+
+ this.RefreshAllForm = false;
+ }
+
this.nowSelectMenu = selectEnum;
//涓婚〉
@@ -237,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();
@@ -250,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();
@@ -312,17 +353,49 @@
public void ShowCategoryAutoListForm()
{
//鍏抽棴鍏ㄩ儴鐣岄潰,鐩村埌涓婚〉涓烘
- UserCenterLogic.CloseAllOpenForm();
+ UserCenterLogic.CloseAllOpenForm(null, false);
//寮哄埗鏄剧ず鑷姩鍖栧垪琛ㄧ晫闈�
- UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex = 2;
-
- this.BottomMenuClickEvent(MenuSelectEnum.A鍒嗙被, false);
+ UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex = 2;
+
+ this.nowSelectMenu = MenuSelectEnum.A鍒嗙被;
+
+ //宸︽粦鑿滃崟涓嶅彲
+ CommonPage.Instance.IsDrawerLockMode = true;
+ if (listForm[1] == null)
+ {
+ var form = new Category.CategoryMainForm();
+ this.bodyFrameView.AddChidren(form);
+ form.ShowForm();
+ //鍔犵紦瀛�
+ listForm[1] = form;
+ }
+ else
+ {
+ ((Category.CategoryMainForm)listForm[1]).RefreshBodyView();
+ }
+ //璁剧疆鍏ㄩ儴鎺т欢鐨勫悇绉嶇姸鎬佺姸鎬�
+ this.SetAllControlStatu();
}
-#endregion
+ /// <summary>
+ /// 鑾峰彇褰撳墠婵�娲荤殑鐣岄潰
+ /// </summary>
+ /// <returns></returns>
+ public EditorCommonForm GetNowActionForm()
+ {
+ int index = ((int)this.nowSelectMenu) - 1;
+ if (index != -1)
+ {
+ //璋冪敤姝ょ晫闈㈢殑婵�娲诲嚱鏁�
+ return this.listForm[index];
+ }
+ return null;
+ }
-#region 鈻� 缁撴瀯浣揰____________________________
-
+ #endregion
+
+ #region 鈻� 缁撴瀯浣揰____________________________
+
/// <summary>
/// 鑿滃崟閫夋嫨鐨勬灇涓�
/// </summary>
@@ -332,8 +405,8 @@
A涓婚〉 = 1,
A鍒嗙被 = 2,
A涓汉涓績 = 3
- }
-
-#endregion
+ }
+
+ #endregion
}
}
--
Gitblit v1.8.0