From f54701fe50ec54d444ff0630a60522142493c2ac Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 17 二月 2023 17:46:12 +0800
Subject: [PATCH] 卷帘窗帘跳转异常修复
---
HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
index 3a74f8e..0a872aa 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
@@ -64,13 +64,13 @@
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
break;
case SPK.CurtainRoller:
- var rollingShutterView = new VenetianBlindsPage(function);
+ var rollingShutterView = new RollingShutterPage(function);
MainPage.BasePageView.AddChidren(rollingShutterView);
rollingShutterView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
break;
case SPK.CurtainShades:
- var curtainShadesView = new RollingShutterPage(function);
+ var curtainShadesView = new VenetianBlindsPage(function);
MainPage.BasePageView.AddChidren(curtainShadesView);
curtainShadesView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -233,6 +233,8 @@
doorLockPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
break;
case SPK.IpCam_Imou:
+#if __IOS__
+#else
FunctionList.List.GetIpCamImouList();
if (string.IsNullOrEmpty(Com.Utils.HdlToLcUtils.Instance.SubAccessToken))
{
@@ -254,9 +256,7 @@
new PublicAssmebly().TipMsg(Language.StringByID(StringId.Tip), Language.StringByID(StringId.huoqushujushibao));
});
}
-#if __ANDROID__
- Application.RunOnMainThread(() =>
- {
+ Application.RunOnMainThread(() =>{
try
{
Com.Utils.HdlToLcUtils.Instance.SubAccessToken = pack.Data.ToString();
@@ -267,8 +267,7 @@
}
});
-#endif
- }
+ }
else
{
Application.RunOnMainThread(() =>
@@ -306,6 +305,7 @@
}
}
+#endif
break;
}
};
--
Gitblit v1.8.0