From 4975f3d6beb81e3967b1018d629be9c3410b9ea3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 25 三月 2021 15:43:34 +0800
Subject: [PATCH] Merge branch 'WJC' into temp-wxr
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 63256f0..7f20439 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -728,7 +728,7 @@
btnName.TextID = StringId.EnvironmentalData;
btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
{
- var skipView = new EnvironmentalSciencePage();
+ var skipView = new EnvironmentalPage();// EnvironmentalSciencePage();
MainPage.BasePageView.AddChidren(skipView);
skipView.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -755,12 +755,7 @@
btnName.TextID = StringId.SecurityMonitoring;
btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
{
-
-#if __IOS__
- EZSDK.IOS.EZSDK.Go2EZvizMonitor();
-#else //瀹夊崜鎽勫儚澶�
HDLCommon.Current.Go2EZvizMonitor(bodyView);
-#endif
};
break;
case ShowFunction.Sensor:
--
Gitblit v1.8.0