From 38ab16c66df6fc523f2c385fd583a2f2e86a781c Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 29 四月 2020 17:58:45 +0800
Subject: [PATCH] 2020-4-29-1
---
ZigbeeApp/Shared/Phone/UserView/UserPage.cs | 110 +++++++++++++++++++++++++++---------------------------
1 files changed, 55 insertions(+), 55 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserView/UserPage.cs b/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
index 8df13b5..f391d26 100755
--- a/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
@@ -2,7 +2,7 @@
using System.Collections.Generic;
using Shared.Common;
using System.Text;
-
+
namespace Shared.Phone.UserView
{
/// <summary>
@@ -113,8 +113,8 @@
public Button homePageIMG = new Button
{
Y = Application.GetRealHeight(tabBarEnumIMG_Y),
- Height = Application.GetMinRealAverage(tabBarEnumIMG_Height),
- Width = Application.GetMinRealAverage(tabBarEnumIMG_Width),
+ Height = UserCenter.HdlControlLogic.Current.GetPictrueRealSize(tabBarEnumIMG_Height),
+ Width = UserCenter.HdlControlLogic.Current.GetPictrueRealSize(tabBarEnumIMG_Width),
UnSelectedImagePath = "Navigation/Home.png",
SelectedImagePath = "Navigation/HomeSelected.png",
Gravity = Gravity.CenterHorizontal
@@ -150,8 +150,8 @@
public Button categoryIMG = new Button
{
Y = Application.GetRealHeight(tabBarEnumIMG_Y),
- Height = Application.GetMinRealAverage(tabBarEnumIMG_Height),
- Width = Application.GetMinRealAverage(tabBarEnumIMG_Width),
+ Height = UserCenter.HdlControlLogic.Current.GetPictrueRealSize(tabBarEnumIMG_Height),
+ Width = UserCenter.HdlControlLogic.Current.GetPictrueRealSize(tabBarEnumIMG_Width),
UnSelectedImagePath = "Navigation/Category.png",
SelectedImagePath = "Navigation/CategorySelected.png",
Gravity = Gravity.CenterHorizontal
@@ -187,8 +187,8 @@
public Button settingIMG = new Button
{
Y = Application.GetRealHeight(tabBarEnumIMG_Y),
- Height = Application.GetMinRealAverage(tabBarEnumIMG_Height),
- Width = Application.GetMinRealAverage(tabBarEnumIMG_Width),
+ Height = UserCenter.HdlControlLogic.Current.GetPictrueRealSize(tabBarEnumIMG_Height),
+ Width = UserCenter.HdlControlLogic.Current.GetPictrueRealSize(tabBarEnumIMG_Width),
UnSelectedImagePath = "Navigation/Setting.png",
SelectedImagePath = "Navigation/SettingSelected.png",
Gravity = Gravity.CenterHorizontal
@@ -205,44 +205,44 @@
SelectedTextColor = Shared.Common.ZigbeeColor.Current.GXCTextBlackColor2,
Gravity = Gravity.CenterHorizontal,
TextSize = 10
- };
+ };
#endregion
-
+
#region 寮哄埗鏄剧ず鑷姩鍖栫晫闈�
- /// <summary>
- /// 寮哄埗鏄剧ず鑷姩鍖栧垪琛ㄧ晫闈�
+ /// <summary>
+ /// 寮哄埗鏄剧ず鑷姩鍖栧垪琛ㄧ晫闈�
/// </summary>
- public void ShowCategoryAutoListForm()
- {
- //鍏抽棴鍏ㄩ儴鐣岄潰,鐩村埌涓婚〉涓烘
- UserCenter.UserCenterLogic.CloseAllOpenForm();
- //寮哄埗鏄剧ず鑷姩鍖栧垪琛ㄧ晫闈�
- UserCenter.UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex = 2;
- BottomEventHandler(Instance.categoryIMG, null);
+ public void ShowCategoryAutoListForm()
+ {
+ //鍏抽棴鍏ㄩ儴鐣岄潰,鐩村埌涓婚〉涓烘
+ UserCenter.UserCenterLogic.CloseAllOpenForm();
+ //寮哄埗鏄剧ず鑷姩鍖栧垪琛ㄧ晫闈�
+ UserCenter.UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex = 2;
+ BottomEventHandler(Instance.categoryIMG, null);
}
#endregion
-
+
EventHandler<MouseEventArgs> BottomEventHandler = (sender, e) =>
{
if (sender == Instance.homePageIMG || sender == Instance.homePageName)
- {
- if (Instance.homePageName.IsSelected == true && e != null)
- {
- //鍙湁鏄墜鍔ㄧ偣鍑荤殑鏃跺�欐墠澶勭悊
- return;
- }
+ {
+ if (Instance.homePageName.IsSelected == true && e != null)
+ {
+ //鍙湁鏄墜鍔ㄧ偣鍑荤殑鏃跺�欐墠澶勭悊
+ return;
+ }
Instance.BodyView.RemoveAll();
//涓婚〉
CommonPage.Instance.IsDrawerLockMode = false;
Instance.homePageName.IsSelected = true;
- Instance.homePageIMG.IsSelected = true;
-
- Instance.categoryName.IsSelected = false;
- Instance.categoryIMG.IsSelected = false;
-
- Instance.settingName.IsSelected = false;
+ Instance.homePageIMG.IsSelected = true;
+
+ Instance.categoryName.IsSelected = false;
+ Instance.categoryIMG.IsSelected = false;
+
+ Instance.settingName.IsSelected = false;
Instance.settingIMG.IsSelected = false;
var home = new MainPage.HomeMainPageForm();
@@ -251,23 +251,23 @@
}
else if (sender == Instance.categoryIMG || sender == Instance.categoryName)
- {
- if (Instance.categoryName.IsSelected == true && e != null)
- {
- //鍙湁鏄墜鍔ㄧ偣鍑荤殑鏃跺�欐墠澶勭悊
- return;
- }
-
+ {
+ if (Instance.categoryName.IsSelected == true && e != null)
+ {
+ //鍙湁鏄墜鍔ㄧ偣鍑荤殑鏃跺�欐墠澶勭悊
+ return;
+ }
+
Instance.BodyView.RemoveAll();
//鍒嗙被
CommonPage.Instance.IsDrawerLockMode = true;
Instance.categoryName.IsSelected = true;
- Instance.categoryIMG.IsSelected = true;
-
- Instance.homePageName.IsSelected = false;
- Instance.homePageIMG.IsSelected = false;
-
- Instance.settingName.IsSelected = false;
+ Instance.categoryIMG.IsSelected = true;
+
+ Instance.homePageName.IsSelected = false;
+ Instance.homePageIMG.IsSelected = false;
+
+ Instance.settingName.IsSelected = false;
Instance.settingIMG.IsSelected = false;
var category = new Category.CategoryMainForm { };
@@ -275,21 +275,21 @@
category.ShowForm();
}
else if (sender == Instance.settingIMG || sender == Instance.settingName)
- {
- if (Instance.settingName.IsSelected == true && e != null)
- {
- return;
- }
+ {
+ if (Instance.settingName.IsSelected == true && e != null)
+ {
+ return;
+ }
Instance.BodyView.RemoveAll();
//涓汉涓績
CommonPage.Instance.IsDrawerLockMode = true;
Instance.settingName.IsSelected = true;
- Instance.settingIMG.IsSelected = true;
-
- Instance.homePageName.IsSelected = false;
- Instance.homePageIMG.IsSelected = false;
-
- Instance.categoryName.IsSelected = false;
+ 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();
--
Gitblit v1.8.0