From d07d62be7111d78b2aaa44c9cdee23a7d22b4dda Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 22 十二月 2020 10:38:15 +0800
Subject: [PATCH] 20201222-1

---
 HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs
index 659d396..361871c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs
@@ -368,10 +368,6 @@
             if (room.roomId == "" ||  sensor.roomIds.Contains(room.roomId))
             {
                 var sensorTag = sensor.sid;
-                if (sensor.bus != null)
-                {
-                    sensorTag = ((int)sensor.functionType % 256) + "_" + sensor.bus.SubnetID + "_" + sensor.bus.DeviceID + "_" + sensor.bus.LoopId;
-                }
                 FrameLayout sensorView = new FrameLayout()
                 {
                     Width = Application.GetRealWidth(148),
@@ -422,10 +418,13 @@
                 };
                 sensorView.AddChidren(btnSensorTitle);
                 btnSensorTitle.MouseUpEventHandler = (sender, e) => {
-                    var esp = new EnvironmentalSensorPage(sensor);
-                    MainPage.BasePageView.AddChidren(esp);
-                    esp.LoadPage();
-                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+                    return;
+                    #region F3闃舵
+                    //var esp = new EnvironmentalSensorPage(sensor);
+                    //MainPage.BasePageView.AddChidren(esp);
+                    //esp.LoadPage();
+                    //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+                    #endregion
                 };
 
                 var btnInfoIcon = new Button()

--
Gitblit v1.8.0