From 70d2b7cd0c8fe5dfb29bb2baf96997575ade2bac Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 08 七月 2021 18:34:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/newBranch1' into WJC

---
 HDL_ON/UI/UI2/FuntionControlView/Video/View/FrameLayout50.cs |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/View/FrameLayout50.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/View/FrameLayout50.cs
index 53c9190..fa8d245 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/View/FrameLayout50.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/View/FrameLayout50.cs
@@ -8,10 +8,10 @@
         /// <summary>
         /// 涓绘帶浠禫iew
         /// </summary>
-        public RowLayout frameLayout = new RowLayout
+        public FrameLayout frameLayout = new FrameLayout
         {
             Height = Application.GetRealHeight(50),
-            LineColor = CSS.CSS_Color.view,
+            // BackgroundColor = CSS.CSS_Color.view,
         };
         /// <summary>
         /// 鏂囨湰鎻忚堪
@@ -36,7 +36,7 @@
         /// View鐨勬柟娉�
         /// </summary>
         /// <returns></returns>
-        public RowLayout FLayoutView()
+        public FrameLayout FLayoutView()
         {
             frameLayout.AddChidren(btnText);
             frameLayout.AddChidren(btnClick);

--
Gitblit v1.8.0