From ee5f2543624a0e3ae9d046062b822727a31685e1 Mon Sep 17 00:00:00 2001
From: tzy <hxb@hdlchina.com.cn>
Date: 星期五, 14 五月 2021 17:15:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wxr4' into dev-tzy
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 75aaa60..544fcaa 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -491,6 +491,10 @@
case ShowFunction.Music:
functionCount = Music.A31MusicModel.A31MusicModelList.Count;
functionOnCount = Music.A31MusicModel.A31MusicModelList.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
+ if(functionCount == 0)
+ {
+ functionCount = FunctionList.List.GetMusicList().Count;
+ }
break;
case ShowFunction.Panel:
break;
@@ -507,6 +511,7 @@
}
break;
case ShowFunction.SecurityCenter:
+ functionCount = FunctionList.List.securities.Count;
#if DEBUG
functionCount = 1;
#endif
@@ -816,6 +821,16 @@
videoMethod.MianView(this,FunctionList.List.videoIntercom);
};
break;
+ case ShowFunction.SecurityCenter:
+ btnName.TextID = StringId.SecurityCenter;
+ btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
+ {
+ var page = new ArmCenterPage();
+ MainPage.BasePageView.AddChidren(page);
+ page.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+ break;
}
//鐣岄潰璺宠浆--闊充箰璺宠浆鑷繁鐨勭晫闈�--鐜璺宠浆鑷繁鐨勭晫闈�
@@ -842,7 +857,7 @@
#endregion
}
-#region 鍒囨崲妤煎眰
+ #region 鍒囨崲妤煎眰
/// <summary>
/// 妤煎眰鏄剧ず鍒囨崲
/// </summary>
@@ -999,6 +1014,6 @@
{
}
-#endregion
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.8.0