Merge branch 'Dev-Branch' into wjc

mac

2023-10-12 0726154a7663e206e289e62f3f3fd7da4137a361

 HDL_ON/UI/UI2/FuntionControlView/Light/ColorfulInfoPage.cs

@@ -274,8 +274,8 @@
            var time = Convert.ToInt32( function.GetAttrState(FunctionAttributeKey.ColorfulTime));


            btnWorkHours.Text = time/ 360 + Language.StringByID(StringId.h);
            btnWorkHours.Text += time / 60 + Language.StringByID(StringId.m);
            //btnWorkHours.Text = time/ 360 + Language.StringByID(StringId.h);
            btnWorkHours.Text = time / 60 + Language.StringByID(StringId.m);
            btnWorkHours.Text += time % 60 + Language.StringByID(StringId.s);

            var waitPage = new Loading();
@@ -297,8 +297,8 @@
                                    new PublicAssmebly().TipMsg(StringId.Tip, StringId.TimeInvalid);
                                    return;
                                }
                                btnWorkHours.Text = hour + "时";
                                btnWorkHours.Text += minute + "分";
                                //btnWorkHours.Text = hour + "时";
                                btnWorkHours.Text = minute + "分";
                                btnWorkHours.Text += second + "秒";
                                new System.Threading.Thread(() => {
                                    var d = new Dictionary<string, string>();
@@ -402,13 +402,13 @@
            {
                item1.Add(i+Language.StringByID(StringId.h));
            }
            for (int i = 0; i <= 59; i += 1)
            for (int i = 1; i <= 119; i += 1)
            {
                item2.Add(i + Language.StringByID(StringId.m));
                item3.Add(i + Language.StringByID(StringId.s));
            }
            uIPickerView.setNPicker(item1, item2,item3);
            uIPickerView.setCurrentItems(hour, minute, second);
            uIPickerView.setNPicker( item3,null,null);
            uIPickerView.setCurrentItems(second-1,0,0);
            optionBaseView.AddChidren(uIPickerView);

            dialog.Show();