Merge branch 'wxr4' into dev-tzy

wxr

2021-06-09 cb6e11c5067ecaba4d8f9907989154167c1e8943

 HDL_ON/UI/UI0-Stan/Controls/BottomControls/BottomTimeSelectControl.cs

@@ -7,7 +7,7 @@
namespace HDL_ON.Stan

{

    /// <summary>

    /// 底部时间选择控件(时和分),不需要加到父控件

    /// 底部时间选择控件

    /// </summary>

    public class BottomTimeSelectControl : BottomDialogCommon

    {

@@ -43,7 +43,7 @@
        #region ■ 初始化_____________________________



        /// <summary>

        /// 底部时间选择控件(时和分),不需要加到父控件

        /// 底部时间选择控件

        /// </summary>

        /// <param name="i_title">标题</param>

        /// <param name="clickBackClose">点击背景时,是否关闭弹窗</param>

@@ -51,7 +51,7 @@
        {

            base.ClickBackClose = clickBackClose;

            base.StrTitle = i_title;

            base.RowCount = 5;




            for (int i = 0; i <= 23; i++)

            {

@@ -65,7 +65,7 @@




        /// <summary>

        /// 底部时间选择控件(时和分),不需要加到父控件

        /// 底部时间选择控件

        /// </summary>

        /// <param name="i_title">标题</param>

        /// <param name="clickBackClose">点击背景时,是否关闭弹窗</param>

@@ -92,15 +92,9 @@
            //已经初始化

            if (base.btnCancel != null) { return; }



            this.selectHour = i_hour;

            this.selectMinute = i_minute;



            //初始化底层控件

            var frameWhiteBack = base.InitBaseControl();

            if (contentView != -1)

            {

                frameWhiteBack.Height = Application.GetRealHeight(contentView);

            }

            //frameWhiteBack.Y = frameWhiteBack.Parent.Height - Application.GetRealHeight(297 + 20);



            //取消

@@ -131,9 +125,9 @@
            //时间控件

            pickerView = new UIPickerView();

            //时

            var strhour = HdlCommonLogic.Current.GetHourText();

            var strhour = Language.StringByID(StringId.h);

            //分

            var strMinute = HdlCommonLogic.Current.GetMinuteText();

            var strMinute = Language.StringByID(StringId.m);

            

            if(!isHour)

            {

@@ -194,7 +188,7 @@
                    value2 = 0;

                    pickerView.setCurrentItems(value1, value2, 0);

                }

                else

                //else
                {

                    //更改索引

                    selectHour = Convert.ToInt32(listHour[value1].Substring(0, 2));

@@ -203,31 +197,6 @@
            };

        }



        /// <summary>

        /// 特殊的集合选择事件，场景时间设置使用

        /// </summary>

        public void ChangePickerEvent2()

        {

            pickerView.OnSelectChangeEvent = (value1, value2, value3) =>

            {

                if (value1 == 60 && value2 == 60)

                {

                    value2 = 0;

                    pickerView.setCurrentItems(value1, value2, 0);

                }

                //else if (value1 == 4 && value2 == 1)

                //{

                //    value2 = 0;

                //    pickerView.setCurrentItems(value1, value2, 0);

                //}

                //else

                //{

                //    //更改索引

                //    selectHour = Convert.ToInt32(listHour[value1].Substring(0, 2));

                //    selectMinute = Convert.ToInt32(listMinute[value2].Substring(0, 2));

                //}

            };

        }

        #endregion



        #region ■ 一般方法___________________________