From 06802250b4b9041d39d568c1dbe77684075006b2 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 11 三月 2020 10:03:44 +0800
Subject: [PATCH] 上传一个版本
---
ZigbeeApp/Shared/Phone/UserView/UserPage.cs | 92 +++++++++++++++++++++++++++-------------------
1 files changed, 54 insertions(+), 38 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserView/UserPage.cs b/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
index 1e83ef9..ab9c4c5 100755
--- a/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
@@ -4,14 +4,13 @@
using ZigBee.Device;
using Shared.Phone.Device.AC;
using System.Text;
-using Shared.Phone.Device.Account;
namespace Shared.Phone.UserView
{
/// <summary>
/// User page.
/// </summary>
- public class UserPage : FrameLayout,ZigBee.Common.IStatus
+ public class UserPage : FrameLayout, ZigBee.Common.IStatus
{
#region 鈼� 鍙橀噺_______________________
/// <summary>
@@ -173,14 +172,6 @@
ac.currentSystemMode = attList.AttriButeData;
ac.LastDateTime = DateTime.Now;
break;
- case 4099:
- var value = Convert.ToString(attList.AttriButeData, 2).PadLeft(16, '0');
- var modeStr = value.Substring(value.Length - 5, 5);
- for (int j = 0; j < modeStr.Length; j++)
- {
- ac.listSupportMode[j] = Convert.ToInt32(modeStr[j]) == 49 ? 1 : 0;
- }
- break;
case 4097:
ac.CleanStatu = attList.AttriButeData == 42;
break;
@@ -377,7 +368,7 @@
ZbGateway.StatusList.Add(this);
Shared.Application.LocationAction += (lon, lat) =>
{
- AccountLogic.Instance.ReceiveAppLatAndLon(lon.ToString(), lat.ToString());
+ Login.AccountLogic.Instance.ReceiveAppLatAndLon(lon.ToString(), lat.ToString());
};
}
@@ -429,7 +420,6 @@
Width = Application.GetMinRealAverage(tabBarEnumIMG_Width),
UnSelectedImagePath = "Navigation/Home.png",
SelectedImagePath = "Navigation/HomeSelected.png",
- IsSelected = true,
Gravity = Gravity.CenterHorizontal
};
/// <summary>
@@ -442,7 +432,6 @@
TextID = R.MyInternationalizationString.HomePage,
TextColor = Shared.Common.ZigbeeColor.Current.GXCTextBottomUnSelectedColor,
SelectedTextColor = Shared.Common.ZigbeeColor.Current.GXCTextBlackColor2,
- IsSelected = true,
Gravity = Gravity.CenterHorizontal,
TextSize = 10
};
@@ -454,7 +443,7 @@
/// </summary>
public FrameLayout categoryFL = new FrameLayout
{
- X=Application.GetRealWidth(tabBarEnum_Width),
+ X = Application.GetRealWidth(tabBarEnum_Width),
Width = Application.GetRealWidth(tabBarEnum_Width),
Height = Application.GetRealHeight(CommonPage.TabbarHeight)
};
@@ -480,9 +469,8 @@
TextID = R.MyInternationalizationString.Category,
TextColor = Shared.Common.ZigbeeColor.Current.GXCTextBottomUnSelectedColor,
SelectedTextColor = Shared.Common.ZigbeeColor.Current.GXCTextBlackColor2,
- IsSelected = false,
Gravity = Gravity.CenterHorizontal,
- TextSize=10
+ TextSize = 10
};
#endregion
@@ -492,7 +480,7 @@
/// </summary>
public FrameLayout settingFL = new FrameLayout
{
- X = Application.GetRealWidth(tabBarEnum_Width*2),
+ X = Application.GetRealWidth(tabBarEnum_Width * 2),
Width = Application.GetRealWidth(tabBarEnum_Width),
Height = Application.GetRealHeight(CommonPage.TabbarHeight)
};
@@ -518,7 +506,6 @@
TextID = R.MyInternationalizationString.Me,
TextColor = Shared.Common.ZigbeeColor.Current.GXCTextBottomUnSelectedColor,
SelectedTextColor = Shared.Common.ZigbeeColor.Current.GXCTextBlackColor2,
- IsSelected = false,
Gravity = Gravity.CenterHorizontal,
TextSize = 10
};
@@ -527,43 +514,72 @@
EventHandler<MouseEventArgs> BottomEventHandler = (sender, e) =>
{
- Instance.homePageName.IsSelected = false;
- Instance.homePageIMG.IsSelected = false;
-
- Instance.categoryName.IsSelected = false;
- Instance.categoryIMG.IsSelected = false;
-
- Instance.settingName.IsSelected = false;
- Instance.settingIMG.IsSelected = false;
-
- Instance.BodyView.RemoveAll();
if (sender == Instance.homePageIMG || sender == Instance.homePageName)
- {
+ {
+ if (Instance.homePageName.IsSelected == true && e != null)
+ {
+ //鍙湁鏄墜鍔ㄧ偣鍑荤殑鏃跺�欐墠澶勭悊
+ return;
+ }
+ Instance.BodyView.RemoveAll();
//涓婚〉
CommonPage.Instance.IsDrawerLockMode = false;
Instance.homePageName.IsSelected = true;
- Instance.homePageIMG.IsSelected = true;
- var home = new UserHomeView { };
+ Instance.homePageIMG.IsSelected = true;
+
+ Instance.categoryName.IsSelected = false;
+ Instance.categoryIMG.IsSelected = false;
+
+ Instance.settingName.IsSelected = false;
+ Instance.settingIMG.IsSelected = false;
+
+ var home = new MainPage.UserHomeView2();
Instance.BodyView.AddChidren(home);
- home.Show();
+ home.ShowForm();
}
- else if (sender == Instance.categoryIMG || sender==Instance.categoryName)
- {
+ else if (sender == Instance.categoryIMG || sender == Instance.categoryName)
+ {
+ if (Instance.categoryName.IsSelected == true && e != null)
+ {
+ //鍙湁鏄墜鍔ㄧ偣鍑荤殑鏃跺�欐墠澶勭悊
+ return;
+ }
+
+ Instance.BodyView.RemoveAll();
//鍒嗙被
CommonPage.Instance.IsDrawerLockMode = true;
Instance.categoryName.IsSelected = true;
- Instance.categoryIMG.IsSelected = true;
+ Instance.categoryIMG.IsSelected = true;
+
+ Instance.homePageName.IsSelected = false;
+ Instance.homePageIMG.IsSelected = false;
+
+ Instance.settingName.IsSelected = false;
+ Instance.settingIMG.IsSelected = false;
+
var category = new Phone.Device.Category.Category { };
Instance.BodyView.AddChidren(category);
category.Show();
}
- else if (sender == Instance.settingIMG || sender==Instance.settingName)
- {
+ else if (sender == Instance.settingIMG || sender == Instance.settingName)
+ {
+ if (Instance.settingName.IsSelected == true && e != null)
+ {
+ return;
+ }
+ Instance.BodyView.RemoveAll();
//涓汉涓績
CommonPage.Instance.IsDrawerLockMode = true;
Instance.settingName.IsSelected = true;
- Instance.settingIMG.IsSelected = true;
+ Instance.settingIMG.IsSelected = true;
+
+ Instance.homePageName.IsSelected = false;
+ Instance.homePageIMG.IsSelected = false;
+
+ Instance.categoryName.IsSelected = false;
+ Instance.categoryIMG.IsSelected = false;
+
var form = new UserCenter.UserMain.UserMainForm();
Instance.BodyView.AddChidren(form);
form.ShowForm();
--
Gitblit v1.8.0