From 157be5220d9d81bce18e8248ef6ac056415405a1 Mon Sep 17 00:00:00 2001
From: Tong <1025782220@qq.com>
Date: 星期二, 31 八月 2021 09:29:45 +0800
Subject: [PATCH] 更新推送库
---
HDL_ON/UI/UI0-Public/TopViewDiv.cs | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/TopViewDiv.cs b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
index fb5f8be..1de2e9b 100644
--- a/HDL_ON/UI/UI0-Public/TopViewDiv.cs
+++ b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
@@ -98,12 +98,6 @@
};
contentView.AddChidren(btnBackIcon);
- btnBack = new Button()
- {
- Width = Application.GetRealWidth(100),
- };
- contentView.AddChidren(btnBack);
-
Button btnTilte = new Button()
{
Gravity = Gravity.CenterHorizontal,
@@ -118,6 +112,12 @@
contentView.AddChidren(btnTilte);
+ btnBack = new Button()
+ {
+ Width = Application.GetRealWidth(70),
+ };
+ contentView.AddChidren(btnBack);
+
LoadEventList();
}
/// <summary>
@@ -131,7 +131,7 @@
LoadTopView();
}
- public void LoadTopView_RoomTop(Action backAction ,Action editAction)
+ public void LoadTopView_RoomTop(Action backAction, Action editAction)
{
this.backAction = backAction;
@@ -147,7 +147,7 @@
};
//濡傛灉鏄垚鍛橀殣钘忕紪杈戝姛鑳�
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
{
contentView.AddChidren(btnSetting);
}
@@ -162,7 +162,7 @@
/// </summary>
/// <param name="frame"></param>
/// <param name="tilte"></param>
- public void LoadTopView_FunctionTop(Function function, Action action)
+ public void LoadTopView_FunctionTop(Function function, Action action,bool locationSet = true)
{
backAction = action;
@@ -177,7 +177,7 @@
UnSelectedImagePath = "Public/FuncInfoSetIcon.png",
};
//濡傛灉鏄垚鍛橀殣钘忕紪杈戝姛鑳�
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
{
contentView.AddChidren(btnSetting);
}
@@ -186,7 +186,7 @@
{
var infoView = new FunctionBaseInfoSetPage(function, action);
MainPage.BasePageView.AddChidren(infoView);
- infoView.LoadPage();
+ infoView.LoadPage(locationSet);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
}
@@ -210,7 +210,7 @@
};
//濡傛灉鏄垚鍛橀殣钘忕紪杈戝姛鑳�
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
{
contentView.AddChidren(btnSetting);
}
@@ -275,7 +275,7 @@
/// <summary>
/// 妤煎眰绠＄悊椤堕儴鏍�
/// </summary>
- public void LoadTopView_FloorTopView(Action<string> callBack,Action action)
+ public void LoadTopView_FloorTopView(Action<string> callBack, Action action)
{
LoadTopView();
@@ -376,7 +376,7 @@
Height = Application.GetMinRealAverage(28),
UnSelectedImagePath = "FunctionIcon/ArmCenter/HistoryIcon.png",
};
- contentView.AddChidren(btnAddIcon);
+ //contentView.AddChidren(btnAddIcon);
btnAddIcon.MouseUpEventHandler += (sender, e) =>
{
--
Gitblit v1.8.0