From cbc156bc38d8b8eae7aef60cb186ab2b52fa701f Mon Sep 17 00:00:00 2001 From: wxr <wxr@hdlchina.com.cn> Date: 星期二, 16 七月 2024 13:59:56 +0800 Subject: [PATCH] 增加全部挂断 --- HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 796 +++++++++++++++++++++++++++++++++++++------------------- 1 files changed, 528 insertions(+), 268 deletions(-) diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs index a7fd938..9c4f0e5 100644 --- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs +++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs @@ -30,7 +30,7 @@ /// <summary> /// 杩炴帴鐘舵�佹彁绀� /// </summary> - Button btnLinkStateTip; + FrameLayout divLinkStateTip; /// <summary> /// 瀹夐槻鐘舵�佸浘鏍� /// </summary> @@ -70,19 +70,20 @@ /// <summary> /// 鍒囨崲鏄剧ず鍔熻兘绫诲瀷鍖哄煙 /// </summary> - FrameLayout changeView; - /// <summary> - /// 鍒囨崲鏄剧ず璁惧鍔熻兘鎸夐挳 - /// </summary> - Button btnChangeFunction; - /// <summary> - /// 鍒囨崲鏄剧ず鍦烘櫙鍔熻兘鎸夐挳 - /// </summary> - Button btnChangeScene; - /// <summary> - /// 鍒囨崲鏄剧ず鍦虹粍鎺ф寜閽� - /// </summary> - Button btnChangeGroupControl; + FrameLayout changeBaseView; + //FrameLayout changeView; + ///// <summary> + ///// 鍒囨崲鏄剧ず璁惧鍔熻兘鎸夐挳 + ///// </summary> + //Button btnChangeFunction; + ///// <summary> + ///// 鍒囨崲鏄剧ず鍦烘櫙鍔熻兘鎸夐挳 + ///// </summary> + //Button btnChangeScene; + ///// <summary> + ///// 鍒囨崲鏄剧ず鍦虹粍鎺ф寜閽� + ///// </summary> + //Button btnChangeGroupControl; /// <summary> /// 鍔熻兘鏄剧ず鍖哄煙 /// </summary> @@ -116,11 +117,11 @@ #endregion #region 鎶ヨ淇℃伅 - Button btnMsgBg; - Button btnMsgTime; - Button btnMsg; + //Button btnMsgBg; + //Button btnMsgTime; + //Button btnMsg; Button btnMsgIcon; -#endregion + #endregion public HomePage() { @@ -164,14 +165,14 @@ }; topView = new FrameLayout() { - Height = Application.GetRealHeight(216), + Height = Application.GetRealHeight(113),//216), BackgroundImagePath = DB_ResidenceData.Instance.residenceImage, }; bodyView.AddChidren(topView); #else VerticalRefreshLayout refreshLayout = new VerticalRefreshLayout() { - Height = Application.GetRealHeight(216), + Height = Application.GetRealHeight(113),//216), BackgroundImagePath = DB_ResidenceData.Instance.residenceImage, }; bodyView.AddChidren(refreshLayout); @@ -184,7 +185,7 @@ }; topView = new FrameLayout() { - Height = Application.GetRealHeight(216), + Height = Application.GetRealHeight(113),//216), }; refreshLayout.AddChidren(topView); #endif @@ -212,69 +213,35 @@ IsBold = true }; topView.AddChidren(btnResidenceName); - btnLinkStateTip = new Button() + + divLinkStateTip = new FrameLayout() { - //X = Application.GetRealWidth(16), - Y = btnResidenceName.Bottom, - Height = Application.GetRealWidth(14), - //BackgroundColor = CSS_Color.LinkTipFail, - TextAlignment = TextAlignment.Center, + Y = Application.GetRealHeight(113) - Application.GetRealWidth(24), + Height = Application.GetRealWidth(24), + BackgroundColor = 0xFFFF4747, + Visible = false, + }; + topView.AddChidren(divLinkStateTip); + Button btnLinkStateIcon = new Button() + { + X = Application.GetRealWidth(16), + Gravity = Gravity.CenterVertical, + Width = Application.GetRealWidth(20), + Height = Application.GetRealWidth(20), + UnSelectedImagePath = "Collection/GatewayOnlineTipIcon.png" + }; + divLinkStateTip.AddChidren(btnLinkStateIcon); + + var btnLinkStateTip = new Button() + { + X = btnLinkStateIcon.Right + Application.GetRealWidth(4), + TextAlignment = TextAlignment.CenterLeft, TextSize = CSS_FontSize.PromptFontSize_FirstLevel, TextColor = CSS_Color.MainBackgroundColor, + TextID = StringId.NetworkAnomaly, }; - topView.AddChidren(btnLinkStateTip); - //btnLinkStateTip.Width = btnLinkStateTip.GetTextWidth(); + divLinkStateTip.AddChidren(btnLinkStateTip); //鏇存柊閾炬帴鐘舵�乮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, @@ -477,7 +444,7 @@ SelectedImagePath = "Collection/DefenseStatusIcon.png", UnSelectedImagePath = "Collection/DisarmStatusIcon.png" }; - if (DB_ResidenceData.Instance.GatewayType == 1) + if (DB_ResidenceData.Instance.GatewayType == 1 && !DB_ResidenceData.Instance.CurrentRegion.isOtherShare) { topView.AddChidren(btnSecurityStatus); @@ -508,57 +475,61 @@ #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); + //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); + //btnMsgBg = new Button() + //{ + // BackgroundColor = CSS_Color.MainColor,//0x3F4484F4, + // Alpha = 0.4f, + //}; + //msgView.AddChidren(btnMsgBg); btnMsgIcon = new Button() { - X = Application.GetRealWidth(12), - Gravity = Gravity.CenterVertical, + X = Application.GetRealWidth(290), + Y = Application.GetRealHeight(35), Width = Application.GetMinRealAverage(24), Height = Application.GetMinRealAverage(24), UnSelectedImagePath = "Collection/MsgIcon.png", SelectedImagePath = "Collection/MsgIconTip.png", }; - msgView.AddChidren(btnMsgIcon); - - - btnMsg = new Button() + if(btnSecurityStatus.Parent == null) { - 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); + btnMsgIcon.X = Application.GetRealWidth(329); + } + topView.AddChidren(btnMsgIcon); - 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); + //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); LoadEvent_GotoMessageCenterPage(); @@ -570,140 +541,29 @@ bodyView.AddChidren(new Button() { Height = Application.GetRealHeight(20), BackgroundColor = 0x00000000 }); - if (DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl) - { - changeView = new FrameLayout() - { - //Y = Application.GetRealHeight(20) + topView.Bottom, - Gravity = Gravity.CenterHorizontal, - Width = Application.GetRealWidth(334), - Height = Application.GetRealHeight(62), - BackgroundImagePath = "Collection/ChangeViewbg.png", - }; - bodyView.AddChidren(changeView); + loadNavView(); - 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); - - 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); - - 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); - } - else - { - changeView = new FrameLayout() - { - //Y = Application.GetRealHeight(20) + topView.Bottom, - Gravity = Gravity.CenterHorizontal, - Width = Application.GetRealWidth(230), - Height = Application.GetRealHeight(62), - BackgroundImagePath = "Collection/ChangeViewbg.png", - }; - bodyView.AddChidren(changeView); - - 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); - - 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); - } #endregion #region ContextView - contentView = new PageLayout() - { - //Y = changeView.Bottom, - Height = Application.GetRealHeight(310 + 30 + 10), //20涓鸿秴鍑洪儴鍒� - IsShowPoint = false, - }; - bodyView.AddChidren(contentView); + functionViews = new List<FrameLayout>(); LoadContentView(); #endregion + +#if DEBUG + btnResidenceName.MouseUpEventHandler = (envent, ee) => { + MainPage.Log("sss"); + new System.Threading.Thread(async() => + { + await Common.AliyunLog.AliyunLogClient.PostLogs("鍛婅娴嬭瘯", "娴嬭瘯淇℃伅娴嬭瘯淇℃伅娴嬭瘯淇℃伅娴嬭瘯淇℃伅娴嬭瘯淇℃伅娴嬭瘯淇℃伅娴嬭瘯淇℃伅娴嬭瘯淇℃伅娴嬭瘯淇℃伅娴嬭瘯淇℃伅娴嬭瘯淇℃伅娴嬭瘯淇℃伅娴嬭瘯淇℃伅"); + }) + { IsBackground = true }.Start(); + }; +#endif } catch (Exception ex) { @@ -712,6 +572,295 @@ } + + void loadNavView() + { + if(changeBaseView == null) + { + changeBaseView = new FrameLayout() + { + Gravity = Gravity.CenterHorizontal, + Height = Application.GetRealHeight(62), + }; + bodyView.AddChidren(changeBaseView); + } + else + { + changeBaseView.RemoveAll(); + } + + if (contentView == null) + { + contentView = new PageLayout() + { + Height = Application.GetRealHeight(310 + 30 + 10 + 100), //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, + Gravity = Gravity.CenterHorizontal, + Width = Application.GetRealWidth(230), + 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); + + + 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; + }; + + 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; + }; + + 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; + } + 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; + + } + /// <summary> /// 鍔犺浇鍐呭鍖哄煙 /// </summary> @@ -736,8 +885,10 @@ { if (contentView == null) { + waitPage.Hide(); return; } + loadNavView(); contentView.RemoveAll(); deviceFunctionView = new VerticalScrolViewLayout(); contentView.AddChidren(deviceFunctionView); @@ -745,7 +896,6 @@ sceneFunctionView = new VerticalScrolViewLayout(); contentView.AddChidren(sceneFunctionView); LoadSceneFunctionControlZone(); - contentView.PageIndex = CurShowTypeContent; if (DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl) { gcFunctionView = new VerticalScrolViewLayout(); @@ -759,6 +909,7 @@ GetUnreadPushMessages(); RegisterGetPushMessageAction(); + contentView.PageIndex = CurShowTypeContent; if (waitPage != null) { waitPage.RemoveFromParent(); @@ -819,11 +970,11 @@ foreach (var function in list) { //闊充箰妯″潡鏈変富浠庡叧绯伙紝闇�瑕佺壒娈婂鐞� - if (SPK.MusicSpkList().Contains( function.spk)) - { - continue; - } - else + //if (SPK.MusicSpkList().Contains( function.spk)) + //{ + // continue; + //} + //else { if (!function.collect) continue; @@ -917,9 +1068,9 @@ /// </summary> void LoadGroupControlFunctionControlZone() { + #region ContextView gcFunctionView.RemoveAll(); - functionViews.Clear(); var rowView = new FrameLayout(); try { @@ -964,7 +1115,7 @@ if (index == 0) { var view = new FrameLayout(); - deviceFunctionView.AddChidren(view); + gcFunctionView.AddChidren(view); var btnNoCollectionBg = new Button() { @@ -1143,7 +1294,8 @@ }; - if (function.spk == SPK.SenesorMegahealth || function.spk == SPK.SensorMmvPose) + if (function.spk == SPK.SenesorMegahealth || function.spk == SPK.SensorMmvPose || + function.spk == SPK.SensorPir || function.spk == SPK.SensorPirHold) { btnIcon.UnSelectedImagePath = "FunctionIcon/Icon/HomeIcon/sensormegahealth.png"; btnIcon.SelectedImagePath = "FunctionIcon/Icon/HomeIcon/sensormegahealth.png"; @@ -1157,7 +1309,7 @@ switch (tempStatus.state) {//0绌猴紝1璧帮紝2璺戯紝3鍧愶紝4璺屽�掞紝5绔� case "0": - function.lastState = Language.StringByID(StringId.SensorNormalState); + function.lastState = Language.StringByID(StringId.wuren); break; case "1": function.lastState = Language.StringByID(StringId.SomeoneIn); @@ -1198,8 +1350,49 @@ } btnState.Text = function.lastState; } + else + { + tempStatus = function.attributes.Find((sta) => sta.key == "people_status"); + if (tempStatus != null) + { + switch (tempStatus.state) + { + case "true": + function.lastState = Language.StringByID(StringId.Someone); + break; + case "false": + function.lastState = Language.StringByID(StringId.wuren); + break; + } + btnState.Text = function.lastState; + } + } + } - + + else if(function.spk == SPK.SensorDryContact || function.spk == SPK.SensorDryContact2) + { + btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_white.png"; + btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_white.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.ContactStatus); + if (tempStatus != null) + { + switch (tempStatus.state) + { + case "open": + function.lastState = Language.StringByID(StringId.DryBreak); + break; + case "close": + function.lastState = Language.StringByID(StringId.Shut); + break; + } + btnState.Text = function.lastState; + } + } + else { btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png"; @@ -1233,7 +1426,8 @@ if (//SPK.CurtainSpkList().Contains(function.spk)) function.spk == SPK.CurtainRoller || function.spk == SPK.CurtainShades || function.spk == SPK.CurtainDream || - function.spk == SPK.CurtainSwitch || function.spk == SPK.CurtainTrietex) + function.spk == SPK.CurtainSwitch || function.spk == SPK.CurtainTrietex + ) { btnIcon.UnSelectedImagePath = "FunctionIcon/Curtain/CurtainIcon.png"; btnIcon.SelectedImagePath = "FunctionIcon/Curtain/CurtainOnIcon.png"; @@ -1248,6 +1442,7 @@ SelectedImagePath = "FunctionIcon/Curtain/CurtainCloseWhiteIcon_Shadow.png", }; view.AddChidren(btnCurtainClose); + Button btnCurtainOpen; btnCurtainOpen = new Button() @@ -1284,7 +1479,7 @@ { btnIcon.UnSelectedImagePath = "FunctionIcon/Music/MusicIcon.png"; btnIcon.SelectedImagePath = "FunctionIcon/Music/MusicOnIcon.png"; - btnCollection.Visible = false; + //btnCollection.Visible = false; Button btnPower; btnPower = new Button() { @@ -1298,7 +1493,7 @@ view.AddChidren(btnPower); btnState.Text = function.GetAttrState("song_name"); - + btnState.Width = Application.GetRealWidth(90); btnState.SelectedTextColor = CSS_Color.MainBackgroundColor; btnState.TextColor = CSS_Color.MainBackgroundColor;//PromptingColor1 @@ -1358,13 +1553,13 @@ } - else if (function.spk == SPK.SenesorMegahealth || function.spk == SPK.SensorMmvPose) + //else if (function.spk == SPK.SenesorMegahealth || function.spk == SPK.SensorMmvPose) + else if (SPK.ArmSensorSpkList().Contains(function.spk)) { - //btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}.png"; - //btnIcon.SelectedImagePath = "FunctionIcon/Icon/HomeIcon/sensormegahealth.png"; - //btnIcon.IsSelected = true; + btnName.TextColor = CSS_Color.MainBackgroundColor; + btnZone.TextColor = CSS_Color.MainBackgroundColor; btnState.SelectedTextColor = CSS_Color.MainBackgroundColor; - btnState.TextColor = CSS_Color.MainColor;//PromptingColor1 + btnState.TextColor = CSS_Color.MainBackgroundColor; } //绱ф�ユ眰鍔� @@ -1385,11 +1580,76 @@ 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.AvZkAiks) + { + //涓轰簡鍘绘帀寮�鍏虫寜閽� + btnIcon.UnSelectedImagePath = "AksIcon/yingyinzhongkong1.png"; + } + else if (function.spk == SPK.GroupControl) + { + btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png"; + btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_white.png"; + if (function.spk == SPK.GroupControl) + { + Button btnClose; + Button btnOpen; + btnOpen = new Button() + { + X = Application.GetRealWidth(84), + Y = Application.GetRealWidth(89), + Width = Application.GetRealWidth(40), + Height = Application.GetRealWidth(40), + UnSelectedImagePath = "FunctionIcon/Light/LightScene/gp_all_on_home.png", + SelectedImagePath = "FunctionIcon/Light/LightScene/gp_all_on_home_click.png", + }; + view.AddChidren(btnOpen); + + + btnClose = new Button() + { + X = btnOpen.Right, + Y = Application.GetRealWidth(89), + Width = Application.GetRealWidth(40), + Height = Application.GetRealWidth(40), + UnSelectedImagePath = "FunctionIcon/Light/LightScene/gp_all_off_home.png", + SelectedImagePath = "FunctionIcon/Light/LightScene/gp_all_off_home_click.png", + }; + view.AddChidren(btnClose); + + + btnClose.MouseDownEventHandler = (sender, e) => { + btnClose.IsSelected = true; + }; + + btnClose.MouseUpEventHandler = (sender, e) => { + btnClose.IsSelected = false; + if (function.spk == SPK.GroupControl) + { + var d = new Dictionary<string, string>(); + d.Add("on_off", "off"); + (function as GroupControl).Control(d); + } + }; + btnOpen.MouseDownEventHandler = (sender, e) => { + btnOpen.IsSelected = true; + }; + btnOpen.MouseUpEventHandler = (sender, e) => { + btnOpen.IsSelected = false; + if (function.spk == SPK.GroupControl) + { + var d = new Dictionary<string, string>(); + d.Add("on_off", "on"); + (function as GroupControl).Control(d); + } + }; + + + } + } + else if (function.spk == SPK.ElectricEnergy || function.spk == SPK.AirSwitch || function.spk == SPK.AirSwitchP3) + { + + } else { Button btnSwitch; @@ -1431,7 +1691,7 @@ btnName.MouseUpEventHandler = skipControlPageEvent; btnIcon.MouseUpEventHandler = skipControlPageEvent; btnState.MouseUpEventHandler = skipControlPageEvent; - //涓嶉渶瑕佹洿鏂扮姸鎬佺殑鍔ㄨ兘鍒楄〃 + //涓嶉渶瑕佹洿鏂扮姸鎬佺殑鍔熻兘鍒楄〃 if(!SPK.NotStatusSpkList.Contains(function.spk) || function.spk != SPK.IpCam_Imou) { UpdataFunctionStates(function); @@ -1447,7 +1707,7 @@ TextSize = CSS_FontSize.PromptFontSize_FirstLevel, TextAlignment = TextAlignment.CenterLeft, Tag = "OnlineTag", - Visible = !function.online + Visible = !function.isOnline() }; view.AddChidren(btnOffline); -- Gitblit v1.8.0