From efad979b6fae76fb37a4de7e94e6bac0a85cb72c Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 30 十一月 2021 13:14:28 +0800
Subject: [PATCH] 2021-11-30 1.修复乐橙Android，没调用拒接接口问题。
---
HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs | 67 ++++++++++++++++-----------------
1 files changed, 32 insertions(+), 35 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
index 7012fba..0e8f778 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
@@ -23,38 +23,29 @@
try
{
ShowFunction vv = ShowFunction.Light;
- switch (function.spk)
+ if (SPK.ElectricalSpkList().Contains(function.spk))
{
- case SPK.FloorHeatStandard:
- vv = ShowFunction.FloorHeating;
- break;
- case SPK.AcStandard:
- vv = ShowFunction.AC;
- break;
- case SPK.CurtainRoller:
- case SPK.CurtainShades:
- case SPK.CurtainSwitch:
- case SPK.CurtainTrietex:
- vv = ShowFunction.Curtain;
- break;
- case SPK.LightCCT:
- case SPK.LightDimming:
- case SPK.LightRGB:
- case SPK.LightSwitch:
- vv = ShowFunction.Light;
- break;
- case SPK.ElectricSocket:
- case SPK.ElectricTuyaAirCleaner:
- case SPK.ElectricTuyaFan:
- case SPK.ElectricTuyaWaterValve:
- case SPK.ElectricTuyaWeepRobot:
- case SPK.ClothesHanger:
- vv = ShowFunction.Electric;
- break;
- case SPK.AirFreshJinmao:
- case SPK.AirFreshStandard:
- vv = ShowFunction.FreshAir;
- break;
+ vv = ShowFunction.Electric;
+ }
+ else if (SPK.FhSpkList().Contains(function.spk))
+ {
+ vv = ShowFunction.FloorHeating;
+ }
+ else if (SPK.AcSpkList().Contains(function.spk))
+ {
+ vv = ShowFunction.AC;
+ }
+ else if (SPK.CurtainSpkList().Contains(function.spk))
+ {
+ vv = ShowFunction.Curtain;
+ }
+ else if (SPK.LightSpkList().Contains(function.spk))
+ {
+ vv = ShowFunction.Light;
+ }
+ else if (SPK.AirFreshSpkList().Contains(function.spk))
+ {
+ vv = ShowFunction.FreshAir;
}
UpdataFunctionOnCount(vv, function.spk);
UpdataCloseAllButton(function);
@@ -442,8 +433,11 @@
{
Application.RunOnMainThread(() =>
{
- waitPage.Hide();
- waitPage.RemoveFromParent();
+ if (waitPage != null)
+ {
+ waitPage.RemoveFromParent();
+ waitPage = null;
+ }
});
}
})
@@ -488,8 +482,11 @@
{
Application.RunOnMainThread(() =>
{
- waitPage.Hide();
- waitPage.RemoveFromParent();
+ if (waitPage != null)
+ {
+ waitPage.RemoveFromParent();
+ waitPage = null;
+ }
});
}
})
--
Gitblit v1.8.0