2020-05-19-1

陈嘉乐

2020-05-19 d01084d99dd3cf12e89bb32135f84f13970500f9

 ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs

@@ -316,6 +316,12 @@
                if (logicId != 0)
                {
                    openModeFl.AddChidren(timeTextBtn);
                    string text1 = Language.StringByID(MyInternationalizationString.timeSensitive);
                    string text2 = Language.StringByID(MyInternationalizationString.yearSone);
                    string text3 = Language.StringByID(MyInternationalizationString.monthSone);
                    string text4 = Language.StringByID(MyInternationalizationString.numberSone);
                    string text5 = Language.StringByID(MyInternationalizationString.hour1);
                    string text6 = Language.StringByID(MyInternationalizationString.executeSone);
                    if (_if)
                    {

@@ -325,24 +331,13 @@
                        var y = datetime.Year.ToString();//那一年
                        var m = datetime.Month.ToString();//那一月
                        var d = datetime.ToString("dd");//那一天
                        var h = int.Parse(datetime.ToString("HH"));//小时
                                                                   // int dayInt = (h + timeValue) / 24;//算出几天后执行
                                                                   // int hour = (h + timeValue) % 24;//算出几天后那个时间执行
                                                                   // int days = int.Parse(d) + dayInt;
                        var h = int.Parse(datetime.ToString("HH"));//小时                   
                        int minute = datetime.Minute;//分钟
                        string text1 = Language.StringByID(MyInternationalizationString.timeSensitive);
                        string text2 = Language.StringByID(MyInternationalizationString.yearSone);
                        string text3 = Language.StringByID(MyInternationalizationString.monthSone);
                        string text4 = Language.StringByID(MyInternationalizationString.numberSone);
                        string text5 = Language.StringByID(MyInternationalizationString.hour1);
                        string text6 = Language.StringByID(MyInternationalizationString.executeSone);
                        timeTextBtn.Text = text1 + y + text2 + m + text3 + d + text4 + h + text5 + minute.ToString() + text6;

                    }
                    else
                    {



                        ///有时效性常开才显示时间条件文本
                        var y = DateTime.Now.Year.ToString();//那一年
                        var m = DateTime.Now.Month.ToString();//那一月
@@ -352,12 +347,6 @@
                        int hour = (h + timeValue) % 24;//算出几天后那个时间执行
                        int days = int.Parse(d) + dayInt;
                        int minute = DateTime.Now.Minute;//分钟
                        string text1 = Language.StringByID(MyInternationalizationString.timeSensitive);
                        string text2 = Language.StringByID(MyInternationalizationString.yearSone);
                        string text3 = Language.StringByID(MyInternationalizationString.monthSone);
                        string text4 = Language.StringByID(MyInternationalizationString.numberSone);
                        string text5 = Language.StringByID(MyInternationalizationString.hour1);
                        string text6 = Language.StringByID(MyInternationalizationString.executeSone);
                        timeTextBtn.Text = text1 + y + text2 + m + text3 + days.ToString() + text4 + hour.ToString() + text5 + minute.ToString() + text6;
                    }
                }
@@ -481,10 +470,10 @@
            listLogicFl.Width = Application.GetRealWidth(1022);
            listLogicFl.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor;

           // verticalRefresh.Y = Application.GetRealHeight(187); 
           // verticalRefresh.X = Application.GetRealWidth(46);
            verticalRefresh.Y = Application.GetRealHeight(187); 
            verticalRefresh.X = Application.GetRealWidth(46);
            verticalRefresh.Height = listLogicFl.Height - Application.GetRealHeight(187);//动态改动上下滑动view高度;
            //verticalRefresh.Width = listLogicFl.Width - Application.GetRealWidth(46);
            verticalRefresh.Width = listLogicFl.Width - Application.GetRealWidth(46);
        }
        /// <summary>
        /// 读取自动化列表数据；