2020-05-19-3

陈嘉乐

2020-05-19 34f902db7b768114f6aec18706debbb7ffb5d7f2

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

@@ -80,7 +80,7 @@
                    {
                        //进来更新一次值
                        logicId = logic.LogicId;
                        timeValue = int.Parse(logic.Conditions[0]["DoorLockOpenDelayTime"]);
                        timeValue = int.Parse(logic.Conditions[0]["DoorLockOpenDelayTime"])/3600;
                        timeLong = int.Parse(logic.Conditions[0]["TriggerTime"]);

                    }
@@ -316,50 +316,41 @@
                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);
                    string year = "";
                    string month = "";
                    int days =0;
                    int hour =0;
                    int minute =0;
                    
                    if (_if)
                    {

                        ///第一次进来读取网关时间；
                        var datetime = GetLocalTime(timeLong);
                        ///有时效性常开才显示时间条件文本
                        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;
                        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;

                        year = datetime.Year.ToString();//那一年
                        month = datetime.Month.ToString();//那一月
                        days = int.Parse(datetime.ToString("dd"));//那一天
                        hour = int.Parse(datetime.ToString("HH"));//小时                   
                        minute = datetime.Minute;//分钟
                    }
                    else
                    {



                        ///有时效性常开才显示时间条件文本
                        var y = DateTime.Now.Year.ToString();//那一年
                        var m = DateTime.Now.Month.ToString();//那一月
                        ///在当前界面编辑显示系统时间(不能每一次编辑都去网关拿数据)
                        year = DateTime.Now.Year.ToString();//那一年
                        month = DateTime.Now.Month.ToString();//那一月
                        var d = DateTime.Now.ToString("dd");//那一天
                        var h = int.Parse(DateTime.Now.ToString("HH"));//小时
                        int dayInt = (h + timeValue) / 24;//算出几天后执行
                        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;
                        int dayInt = (h + timeValue) / 24;//设置时间+当前系统时间是否超出24小时
                        hour = (h + timeValue) % 24;//设置时间+当前系统时间是否超出24小时剩下多少小时
                        days = int.Parse(d) + dayInt;//当前系统天数+执行后天数
                        minute = DateTime.Now.Minute;//分钟
                    }
                    timeTextBtn.Text = text1 + year + text2 + month + text3 + days.ToString() + text4 + hour.ToString() + text5 + minute.ToString() + text6;
                }


@@ -481,10 +472,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>
        /// 读取自动化列表数据；