From 1de638833e4b07b5e6c272cf5c8474b5c92ce42f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 05 九月 2023 15:21:48 +0800
Subject: [PATCH] 删除音乐权限申请
---
OnPro/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs | 183 +++++----------------------------------------
1 files changed, 23 insertions(+), 160 deletions(-)
diff --git a/OnPro/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs b/OnPro/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
index 13115eb..4c0babb 100644
--- a/OnPro/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
+++ b/OnPro/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
@@ -18,13 +18,6 @@
Button btnAddIconBg;
-
- #region 瀹夐槻鍖哄煙
- FrameLayout securityView;
- Button btnSecurityTitle;
- #endregion
-
-
#region 鍦烘櫙鍖哄煙
FrameLayout scenePageView;
/// <summary>
@@ -71,54 +64,24 @@
public void LoadPage()
{
+ //MainPage.BaseTopButton.BackgroundColor = 0xFFF7F7F7;
MainPage.CurPageIndex = 2;
- bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
+ bodyView.BackgroundColor = CSS_Color.TopViewColor;
#region top
topView = new FrameLayout()
{
+ Y = Application.GetRealHeight(10),
Height = Application.GetRealHeight(64),
BackgroundColor = CSS_Color.TopViewColor,
};
bodyView.AddChidren(topView);
+
//涓嶆槸A缃戝叧鎴栬�呮槸鎴愬憳 鍙厑璁告坊鍔犲満鏅殣钘忚嚜鍔ㄥ寲
var HideAutoPage = DB_ResidenceData.Instance.CurrentRegion.isOtherShare;
//鍒ゆ柇鏄惁闇�瑕侀殣钘忚嚜鍔ㄥ寲
if (HideAutoPage)
{
- //if (DB_ResidenceData.Instance.GatewayType == 1)//缃戝叧闇�瑕佸姞杞藉畨闃�--2021-11-28 19:56:53 鍒樻檽杈夊皢瀹夐槻鏀惧叆璇ョ晫闈�
- //{
- // btnSceneTilte = new Button()
- // {
- // Y = Application.GetRealHeight(30),
- // Width = Application.GetRealWidth(170),
- // Height = Application.GetRealHeight(25),
- // TextAlignment = TextAlignment.CenterRight,
- // TextSize = CSS_FontSize.HeadlineFontSize,
- // TextColor = CSS_Color.PromptingColor1,
- // SelectedTextColor = CSS_Color.MainColor,
- // TextID = StringId.Scenes,
- // IsSelected = true
- // };
- // topView.AddChidren(btnSceneTilte);
-
- // btnSecurityTitle = new Button()
- // {
- // X = Application.GetRealWidth(209),
- // Y = Application.GetRealHeight(30),
- // Width = Application.GetRealWidth(170),
- // Height = Application.GetRealHeight(25),
- // TextAlignment = TextAlignment.CenterLeft,
- // TextSize = CSS_FontSize.TextFontSize,
- // TextColor = CSS_Color.PromptingColor1,
- // SelectedTextColor = CSS_Color.MainColor,
- // TextID = StringId.anfang,
- // };
- // topView.AddChidren(btnSecurityTitle);
- // btnAutomationTitle = new Button();
- //}
- //else
- {
btnSceneTilte = new Button()
{
@@ -135,61 +98,9 @@
topView.AddChidren(btnSceneTilte);
btnAutomationTitle = new Button();
- }
}
else
{
- if (DB_ResidenceData.Instance.GatewayType == 1)
- {
- btnAutomationTitle = new Button()
- {
- Y = Application.GetRealHeight(30),
- Gravity = Gravity.CenterHorizontal,
- Height = Application.GetRealHeight(25),
- TextAlignment = TextAlignment.Center,
- TextSize = CSS_FontSize.TextFontSize,
- TextColor = CSS_Color.PromptingColor1,
- SelectedTextColor = CSS_Color.MainColor,
- TextID = StringId.Automation,
- IsSelected = false
- };
- topView.AddChidren(btnAutomationTitle);
- btnAutomationTitle.Width = btnAutomationTitle.GetTextWidth() + Application.GetRealWidth(40);
-
- var otherWidth = (Application.GetRealWidth(375) - btnAutomationTitle.Width) / 2;
- btnAutomationTitle.X = otherWidth;
-
-
- btnSceneTilte = new Button()
- {
- Y = Application.GetRealHeight(30),
- Width = otherWidth,
- Height = Application.GetRealHeight(25),
- TextAlignment = TextAlignment.CenterRight,
- TextSize = CSS_FontSize.HeadlineFontSize,
- TextColor = CSS_Color.PromptingColor1,
- SelectedTextColor = CSS_Color.MainColor,
- TextID = StringId.Scenes,
- IsSelected =true
- };
- topView.AddChidren(btnSceneTilte);
-
-
- btnSecurityTitle = new Button()
- {
- X = btnAutomationTitle.Right,
- Y = Application.GetRealHeight(30),
- Width = otherWidth,
- Height = Application.GetRealHeight(25),
- TextAlignment = TextAlignment.CenterLeft,
- TextSize = CSS_FontSize.TextFontSize,
- TextColor = CSS_Color.PromptingColor1,
- SelectedTextColor = CSS_Color.MainColor,
- TextID = StringId.anfang,
- };
- topView.AddChidren(btnSecurityTitle);
- }
- else
{
btnSceneTilte = new Button()
{
@@ -240,8 +151,8 @@
contentPageView = new PageLayout()
{
- Y = Application.GetRealHeight(64),
- Height = Application.GetRealHeight(667 - 64 - 49 + 30),
+ Y = Application.GetRealHeight(74),
+ Height = Application.GetRealHeight(667 - 64 - 49 + 30 - 10),
BackgroundColor = CSS_Color.BackgroundColor,
IsShowPoint = false
};
@@ -253,27 +164,10 @@
{
LoadAutomationPageView();
}
- LoadSecurityPageView();
LoadEventList();
}
- #region 瀹夐槻甯冮槻
- /// <summary>
- /// 鍔犺浇瀹夐槻鐣岄潰
- /// </summary>
- void LoadSecurityPageView()
- {
- securityView = new FrameLayout();
- contentPageView.AddChidren(securityView);
-
- var page = new ArmCenterPage();
- securityView.AddChidren(page);
- page.LoadPage(false);
- }
-
-
- #endregion
#region 鍦烘櫙閮ㄥ垎
/// <summary>
@@ -343,6 +237,7 @@
{
Y = Application.GetRealHeight(53),
Height = Application.GetRealHeight(667 - 64 - 49 - 52 + 0),
+
};
scenePageView.AddChidren(sceneFunctionView);
LoadSceneFunctionControlZone(null);
@@ -389,7 +284,7 @@
Y = btnNoCollectionBg.Bottom,
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.PromptingColor1,
- TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ TextSize = CSS_FontSize.TextFontSize,
TextID = StringId.TipNoScene,
};
view.AddChidren(btnNoCollectionTip);
@@ -431,6 +326,9 @@
index++;
});
}
+ Application.RunOnMainThread(() => {
+ sceneFunctionView.AddChidren(new Button { Height = Application.GetRealHeight(30) });
+ });
})
{ IsBackground = true }.Start();
}
@@ -439,7 +337,6 @@
{
MainPage.Log("homepage erorr : " + ex.Message);
}
- sceneFunctionView.AddChidren(new Button { Height = Application.GetRealHeight(30) });
}
@@ -455,14 +352,23 @@
Height = Application.GetRealWidth(122),
Tag = scene.sid,
};
+ var btnSceneGg = new ImageView()
+ {
+ Radius = (uint)Application.GetRealWidth(12),
+ BorderColor = 0x00000000,
+ BorderWidth = 1,
+ };
+ view.AddChidren(btnSceneGg);
//2020-12-03 淇敼鍥剧墖鍔犺浇鏂规硶
- ImageUtlis.Current.LoadLocalOrNetworkImages(scene.ImagePath, view);
+ ImageUtlis.Current.LoadLocalOrNetworkImages(scene.ImagePath, btnSceneGg);
try
{
Button btnCoverd = new Button()
{
- UnSelectedImagePath = "Collection/SceneCovered.png",
+ //UnSelectedImagePath = "Collection/SceneCovered.png",
+ Radius = (uint)Application.GetRealWidth(12),
+ BackgroundColor = 0x44000000,
};
view.AddChidren(btnCoverd);
@@ -551,7 +457,7 @@
btnName.Text = scene.name;
btnZone.Text = scene.GetRoomListName();
//2020-12-03 淇敼鍥剧墖鍔犺浇鏂规硶
- ImageUtlis.Current.LoadLocalOrNetworkImages((scene as Scene).ImagePath, view);
+ ImageUtlis.Current.LoadLocalOrNetworkImages((scene as Scene).ImagePath, btnSceneGg);
};
var aep = new SceneEditPage(scene, backAction);
MainPage.BasePageView.AddChidren(aep);
@@ -609,9 +515,6 @@
if (contentPageView.PageIndex == 2)
{
btnAddIconBg.Visible = false;
- btnSecurityTitle.IsSelected = true;
- btnSecurityTitle.TextSize = CSS_FontSize.HeadlineFontSize;
- btnSecurityTitle.IsBold = true;
btnSceneTilte.IsSelected = false;
btnSceneTilte.TextSize = CSS_FontSize.TextFontSize;
btnSceneTilte.IsBold = false;
@@ -622,12 +525,6 @@
else if (contentPageView.PageIndex == 0)
{
btnAddIconBg.Visible = true;
- if (btnSecurityTitle != null)
- {
- btnSecurityTitle.IsSelected = false;
- btnSecurityTitle.TextSize = CSS_FontSize.TextFontSize;
- btnSecurityTitle.IsBold = false;
- }
btnSceneTilte.IsSelected = true;
btnSceneTilte.TextSize = CSS_FontSize.HeadlineFontSize;
btnSceneTilte.IsBold = true;
@@ -638,12 +535,6 @@
else
{
btnAddIconBg.Visible = true;
- if (btnSecurityTitle != null)
- {
- btnSecurityTitle.IsSelected = false;
- btnSecurityTitle.TextSize = CSS_FontSize.TextFontSize;
- btnSecurityTitle.IsBold = false;
- }
btnAutomationTitle.IsSelected = true;
btnAutomationTitle.TextSize = CSS_FontSize.HeadlineFontSize;
btnAutomationTitle.IsBold = true;
@@ -659,12 +550,6 @@
{
return;
}
-
- if (btnSecurityTitle != null)
- {
- btnSecurityTitle.IsSelected = false;
- btnSecurityTitle.TextSize = CSS_FontSize.TextFontSize;
- }
btnSceneTilte.IsSelected = true;
btnSceneTilte.TextSize = CSS_FontSize.HeadlineFontSize;
btnAutomationTitle.IsSelected = false;
@@ -678,34 +563,12 @@
return;
}
- if (btnSecurityTitle != null)
- {
- btnSecurityTitle.IsSelected = false;
- btnSecurityTitle.TextSize = CSS_FontSize.TextFontSize;
- }
btnAutomationTitle.IsSelected = true;
btnAutomationTitle.TextSize = CSS_FontSize.HeadlineFontSize;
btnSceneTilte.IsSelected = false;
btnSceneTilte.TextSize = CSS_FontSize.TextFontSize;
contentPageView.PageIndex = 1;
};
- if (btnSecurityTitle != null)
- {
- btnSecurityTitle.MouseUpEventHandler = (sender, e) =>
- {
- if (btnSecurityTitle.IsSelected)
- {
- return;
- }
- btnSecurityTitle.IsSelected = true;
- btnSecurityTitle.TextSize = CSS_FontSize.HeadlineFontSize;
- btnAutomationTitle.IsSelected = false;
- btnAutomationTitle.TextSize = CSS_FontSize.TextFontSize;
- btnSceneTilte.IsSelected = false;
- btnSceneTilte.TextSize = CSS_FontSize.TextFontSize;
- contentPageView.PageIndex = contentPageView.ChildrenCount - 1;
- };
- }
}
#endregion
--
Gitblit v1.8.0