Merge remote-tracking branch 'origin/WJC' into NewFilePath

wei

2020-12-23 35c4bc03ee8da50317cd3f33e9f52f0a4259affd

 HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/brightnessView.cs

@@ -122,12 +122,17 @@
        /// <summary>
        /// View的方法
        /// </summary>
        /// <param name="fLayout">父控件</param>
        /// <param name="frame">父控件</param>
        /// <param name="titleName">标题名称</param>
        /// <param name="stateValue">之前状态值</param>
        /// <param name="action">返回回调</param>
        public void FLayoutView(FrameLayout fLayout, string titleName,string stateValue, Action<string> action)
        public void FLayoutView(FrameLayout frame, string titleName,string stateValue, Action<string> action)
        {
            FrameLayout fLayout = new FrameLayout
            {
                BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
            };
            frame.AddChidren(fLayout);
            fLayout.AddChidren(frameLayout);
            frameLayout.AddChidren(btnTitle);
            frameLayout.AddChidren(btnCancel);
@@ -145,8 +150,8 @@
                try
                {
                    //进来的状态
                    brightnesValue = int.Parse(stateValue);
                    seekBarVol.Progress = int.Parse(stateValue);
                    brightnesValue = int.Parse(stateValue.Replace("%", ""));
                    seekBarVol.Progress = brightnesValue;
                }
                catch { }
            }