From 2fb0c39b09110be4f5a88a8c8004f03fc257f612 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 06 一月 2021 11:11:53 +0800
Subject: [PATCH] 2021-1-6-1

---
 ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs |   23 +++++++++++------------
 1 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs
old mode 100644
new mode 100755
index 2d7f7b9..3e79b1e
--- a/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs
@@ -33,11 +33,10 @@
             var middle = new FrameLayout
             {
                 Y = view.topRowLayout.Bottom,
-                Height = Application.GetRealHeight(1920 - 184 - 260),
+                Height = Application.GetRealHeight(Method.H - 184 - 260),
                 BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
             };
             this.AddChidren(middle);
-
             //淇濆瓨
             SaveView saveView = new SaveView();
             saveView.frameLayout.Y = middle.Bottom;
@@ -176,7 +175,7 @@
                     if (endView.titleBtn.Tag.ToString() != "0" && startval.ToString() == endView.titleBtn.Tag.ToString())
                     {
 
-                        var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+                        var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
                                         Language.StringByID(MyInternationalizationString.nottime),
                                        Language.StringByID(MyInternationalizationString.confrim));
                         alert.Show();
@@ -185,7 +184,7 @@
                     if (endView.titleBtn.Tag.ToString() != "0" && startval > int.Parse(endView.titleBtn.Tag.ToString()))
                     {
 
-                        var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+                        var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
                                         Language.StringByID(MyInternationalizationString.timesetting),
                                        Language.StringByID(MyInternationalizationString.confrim));
                         alert.Show();
@@ -248,7 +247,7 @@
                      if (startView.titleBtn.Tag.ToString() != "0" && endval.ToString() == startView.titleBtn.Tag.ToString())
                      {
 
-                         var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+                         var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
                                          Language.StringByID(MyInternationalizationString.nottime),
                                         Language.StringByID(MyInternationalizationString.confrim));
                          alert.Show();
@@ -257,7 +256,7 @@
                      if (startView.titleBtn.Tag.ToString() != "0" && endval < int.Parse(startView.titleBtn.Tag.ToString()))
                      {
 
-                         var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+                         var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
                                          Language.StringByID(MyInternationalizationString.timesetting),
                                         Language.StringByID(MyInternationalizationString.confrim));
                          alert.Show();
@@ -296,7 +295,7 @@
 
                  if (string.IsNullOrEmpty(startView.titleBtn.Text) || string.IsNullOrEmpty(endView.titleBtn.Text))
                  {
-                     var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+                     var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
                                             Language.StringByID(MyInternationalizationString.completeNext),
                                            Language.StringByID(MyInternationalizationString.confrim));
                      alert.Show();
@@ -304,7 +303,7 @@
                  }
                  if (startView.titleBtn.Text == endView.titleBtn.Text)
                  {
-                     var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+                     var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
                                             Language.StringByID(MyInternationalizationString.sametime),
                                            Language.StringByID(MyInternationalizationString.confrim));
                      alert.Show();
@@ -336,10 +335,10 @@
 
                 //LogicIfon.logicIfon.Addconditions(timeBucketConditionsInfo,timeBucketConditionsInfo.Type);
 
-                var logicCommunalPage = new LogicCommunalPage { };
-                 UserView.HomePage.Instance.AddChidren(logicCommunalPage);
-                 UserView.HomePage.Instance.PageIndex += 1;
-                 logicCommunalPage.Show(() => { });
+                var logicCommunalPage = new LogicCommunalPage { };
+                 UserView.HomePage.Instance.AddChidren(logicCommunalPage);
+                 UserView.HomePage.Instance.PageIndex += 1;
+                 logicCommunalPage.Show(() => { });
 
              };
         }

--
Gitblit v1.8.0