From 679c2a4c459c7ad0e9f727ad4196c0754716c28f Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期三, 08 四月 2020 11:39:20 +0800
Subject: [PATCH] 2020-04-08-1

---
 ZigbeeApp/Shared/Phone/Device/Logic/OneLogic.cs |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/OneLogic.cs b/ZigbeeApp/Shared/Phone/Device/Logic/OneLogic.cs
index 3d58db9..8ef4c90 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/OneLogic.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/OneLogic.cs
@@ -28,14 +28,23 @@
             #region  View甯冨眬浠g爜
             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;//鎭㈠宸︽粦
@@ -151,7 +160,7 @@
                         UserView.HomePage.Instance.PageIndex += 1;
                         timePage.str1 = conditions["StartHour"] + ":" + conditions["StartMin"] + "-" + conditions["StopHour"] + ":" + conditions["StopMin"];
                         timePage.IsEditor = true;
-                        timePage.Show();
+                        timePage.Show(true);
                     }
                 };
 

--
Gitblit v1.8.0