From bfb3d0d4879dca8c59ff287c92f5113162f3a33a Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期二, 27 八月 2024 15:22:48 +0800
Subject: [PATCH] 代码备份
---
OnPro/HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 901 ++++---------------------------------------------------
1 files changed, 76 insertions(+), 825 deletions(-)
diff --git a/OnPro/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/OnPro/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index db57943..2daca5a 100644
--- a/OnPro/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/OnPro/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -31,10 +31,6 @@
/// 杩炴帴鐘舵�佹彁绀�
/// </summary>
Button btnLinkStateTip;
- /// <summary>
- /// 瀹夐槻鐘舵�佸浘鏍�
- /// </summary>
- Button btnSecurityStatus;
/// <summary>
@@ -117,9 +113,9 @@
#endregion
#region 鎶ヨ淇℃伅
- //Button btnMsgBg;
- //Button btnMsgTime;
- //Button btnMsg;
+ Button btnMsgBg;
+ Button btnMsgTime;
+ Button btnMsg;
Button btnMsgIcon;
#endregion
@@ -130,9 +126,6 @@
this.VerticalScrollBarEnabled = false;
-#if DEBUG
- DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl = true;
-#endif
#if __IOS__
//鑷姩鍋忕Щ鍙栨秷
@@ -152,6 +145,9 @@
public void LoadPage()
{
MainPage.CurPageIndex = 0;
+ //MainPage.BaseTopButton.BackgroundColor = 0xFFA09C98;
+
+
try
{
bodyView.RemoveAll();
@@ -161,18 +157,17 @@
bodyView.EndHeaderRefreshing();
Common.ApiUtlis.Ins.DownloadData();
LoadContentView();
- contentView.PageIndex = CurShowTypeContent;
};
topView = new FrameLayout()
{
- Height = Application.GetRealHeight(113),//216),
+ Height = Application.GetRealHeight(216),
BackgroundImagePath = DB_ResidenceData.Instance.residenceImage,
};
bodyView.AddChidren(topView);
#else
VerticalRefreshLayout refreshLayout = new VerticalRefreshLayout()
{
- Height = Application.GetRealHeight(113),//216),
+ Height = Application.GetRealHeight(216),
BackgroundImagePath = DB_ResidenceData.Instance.residenceImage,
};
bodyView.AddChidren(refreshLayout);
@@ -181,17 +176,14 @@
refreshLayout.EndHeaderRefreshing();
Common.ApiUtlis.Ins.DownloadData();
LoadContentView();
- contentView.PageIndex = CurShowTypeContent;
};
topView = new FrameLayout()
{
- Height = Application.GetRealHeight(113),//216),
+ Height = Application.GetRealHeight(216),
};
refreshLayout.AddChidren(topView);
#endif
#region topView
-
-
Button btnTop;
btnTop = new Button()
@@ -228,54 +220,6 @@
//鏇存柊閾炬帴鐘舵�乮con棰滆壊
-#if DEBUG
- int ddd = 0;
- btnResidenceName.MouseUpEventHandler = (sender, e) =>
- {
- //827a98c98da7469b8bc19bb6a3c7651906
- //St_00009073b431d8b2490c9df0c5cb0e73
- //Com.Hdl.HdlToLc.InitData(Shared.Application.Activity,false, "827a98c98da7469b8bc19bb6a3c7651906");
- //Com.Hdl.HdlToLc.OpenActivity();
- //new System.Threading.Thread(() =>
- //{
- // var http = new HttpServerRequest();
- // var pack = http.GetLcSubAccountToken();
- // if (pack.Code == StateCode.SUCCESS)
- // {
- // if(pack.Data == null || string.IsNullOrEmpty(pack.Data.ToString()))
- // {
- // Application.RunOnMainThread(() =>
- // {
- // new PublicAssmebly().TipMsg(Language.StringByID(StringId.Tip), Language.StringByID(StringId.huoqushujushibao));
- // });
- // }
- // Com.Utils.HdlToLcUtils.Instance.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
- // Com.Utils.HdlToLcUtils.Instance.Token = UserInfo.Current.AccessToken;
- // Com.Utils.HdlToLcUtils.Instance.SubAccessToken = pack.Data.ToString();
- // Application.RunOnMainThread(() =>
- // {
- // //Com.Utils.HdlToLcUtils.Instance.OpenActivity();
- // //Com.Utils.HdlToLcUtils.Instance.Play()
- // var backTemp = new AddLcCam();
- // backTemp.backAction = () =>
- // {
- // //Load3tyBrandDeviceList();
- // };
- // Com.Utils.HdlToLcUtils.Instance.AddCamera(backTemp);
- // });
- // }
- // else
- // {
- // Application.RunOnMainThread(() =>
- // {
- // new PublicAssmebly().TipMsg(Language.StringByID(StringId.Tip), Language.StringByID(StringId.huoqushujushibao) + $"({pack.Code})");
- // });
- // }
- //})
- //{ IsBackground = true }.Start();
- };
-#endif
-
environmentalView = new FrameLayout()
{
Y = Application.GetRealHeight(1) + btnResidenceName.Bottom,
@@ -284,39 +228,10 @@
topView.AddChidren(environmentalView);
CheckLinkStatus();//2020-12-22
-#region 鐜鏁版嵁
- var tempSensorList = FunctionList.List.GetEnvirSensorsList().FindAll((obj) => obj.spk == SPK.SensorTemperature);
- var humiSensorList = FunctionList.List.GetEnvirSensorsList().FindAll((obj) => obj.spk == SPK.SensorHumidity);
- var enviList = FunctionList.List.GetEnvirSensorsList().FindAll((obj) => SPK.EvironmentSensorList().Contains(obj.spk));
- foreach (var enviTemp in enviList)
- {
- var humiAttr = enviTemp.attributes.Find((obj) => obj.key == "humidity");
- if (humiAttr != null)
- {
- var newTemp = new Function()
- {
- name = enviTemp.name,
- sid = enviTemp.sid,
- deviceId = enviTemp.deviceId,
- attributes = new List<FunctionAttributes> { new FunctionAttributes { key = "value", state = humiAttr.state, curValue = humiAttr.curValue } },
- };
- humiSensorList.Add(newTemp);//020103CF594C3E00051F0001051F// 1650546588519424001
- }
- var tempAttr = enviTemp.attributes.Find((obj) => obj.key == "temperature");
- if (tempAttr != null)
- {
- var newTemp = new Function()
- {
- name = enviTemp.name,
- sid = enviTemp.sid,
- deviceId = enviTemp.deviceId,
- attributes = new List<FunctionAttributes> { new FunctionAttributes { key = "value", state = tempAttr.state, curValue = tempAttr.curValue } },
- };
- tempSensorList.Add(newTemp);//020103CF594C3E00051F0001051F
- }
- }
+ #region 鐜鏁版嵁
- var btnEnvirValuesTitle = new Button() {
+ var btnEnvirValuesTitle = new Button()
+ {
X = Application.GetRealWidth(12),
Gravity = Gravity.CenterVertical,
TextColor = CSS_Color.MainBackgroundColor,
@@ -324,10 +239,6 @@
TextID = StringId.Outdoor,
TextAlignment = TextAlignment.CenterLeft,
};
- if (tempSensorList.Count > 0 || humiSensorList.Count > 0)
- {
- btnEnvirValuesTitle.TextID = StringId.InOutdoor;
- }
btnEnvirValuesTitle.Width = Application.GetRealWidth(8) + btnEnvirValuesTitle.GetTextWidth();
environmentalView.AddChidren(btnEnvirValuesTitle);
@@ -362,29 +273,6 @@
TextAlignment = TextAlignment.CenterLeft,
Text = ""
};
- if (tempSensorList.Count > 0)
- {
- btnIndoorTempValues.Text = "/--掳";
- double tempTotalValues = 0;
- double tempTotalCount = 0;
- foreach (var temp in tempSensorList)
- {
- double tempValue = 0;
- if (temp.GetAttribute("temperature") != null)
- double.TryParse(temp.GetAttrState("temperature"), out tempValue);
- else
- double.TryParse(temp.GetAttrState("value"), out tempValue);
- if (tempValue > 0)
- {
- tempTotalValues += tempValue;
- tempTotalCount++;
- }
- }
- if (tempTotalValues > 0)
- {
- btnIndoorTempValues.Text = "/" + (tempTotalValues/ tempTotalCount).ToString("0.0") + "掳";
- }
- }
btnIndoorTempValues.Width = btnIndoorTempValues.GetTextWidth();
environmentalView.AddChidren(btnIndoorTempValues);
@@ -419,29 +307,6 @@
TextAlignment = TextAlignment.CenterLeft,
Text = ""
};
- if (tempSensorList.Count > 0)
- {
- btnIndoorHumiValues.Text = "/--%";
- double humiTotalValues = 0;
- double humiTotalCount = 0;
- foreach (var humi in humiSensorList)
- {
- double humiValue = 0;
- if (humi.GetAttribute("temperature") != null)
- double.TryParse(humi.GetAttrState("humidity"), out humiValue);
- else
- double.TryParse(humi.GetAttrState("value"), out humiValue);
- if (humiValue > 0)
- {
- humiTotalValues += humiValue;
- humiTotalCount++;
- }
- }
- if (humiTotalValues > 0)
- {
- btnIndoorHumiValues.Text = "/" + (humiTotalValues / humiTotalCount).ToString("0") + "%";
- }
- }
btnIndoorHumiValues.Width = btnIndoorHumiValues.GetTextWidth();
environmentalView.AddChidren(btnIndoorHumiValues);
@@ -468,106 +333,66 @@
environmentalView.AddChidren(btnPm25Values);
#endregion
-
- btnSecurityStatus = new Button()
+ #region msg
+ FrameLayout msgView;
+ msgView = new FrameLayout()
{
- X = Application.GetRealWidth(329),
- Y = Application.GetRealHeight(34),
- Width = Application.GetRealWidth(30),
- Height = Application.GetRealWidth(30),
- SelectedImagePath = "Collection/DefenseStatusIcon.png",
- UnSelectedImagePath = "Collection/DisarmStatusIcon.png"
+ Y = Application.GetRealHeight(164),
+ Gravity = Gravity.CenterHorizontal,
+ Width = Application.GetRealWidth(343),
+ Height = Application.GetRealHeight(28),
};
- if (DB_ResidenceData.Instance.GatewayType == 1)
+ topView.AddChidren(msgView);
+
+ btnMsgBg = new Button()
{
-
- topView.AddChidren(btnSecurityStatus);
- foreach (var temp in FunctionList.List.securities)
- {
- if (temp.status == "enable")
- {
- btnSecurityStatus.IsSelected = true;
- if (temp.alarm)
- {
- btnSecurityStatus.SelectedImagePath = "Collection/DefenseAlarmIcon.png";
- }
- else
- {
- btnSecurityStatus.SelectedImagePath = "Collection/DefenseStatusIcon.png";
- }
- break;
- }
- }
-
- btnSecurityStatus.MouseUpEventHandler = (sender, e) => {
- var page = new ArmCenterPage();
- MainPage.BasePageView.AddChidren(page);
- page.LoadPage();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- };
- }
-
-
-#region msg
- //FrameLayout msgView;
- //msgView = new FrameLayout()
- //{
- // Y = Application.GetRealHeight(164),
- // Gravity = Gravity.CenterHorizontal,
- // Width = Application.GetRealWidth(343),
- // Height = Application.GetRealHeight(28),
- //};
- //topView.AddChidren(msgView);
-
- //btnMsgBg = new Button()
- //{
- // BackgroundColor = CSS_Color.MainColor,//0x3F4484F4,
- // Alpha = 0.4f,
- //};
- //msgView.AddChidren(btnMsgBg);
+ BackgroundColor = CSS_Color.MainColor,//0x3F4484F4,
+ Alpha = 0.4f,
+ };
+ msgView.AddChidren(btnMsgBg);
btnMsgIcon = new Button()
{
- X = Application.GetRealWidth(290),
- Y = Application.GetRealHeight(35),
+ X = Application.GetRealWidth(12),
+ Gravity = Gravity.CenterVertical,
Width = Application.GetMinRealAverage(24),
Height = Application.GetMinRealAverage(24),
UnSelectedImagePath = "Collection/MsgIcon.png",
SelectedImagePath = "Collection/MsgIconTip.png",
};
- topView.AddChidren(btnMsgIcon);
+ msgView.AddChidren(btnMsgIcon);
- //btnMsg = new Button()
- //{
- // X = Application.GetRealWidth(10) + btnMsgIcon.Right,
- // Width = Application.GetRealWidth(240),
- // Text = "...",
- // TextColor = CSS_Color.MainBackgroundColor,
- // TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- // TextAlignment = TextAlignment.CenterLeft,
- //};
- //msgView.AddChidren(btnMsg);
+ btnMsg = new Button()
+ {
+ X = Application.GetRealWidth(10) + btnMsgIcon.Right,
+ Width = Application.GetRealWidth(240),
+ Text = "...",
+ TextColor = CSS_Color.MainBackgroundColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ TextAlignment = TextAlignment.CenterLeft,
+ };
+ msgView.AddChidren(btnMsg);
- //btnMsgTime = new Button()
- //{
- // X = Application.GetRealWidth(299),
- // Width = Application.GetRealWidth(44),
- // Text = "00:00",
- // TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- // TextAlignment = TextAlignment.CenterLeft,
- //};
- //msgView.AddChidren(btnMsgTime);
+ btnMsgTime = new Button()
+ {
+ X = Application.GetRealWidth(299),
+ Width = Application.GetRealWidth(44),
+ Text = "00:00",
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ TextAlignment = TextAlignment.CenterLeft,
+ };
+ msgView.AddChidren(btnMsgTime);
LoadEvent_GotoMessageCenterPage();
-#endregion
+ #endregion
-#endregion
+ #endregion
-#region 鍔熻兘鍦烘櫙鍒囨崲
+ #region 鍔熻兘鍦烘櫙鍒囨崲
bodyView.AddChidren(new Button() { Height = Application.GetRealHeight(20), BackgroundColor = 0x00000000 });
@@ -612,171 +437,12 @@
{
contentView = new PageLayout()
{
- Height = Application.GetRealHeight(310 + 30 + 10 + 100), //20涓鸿秴鍑洪儴鍒�
+ Height = Application.GetRealHeight(310 + 30 + 10), //20涓鸿秴鍑洪儴鍒�
IsShowPoint = false,
};
bodyView.AddChidren(contentView);
}
- if (DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl && FunctionList.List.groupControls.Count > 0)
- {
- var changeView = new FrameLayout()
- {
- //Y = Application.GetRealHeight(20) + topView.Bottom,
- Gravity = Gravity.CenterHorizontal,
- Width = Application.GetRealWidth(334),
- Height = Application.GetRealHeight(62),
- BackgroundImagePath = "Collection/ChangeViewbg.png",
- };
- changeBaseView.AddChidren(changeView);
-
- var btnChangeFunction = new Button()
- {
- X = Application.GetRealWidth(10),
- Width = Application.GetRealWidth(114 - 10),
- TextID = StringId.Functions,
- SelectedTextColor = CSS_Color.MainColor,
- TextColor = CSS_Color.PromptingColor1,
- TextSize = CSS_FontSize.HeadlineFontSize,
- TextAlignment = TextAlignment.Center,
- IsSelected = true,
- IsBold = true,
- };
- changeView.AddChidren(btnChangeFunction);
-
- Button btnLine = new Button()
- {
- X = btnChangeFunction.Right,
- Gravity = Gravity.CenterVertical,
- Width = Application.GetRealWidth(1),
- Height = Application.GetRealHeight(14),
- BackgroundColor = CSS_Color.PromptingColor1,
- };
- changeView.AddChidren(btnLine);
-
- var btnChangeScene = new Button()
- {
- X = btnLine.Right,
- Width = Application.GetRealWidth(114 - 10),
- TextID = StringId.Scenes,
- SelectedTextColor = CSS_Color.MainColor,
- TextColor = CSS_Color.PromptingColor1,
- TextSize = CSS_FontSize.TextFontSize,
- TextAlignment = TextAlignment.Center,
- };
- changeView.AddChidren(btnChangeScene);
-
- Button btnLine2 = new Button()
- {
- X = btnChangeScene.Right,
- Gravity = Gravity.CenterVertical,
- Width = Application.GetRealWidth(1),
- Height = Application.GetRealHeight(14),
- BackgroundColor = CSS_Color.PromptingColor1,
- };
- changeView.AddChidren(btnLine2);
-
- var btnChangeGroupControl = new Button()
- {
- X = btnLine2.Right,
- Width = Application.GetRealWidth(114 - 10),
- TextID = StringId.GroupControl,
- SelectedTextColor = CSS_Color.MainColor,
- TextColor = CSS_Color.PromptingColor1,
- TextSize = CSS_FontSize.TextFontSize,
- TextAlignment = TextAlignment.Center,
- };
- changeView.AddChidren(btnChangeGroupControl);
-
-
-
- btnChangeGroupControl.MouseUpEventHandler = (sender, e) => {
- btnChangeFunction.IsSelected = false;
- btnChangeFunction.TextSize = CSS.CSS_FontSize.TextFontSize;
- btnChangeFunction.IsBold = false;
- btnChangeScene.TextSize = CSS.CSS_FontSize.TextFontSize;
- btnChangeScene.IsSelected = false;
- btnChangeScene.IsBold = false;
- btnChangeGroupControl.IsSelected = true;
- btnChangeGroupControl.TextSize = CSS.CSS_FontSize.HeadlineFontSize;
- btnChangeGroupControl.IsBold = true;
- CurShowTypeContent = 2;
- contentView.PageIndex = 2;
- };
-
- btnChangeFunction.MouseUpEventHandler = (sender, e) => {
- btnChangeFunction.IsSelected = true;
- btnChangeFunction.TextSize = CSS.CSS_FontSize.HeadlineFontSize;
- btnChangeFunction.IsBold = true;
- btnChangeScene.TextSize = CSS.CSS_FontSize.TextFontSize;
- btnChangeScene.IsSelected = false;
- btnChangeScene.IsBold = false;
- CurShowTypeContent = 0;
- contentView.PageIndex = 0;
-
- btnChangeGroupControl.IsSelected = false;
- btnChangeGroupControl.TextSize = CSS.CSS_FontSize.TextFontSize;
- btnChangeGroupControl.IsBold = false;
- };
- btnChangeScene.MouseUpEventHandler = (sender, e) => {
- btnChangeScene.IsSelected = true;
- btnChangeScene.TextSize = CSS.CSS_FontSize.HeadlineFontSize;
- btnChangeScene.IsBold = true;
- btnChangeFunction.TextSize = CSS.CSS_FontSize.TextFontSize;
- btnChangeFunction.IsSelected = false;
- btnChangeFunction.IsBold = false;
- CurShowTypeContent = 1;
- contentView.PageIndex = 1;
-
- btnChangeGroupControl.IsSelected = false;
- btnChangeGroupControl.TextSize = CSS.CSS_FontSize.TextFontSize;
- btnChangeGroupControl.IsBold = false;
- };
-
- contentView.PageChange = (sender, e) =>
- {
- if (contentView.PageIndex == 0)
- {
- btnChangeFunction.IsSelected = true;
- btnChangeFunction.TextSize = CSS.CSS_FontSize.HeadlineFontSize;
- btnChangeFunction.IsBold = true;
- btnChangeScene.TextSize = CSS.CSS_FontSize.TextFontSize;
- btnChangeScene.IsSelected = false;
- btnChangeScene.IsBold = false;
- btnChangeGroupControl.IsSelected = false;
- btnChangeGroupControl.TextSize = CSS.CSS_FontSize.TextFontSize;
- btnChangeGroupControl.IsBold = false;
- }
- else if (contentView.PageIndex == 1)
- {
- btnChangeScene.IsSelected = true;
- btnChangeScene.TextSize = CSS.CSS_FontSize.HeadlineFontSize;
- btnChangeScene.IsBold = true;
- btnChangeFunction.TextSize = CSS.CSS_FontSize.TextFontSize;
- btnChangeFunction.IsSelected = false;
- btnChangeFunction.IsBold = false;
- btnChangeGroupControl.IsSelected = false;
- btnChangeGroupControl.TextSize = CSS.CSS_FontSize.TextFontSize;
- btnChangeGroupControl.IsBold = false;
- }
- else if (contentView.PageIndex == 2)
- {
- btnChangeFunction.IsSelected = false;
- btnChangeFunction.TextSize = CSS.CSS_FontSize.TextFontSize;
- btnChangeFunction.IsBold = false;
- btnChangeScene.TextSize = CSS.CSS_FontSize.TextFontSize;
- btnChangeScene.IsSelected = false;
- btnChangeScene.IsBold = false;
- btnChangeGroupControl.IsSelected = true;
- btnChangeGroupControl.TextSize = CSS.CSS_FontSize.HeadlineFontSize;
- btnChangeGroupControl.IsBold = true;
- }
- };
-
-
- }
- else
- {
var changeView = new FrameLayout()
{
//Y = Application.GetRealHeight(20) + topView.Bottom,
@@ -828,11 +494,10 @@
{
btnChangeFunction.IsSelected = true;
- btnChangeFunction.TextSize = CSS.CSS_FontSize.HeadlineFontSize;
btnChangeFunction.IsBold = true;
+ btnChangeFunction.TextSize = CSS.CSS_FontSize.HeadlineFontSize;
btnChangeScene.TextSize = CSS.CSS_FontSize.TextFontSize;
btnChangeScene.IsSelected = false;
- btnChangeScene.IsBold = false;
CurShowTypeContent = 0;
contentView.PageIndex = 0;
};
@@ -840,11 +505,10 @@
btnChangeScene.MouseUpEventHandler = (sender, e) =>
{
btnChangeScene.IsSelected = true;
- btnChangeScene.TextSize = CSS.CSS_FontSize.HeadlineFontSize;
btnChangeScene.IsBold = true;
+ btnChangeScene.TextSize = CSS.CSS_FontSize.HeadlineFontSize;
btnChangeFunction.TextSize = CSS.CSS_FontSize.TextFontSize;
btnChangeFunction.IsSelected = false;
- btnChangeFunction.IsBold = false;
CurShowTypeContent = 1;
contentView.PageIndex = 1;
};
@@ -855,25 +519,18 @@
{
btnChangeFunction.IsSelected = true;
btnChangeFunction.TextSize = CSS.CSS_FontSize.HeadlineFontSize;
- btnChangeFunction.IsBold = true;
btnChangeScene.TextSize = CSS.CSS_FontSize.TextFontSize;
btnChangeScene.IsSelected = false;
- btnChangeScene.IsBold = false;
}
else if (contentView.PageIndex == 1)
{
btnChangeScene.IsSelected = true;
btnChangeScene.TextSize = CSS.CSS_FontSize.HeadlineFontSize;
- btnChangeScene.IsBold = true;
btnChangeFunction.TextSize = CSS.CSS_FontSize.TextFontSize;
btnChangeFunction.IsSelected = false;
- btnChangeFunction.IsBold = false;
}
};
-
-
- }
contentView.PageIndex = CurShowTypeContent;
@@ -915,14 +572,6 @@
sceneFunctionView = new VerticalScrolViewLayout();
contentView.AddChidren(sceneFunctionView);
LoadSceneFunctionControlZone();
- if (DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl)
- {
- gcFunctionView = new VerticalScrolViewLayout();
- contentView.AddChidren(gcFunctionView);
- LoadGroupControlFunctionControlZone();
- }
-
- LoadEvent_ChangeShowedFunctionType();
// 鏌ヨ鏈娑堟伅骞舵樉绀�
GetUnreadPushMessages();
@@ -952,16 +601,6 @@
sceneFunctionView = new VerticalScrolViewLayout();
contentView.AddChidren(sceneFunctionView);
LoadSceneFunctionControlZone();
- if (DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl)
- {
- gcFunctionView = new VerticalScrolViewLayout();
- contentView.AddChidren(gcFunctionView);
- LoadGroupControlFunctionControlZone();
- }
- contentView.PageIndex = CurShowTypeContent;
-
-
- LoadEvent_ChangeShowedFunctionType();
// 鏌ヨ鏈娑堟伅骞舵樉绀�
GetUnreadPushMessages();
@@ -1021,28 +660,17 @@
};
rowView.AddChidren(functionView);
functionViews.Add(functionView);
- //缁垮缓浜哄眳鐜锛岀鎶�绯荤粺
- if (function.spk == SPK.AcstParent)
- {
- LoadAcstDiv(functionView, function);
- }
- else //鍏朵粬璁惧
- {
var btnbg = new Button()
{
+ //BackgroundColor = 0xBBFFFFFF,
+ //SelectedBackgroundColor = CSS_Color.MainColor,
UnSelectedImagePath = "Collection/Functionbg.png",
SelectedImagePath = "Collection/FunctionOnbg.png",
+ Radius = (uint)Application.GetRealWidth(24),
Tag = function.sid
};
functionView.AddChidren(btnbg);
LoadDeviceFunctionDiv(functionView, function);
-
- if (SPK.ArmSensorSpkList().Contains(function.spk))
- {
- btnbg.UnSelectedImagePath = "Collection/FunctionOnbg.png";
- btnbg.SelectedImagePath = "Collection/FunctionArmOnbg.png";
- }
- }
index++;
}
@@ -1083,91 +711,6 @@
/// <summary>
- /// 鍔犺浇缇ゆ帶鍔熻兘鏄剧ず鍖哄煙
- /// </summary>
- void LoadGroupControlFunctionControlZone()
- {
-
- #region ContextView
- gcFunctionView.RemoveAll();
- functionViews.Clear();
- var rowView = new FrameLayout();
- try
- {
- int index = 0;
- foreach (var function in FunctionList.List.groupControls)
- {
- if (index % 2 == 0)
- {
- rowView = new FrameLayout()
- {
- Height = Application.GetRealWidth(140),
- };
- gcFunctionView.AddChidren(rowView);
- }
- var functionView_X = Application.GetRealWidth((182 + 7) * (index % 2));
- if (index % 2 == 0)
- {
- functionView_X += Application.GetRealWidth(7);
- }
- var functionView = new FrameLayout()
- {
- X = functionView_X,
- Width = Application.GetRealWidth(182),
- Height = Application.GetRealWidth(140),
- Radius = (uint)Application.GetRealWidth(12),
- Tag = function.sid
- };
- rowView.AddChidren(functionView);
- functionViews.Add(functionView);
- var btnbg = new Button()
- {
- UnSelectedImagePath = "Collection/Functionbg.png",
- SelectedImagePath = "Collection/FunctionOnbg.png",
- Tag = function.sid
- };
- functionView.AddChidren(btnbg);
- LoadDeviceFunctionDiv(functionView, function);
-
- index++;
- }
-
- if (index == 0)
- {
- var view = new FrameLayout();
- gcFunctionView.AddChidren(view);
-
- var btnNoCollectionBg = new Button()
- {
- Y = Application.GetRealHeight(20),
- Gravity = Gravity.CenterHorizontal,
- Width = Application.GetRealWidth(180),
- Height = Application.GetRealWidth(180),
- UnSelectedImagePath = "Collection/NoCollectionBg.png",
- };
- view.AddChidren(btnNoCollectionBg);
-
- var btnNoCollectionTip = new Button()
- {
- Height = Application.GetRealHeight(42),
- Y = btnNoCollectionBg.Bottom,
- TextAlignment = TextAlignment.Center,
- TextColor = CSS_Color.PromptingColor1,
- TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- //TextID = StringId.TipNoFunctionCollcetion,
- };
- view.AddChidren(btnNoCollectionTip);
- }
- }
- catch (Exception ex)
- {
- MainPage.Log("homepage error : " + ex.Message);
- }
- gcFunctionView.AddChidren(new Button { Height = Application.GetRealHeight(30) });
- #endregion
- }
-
- /// <summary>
/// 鍔犺浇鍦烘櫙鍔熻兘鏄剧ず鍖哄煙
/// </summary>
void LoadSceneFunctionControlZone()
@@ -1204,12 +747,13 @@
Width = Application.GetRealWidth(164),
Height = Application.GetRealWidth(122),
Tag = scene.sid,
- BackgroundImagePath = scene.ImagePath,
+ Radius = (uint)Application.GetRealWidth(12),
+ BorderColor = 0x00000000,
+ BorderWidth = 1,
};
rowView.AddChidren(functionView);
//2020-12-03 淇敼鍥剧墖鍔犺浇鏂规硶
- ImageUtlis.Current.LoadLocalOrNetworkImages((scene as Scene).ImagePath, functionView);
LoadSceneFunctionDiv( functionView, scene);
index++;
@@ -1314,68 +858,8 @@
};
- if (function.spk == SPK.SenesorMegahealth || function.spk == SPK.SensorMmvPose)
- {
- btnIcon.UnSelectedImagePath = "FunctionIcon/Icon/HomeIcon/sensormegahealth.png";
- btnIcon.SelectedImagePath = "FunctionIcon/Icon/HomeIcon/sensormegahealth.png";
- btnName.TextColor = CSS_Color.MainBackgroundColor;
- btnZone.TextColor = CSS_Color.MainBackgroundColor;
- btnState.TextColor = CSS_Color.MainBackgroundColor;
-
- var tempStatus = function.attributes.Find((sta) => sta.key == FunctionAttributeKey.TargetStatus);
- if (tempStatus != null)
- {
- switch (tempStatus.state)
- {//0绌猴紝1璧帮紝2璺戯紝3鍧愶紝4璺屽�掞紝5绔�
- case "0":
- function.lastState = Language.StringByID(StringId.SensorNormalState);
- break;
- case "1":
- function.lastState = Language.StringByID(StringId.SomeoneIn);
- break;
- case "2":
- if (function.extSet.labModel)
- {
- function.lastState = Language.StringByID(StringId.SomeoneRunning);
- }
- else
- {
- function.lastState = Language.StringByID(StringId.Someone);
- }
- break;
- case "3":
- if (function.extSet.labModel)
- {
- function.lastState = Language.StringByID(StringId.SomeoneSitting);
- }
- else
- {
- function.lastState = Language.StringByID(StringId.Someone);
- }
- break;
- case "4":
- function.lastState = Language.StringByID(StringId.SomeoneFell);
- break;
- case "5":
- if (function.extSet.labModel)
- {
- function.lastState = Language.StringByID(StringId.SomeoneStanding);
- }
- else
- {
- function.lastState = Language.StringByID(StringId.Someone);
- }
- break;
- }
- btnState.Text = function.lastState;
- }
- }
-
- else
- {
btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_white.png";
- }
if (function.spk != SPK.LightSwitch)
{
@@ -1392,13 +876,7 @@
SelectedImagePath = "Collection/CollectionWhiteIcon.png",
UnSelectedImagePath = "Collection/CollectionIcon.png",
};
- if (function.spk != SPK.GroupControl)//缇ゆ帶榛樿鏄剧ず
view.AddChidren(btnCollection);
- //2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
- //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
- //{
- // view.AddChidren(btnCollection);
- //}
LoadEvent_FunctionCollection(btnCollection, function);
if (//SPK.CurtainSpkList().Contains(function.spk))
@@ -1435,136 +913,6 @@
LoadEvent_ControlCurtain(function, btnCurtainClose, btnCurtainOpen);
}
- else if (SPK.NotStatusSpkList.Contains(function.spk))
- {
- Button btnPower;
- btnPower = new Button()
- {
- X = Application.GetRealWidth(131),
- Y = Application.GetRealHeight(80),
- Width = Application.GetRealWidth(32),
- Height = Application.GetRealWidth(32),
- UnSelectedImagePath = "Public/PowerClose.png",
- SelectedImagePath = "Public/PowerOpen.png",
- };
- view.AddChidren(btnPower);
- LoadEvent_ControlTV(function, btnPower);
- }
-
- else if (function.spk == SPK.MusicStandard || function.spk == SPK.AvMusic)
- {
- btnIcon.UnSelectedImagePath = "FunctionIcon/Music/MusicIcon.png";
- btnIcon.SelectedImagePath = "FunctionIcon/Music/MusicOnIcon.png";
- //btnCollection.Visible = false;
- Button btnPower;
- btnPower = new Button()
- {
- X = Application.GetRealWidth(118),
- Y = Application.GetRealWidth(83),
- Width = Application.GetRealWidth(44),
- Height = Application.GetRealWidth(44),
- UnSelectedImagePath = "FunctionIcon/Music/MusicPlayIcon.png",
- SelectedImagePath = "FunctionIcon/Music/MusicPlayOnIcon.png",
- };
- view.AddChidren(btnPower);
-
- btnState.Text = function.GetAttrState("song_name");
-
- btnState.SelectedTextColor = CSS_Color.MainBackgroundColor;
- btnState.TextColor = CSS_Color.MainBackgroundColor;//PromptingColor1
-
- //Music.SendMethod.ReadStatus(a31player);
-
- btnPower.MouseUpEventHandler = (sender, e) =>
- {
-
- string status = "off";
- if (btnPower.IsSelected)
- {
- btnPower.IsSelected = false;
- status = "off";
- }
- else
- {
- btnPower.IsSelected = true;
- status = "on";
- }
- function.SetAttrState("on_off", status);
- Dictionary<string, string> dic = new Dictionary<string, string>();
- dic.Add("on_off", status);
- Music.SendMethod.Current.SendControlCommand(function, dic);
- };
- }
-
- else if (function.spk == SPK.ClothesHanger)
- {
- btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/ClothesHanger/ClothesHangerBlueIcon.png";
- btnIcon.SelectedImagePath = "FunctionIcon/Electrical/Curtain/ClothesHangerBlueIcon.png";
- Button btnUp;
- btnUp = new Button()
- {
- X = Application.GetRealWidth(84 + 3),
- Y = Application.GetRealWidth(89),
- Width = Application.GetRealWidth(38),
- Height = Application.GetRealWidth(38),
- UnSelectedImagePath = "FunctionIcon/Electrical/ClothesHanger/ClothesHangerUpIcon2.png",
- SelectedImagePath = "FunctionIcon/Electrical/ClothesHanger/ClothesHangerUpIcon2On.png",
- };
- view.AddChidren(btnUp);
-
- Button btnDown;
- btnDown = new Button()
- {
- X = btnUp.Right + Application.GetRealWidth(3),
- Y = Application.GetRealWidth(89),
- Width = Application.GetRealWidth(38),
- Height = Application.GetRealWidth(38),
- UnSelectedImagePath = "FunctionIcon/Electrical/ClothesHanger/ClothesHangerDownIcon2.png",
- SelectedImagePath = "FunctionIcon/Electrical/ClothesHanger/ClothesHangerDownIcon2On.png",
- };
- view.AddChidren(btnDown);
-
-
- LoadEvent_ControlClothesHanger(function, btnUp, btnDown);
-
- }
-
- else if (function.spk == SPK.SenesorMegahealth || function.spk == SPK.SensorMmvPose)
- {
- //btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}.png";
- //btnIcon.SelectedImagePath = "FunctionIcon/Icon/HomeIcon/sensormegahealth.png";
- //btnIcon.IsSelected = true;
- btnState.SelectedTextColor = CSS_Color.MainBackgroundColor;
- btnState.TextColor = CSS_Color.MainColor;//PromptingColor1
- }
-
- //绱ф�ユ眰鍔�
- else if (function.spk == SPK.SensorHelp)
- {
- btnName.TextColor = CSS_Color.MainBackgroundColor;
- btnName.SelectedTextColor = CSS_Color.MainBackgroundColor;
- btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_white.png";
- btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_white.png";
- }
- else if (function.spk == SPK.IpCam_Imou)
- {
- btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
- btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
- }
- else if (function.spk == SPK.VideoDoorLock)
- {
- btnIcon.UnSelectedImagePath = UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.GetVideoDoorLockIcon(UI2.FuntionControlView.VideoDoorLock.CommonMethod.Comerom.collect);
- //btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
- }
- //else if (function.spk == SPK.GroupControl)
- //{
- // btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/lightswitch_blue.png";
- // btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/lightswitch_white.png";
- //}
- else if (function.spk == SPK.ElectricEnergy || function.spk == SPK.AirSwitch || function.spk == SPK.AirSwitchP3)
- {
-
- }
else
{
Button btnSwitch;
@@ -1599,32 +947,15 @@
};
- var skipControlPageEvent = new PublicAssmebly().LoadEvent_SkipFunctionControlPage(function, btnCollection, btnName, btnZone, UI2.FuntionControlView.VideoDoorLock.CommonMethod.Comerom.collect,()=> {
+ var skipControlPageEvent = new PublicAssmebly().LoadEvent_SkipFunctionControlPage(function, btnCollection, btnName, btnZone, ()=> {
this.LoadDeviceFunctionControlZone();//鍒犻櫎璁惧鍚庨噸鏂板埛鏂癠I
});
view.MouseUpEventHandler = skipControlPageEvent;
btnName.MouseUpEventHandler = skipControlPageEvent;
btnIcon.MouseUpEventHandler = skipControlPageEvent;
btnState.MouseUpEventHandler = skipControlPageEvent;
- //涓嶉渶瑕佹洿鏂扮姸鎬佺殑鍔熻兘鍒楄〃
- if(!SPK.NotStatusSpkList.Contains(function.spk) || function.spk != SPK.IpCam_Imou)
- {
- UpdataFunctionStates(function);
- }
- var btnOffline = new Button()
- {
- X = btnIcon.Right,
- Y = Application.GetRealWidth(16),
- Height = Application.GetMinRealAverage(32),
- TextID = StringId.DeviceOffline,
- TextColor = CSS_Color.WarningColor,
- TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- TextAlignment = TextAlignment.CenterLeft,
- Tag = "OnlineTag",
- Visible = !function.isOnline()
- };
- view.AddChidren(btnOffline);
+
}
catch (Exception ex)
@@ -1632,97 +963,6 @@
MainPage.Log("homepage LoadControlView error : " + ex.Message);
}
}
- /// <summary>
- /// 鍔犺浇缁垮缓绉戞妧绯荤粺鍗＄墖
- /// </summary>
- void LoadAcstDiv(FrameLayout view1, Function function)
- {
- var view = new FrameLayout()
- {
- X = Application.GetRealWidth(10),
- Y = Application.GetRealHeight(5),
- Width = Application.GetRealWidth(160),
- Height = Application.GetRealHeight(105),
- BackgroundColor = CSS_Color.MainBackgroundColor,
- Radius = (uint)Application.GetRealWidth(15),
- };
- view1.AddChidren(view);
-
- Button btnName;
- btnName = new Button()
- {
- X = Application.GetRealWidth(11),
- Y = Application.GetRealWidth(10),
- TextID = StringId.Acst,
- IsBold = true,
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextSize = CSS_FontSize.TextFontSize,
- Height = Application.GetRealWidth(24),
- Width = Application.GetRealWidth(140),
- TextAlignment = TextAlignment.CenterLeft,
- };
- view.AddChidren(btnName);
-
- var btnLogo = new Button()
- {
- Y = Application.GetRealHeight(65),
- UnSelectedImagePath = "FunctionIcon/Acst/LvJianLogo.png",
- SelectedImagePath = "FunctionIcon/Acst/LvJianLogo.png",
- Width = Application.GetRealWidth(80),
- Height = Application.GetRealHeight(37),
- };
- view.AddChidren(btnLogo);
-
- Button btnFunctionViewBg;
- btnFunctionViewBg = new Button()
- {
- Height = Application.GetRealWidth(100),
- Width = Application.GetRealWidth(102),
- UnSelectedImagePath = "FunctionIcon/FunctionBg/AcstFunctionBg.png",
- };
- view.AddChidren(btnFunctionViewBg);
- btnFunctionViewBg.MouseUpEventHandler = (sender, e) => {
- var page = new AcstParentPage();
- MainPage.BasePageView.AddChidren(page);
- page.LoadPage();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- };
-
-
- //Button btnAcstPower = new Button()
- //{
- // X = Application.GetRealWidth(115),
- // Y = Application.GetRealHeight(70),
- // Width = Application.GetRealWidth(32),
- // Height = Application.GetRealWidth(32),
- // SelectedImagePath = "Public/PowerOpen.png",
- // UnSelectedImagePath = "Public/PowerClose.png",
- // IsSelected = function.trait_on_off.curValue.ToString() == "on",
- //};
- //view.AddChidren(btnAcstPower);
- //btnAcstPower.MouseUpEventHandler = (sender, e) => {
- // btnAcstPower.IsSelected = !btnAcstPower.IsSelected;
- // new System.Threading.Thread(() =>
- // {
- // string onoff = btnAcstPower.IsSelected ? "on" : "off";
- // Dictionary<string, string> d = new Dictionary<string, string>();
- // d.Add(FunctionAttributeKey.OnOff, onoff);
- // foreach (var temp in FunctionList.List.GetAcstParentList())
- // {
- // Control.Ins.SendWriteCommand(temp, d);
- // }
- // })
- // { IsBackground = true }.Start();
- //};
-
-
-
-
- }
-
-
-
-
/// <summary>
/// 鍔犺浇鍦烘櫙鎺у埗鍗＄墖
@@ -1731,9 +971,21 @@
{
try
{
+ var btnSceneGg = new ImageView()
+ {
+ Radius = (uint)Application.GetRealWidth(12),
+ BorderColor = 0x00000000,
+ BorderWidth = 1,
+ };
+ view.AddChidren(btnSceneGg);
+ ImageUtlis.Current.LoadLocalOrNetworkImages((scene as Scene).ImagePath, btnSceneGg);
+
+
Button btnCoverd = new Button()
{
- UnSelectedImagePath = "Collection/SceneCovered.png",
+ //UnSelectedImagePath = "Collection/SceneCovered.png",
+ Radius = (uint)Application.GetRealWidth(12),
+ BackgroundColor = 0x44000000,
};
view.AddChidren(btnCoverd);
@@ -1825,9 +1077,8 @@
{
btnName.Text = scene.name;
btnZone.Text = scene.GetRoomListName();
- //view.BackgroundImagePath = (scene as Scene).ImagePath;
//2020-12-03 淇敼鍥剧墖鍔犺浇鏂规硶
- ImageUtlis.Current.LoadLocalOrNetworkImages((scene as Scene).ImagePath, view);
+ ImageUtlis.Current.LoadLocalOrNetworkImages(scene.ImagePath, btnSceneGg);
};
var aep = new SceneEditPage(scene, backAction);
MainPage.BasePageView.AddChidren(aep);
--
Gitblit v1.8.0