???????

黄学彪

2020-04-15 23532fa8ad34c89b6d24b01eaef6475fd0aad898

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

@@ -28,14 +28,23 @@
            #region  View布局代码
            TopView view = new TopView();
            this.AddChidren(view.TopRowView());
            if (Common.Logic.CurrentLogic.LogicId != 0)

            if (Yes)
            {
                view.toptitleNameBtn.Text = Language.StringByID(MyInternationalizationString.editautomation);
                view.toptitleNameBtn.Text = Language.StringByID(MyInternationalizationString.look);
            }
            else
            {
                view.toptitleNameBtn.Text = Language.StringByID(MyInternationalizationString.newautomation);
                if (Common.Logic.CurrentLogic.LogicId != 0)
                {
                    view.toptitleNameBtn.Text = Language.StringByID(MyInternationalizationString.editautomation);
                }
                else
                {
                    view.toptitleNameBtn.Text = Language.StringByID(MyInternationalizationString.newautomation);
                }
            }
            
            view.clickBtn.MouseDownEventHandler += (sender, e) =>
            {
                // UserView.HomePage.Instance.ScrollEnabled = true;//恢复左滑
@@ -44,7 +53,7 @@
            var middle = new VerticalScrolViewLayout
            {
                Y = view.topRowLayout.Bottom,
                Height = Application.GetRealHeight(1920 - 184 - 180),
                Height = Application.GetRealHeight(Method.H - 184 - 180),
                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
            };
            this.AddChidren(middle);
@@ -121,20 +130,25 @@
                var conditions = Common.Logic.CurrentLogic.Conditions[i];
                switch (Type)
                {
                    case 5:
                    case 0:
                        {
                           
                            selecteddevice.ordinaryBtn.Visible = true;
                            selecteddevice.iconBtn.UnSelectedImagePath = "ZigeeLogic/timeparagraph.png";
                            string s1 = "", s2 = "";
                            s1 = conditions["StartMin"].Length < 2 ? "0" + conditions["StartMin"] : conditions["StartMin"];
                            s2 = conditions["StopMin"].Length < 2 ? "0" + conditions["StopMin"] : conditions["StopMin"];
                            ///显示时间
                            selecteddevice.ordinaryBtn.Text = conditions["StartHour"] + ":" + s1 + "-" + conditions["StopHour"] + ":" + s2;
                            selecteddevice.selecetddevicestateBtn.Text = Language.StringByID(MyInternationalizationString.timeframe);

                            //"0正常时间点","1日出时间","2日落时间","3正午时间"
                            switch (int.Parse(conditions["DateType"]))
                            {
                                case 0:
                                    {
                                        selecteddevice.ordinaryBtn.Text = Language.StringByID(MyInternationalizationString.immediateexecution);
                                        selecteddevice.iconBtn.UnSelectedImagePath = "ZigeeLogic/timepoint.png";
                                        string s = "";
                                        s = conditions["StartMin"].Length < 2 ? "0" + conditions["StartMin"] : conditions["StartMin"];
                                        selecteddevice.selecetddevicestateBtn.Text= conditions["StartHour"] + ":" + s;
                                    }
                                    break;
                            }

                        }
                        break;

                }
                if (Yes)
                {
@@ -145,13 +159,19 @@
                ///编辑
                selecteddevice.edit.MouseUpEventHandler += (sender, e) =>
                {
                    if (Type==5) {
                        var timePage = new TimePage();
                        UserView.HomePage.Instance.AddChidren(timePage);
                    if (Type == 0)
                    {
                        var oneTimePoint = new OneTimePoint();
                        UserView.HomePage.Instance.AddChidren(oneTimePoint);
                        UserView.HomePage.Instance.PageIndex += 1;
                        timePage.str1 = conditions["StartHour"] + ":" + conditions["StartMin"] + "-" + conditions["StopHour"] + ":" + conditions["StopMin"];
                        timePage.IsEditor = true;
                        timePage.Show();
                        oneTimePoint.Show((timeString) =>
                        {
                            if (!string.IsNullOrEmpty(timeString))
                            {
                                //编辑完回来先更新时间
                                selecteddevice.selecetddevicestateBtn.Text = timeString;
                            }
                        });
                    }
                };