Merge remote-tracking branch 'origin/wxr4' into dev-tzy

tzy

2021-05-14 ee5f2543624a0e3ae9d046062b822727a31685e1

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

@@ -87,7 +87,7 @@
        /// <param name="i_hour">默认选择时</param>

        /// <param name="i_minute">默认选择分</param>

        /// <param name="contentView">选择区域高度</param>

        public void InitControl(int i_hour, int i_minute, int contentView = 297)

        public void InitControl(int i_hour, int i_minute,int contentView = 297,bool isHour = true)

        {

            //已经初始化

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

@@ -114,7 +114,7 @@
            base.btnConfirm.ButtonClickEvent += (sender, e) =>

            {

                //有选择了才能点确认

                if (selectHour != 0 || selectMinute != 0)

                //if (selectHour != 0 || selectMinute != 0)

                {

                    base.Close();

                    this.FinishEvent?.Invoke(1, selectHour, selectMinute);

@@ -134,6 +134,13 @@
            var strhour = HdlCommonLogic.Current.GetHourText();

            //分

            var strMinute = HdlCommonLogic.Current.GetMinuteText();

            
            if(!isHour)

            {

                strhour = Language.StringByID(StringId.m);

                strMinute = Language.StringByID(StringId.s);

            }



            //XX时

            listHour = new List<string>();// { "00" + strhour };

            //XX分

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



        /// <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 ■ 一般方法___________________________