From e7290281eabcb88d2e430dea9782565474837ce1 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 20 十月 2023 14:29:54 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wjc
---
HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs b/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs
index ddbe6d8..a692dae 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs
@@ -512,14 +512,23 @@
}
else
{
- //鎾ら槻
- if (bodyView.InDefenseMode.sid == updataTemp.sid)
+ try
{
- bodyView.InDefenseMode.status = updataTemp.status;
- foreach (var tempView in bodyView.armDiyViewList)
+ //鎾ら槻
+ if (bodyView.InDefenseMode != null)
{
- tempView.LightingView(false);
+ if (bodyView.InDefenseMode.sid == updataTemp.sid)
+ {
+ bodyView.InDefenseMode.status = updataTemp.status;
+ foreach (var tempView in bodyView.armDiyViewList)
+ {
+ tempView.LightingView(false);
+ }
+ }
}
+ }catch(Exception ex)
+ {
+ MainPage.Log($"鎾ら槻寮傚父:{ex.Message}");
}
}
@@ -546,7 +555,10 @@
bodyView.btnArmTipIcon.IsSelected = true;
bodyView.btnDefenseName.Text = bodyView.InDefenseMode.name;
}
- bodyView.InitAlarmStatus(bodyView.InDefenseMode.alarm);
+ if (bodyView.InDefenseMode != null)
+ {
+ bodyView.InitAlarmStatus(bodyView.InDefenseMode.alarm);
+ }
}
}
catch (Exception ex)
--
Gitblit v1.8.0