From c6b35c3138b944830b5336bf610f918154dd47c7 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期六, 12 十月 2019 15:45:10 +0800
Subject: [PATCH] 合并门锁，完成住宅管理
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs | 38 +++++++++++++++++++++++---------------
1 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
index 1b39f3a..5565855 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
@@ -22,7 +22,7 @@
{
if (topic == "AppNoLogin")
{
- Application.RunOnMainThread(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
//鐧诲綍瀵嗗寵宸茬粡杩囨湡,璇烽噸鏂扮櫥褰�
string msg = Language.StringByID(R.MyInternationalizationString.uTokenIsOldAndLoginAgain);
@@ -34,7 +34,7 @@
}
else if (topic == "BeingSqueezedOffline")
{
- Application.RunOnMainThread(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
//姝ゅ笎鍙峰凡鍦ㄥ埆澶勭櫥褰�,鎮ㄨ杩笅绾�
string msg = Language.StringByID(R.MyInternationalizationString.uHadBeenLoginAndOffLine);
@@ -45,22 +45,30 @@
});
}
- if (HdlGatewayLogic.Current.IsGatewayExist(gatewayId) == false)
+ try
{
- //涓嶆槸鑷繁缁戝畾鐨勭綉鍏筹紝鍒欎笉澶勭悊
- return;
+ if (HdlGatewayLogic.Current.IsGatewayExist(gatewayId) == false)
+ {
+ //涓嶆槸鑷繁缁戝畾鐨勭綉鍏筹紝鍒欎笉澶勭悊
+ return;
+ }
+ //闂ㄩ攣涓婃姤
+ if (topic == gatewayId + "/Alarms/SendAlarmInform")
+ {
+ //淇濆瓨闂ㄩ攣鎶ヨ淇℃伅鍒版湰鍦�
+ HdlAlarmsLogic.Current.SaveDoorLockAlarmInfo(receiveData);
+
+ }
+ //閫氳繃澶栭儴鏂瑰紡甯冮槻鎾ら槻鎴愬姛鏃舵姤鍛�
+ else if (topic == gatewayId + "/Security/EnOrWithdrawSucceedReport")
+ {
+ SecurityEnOrWithdrawSucceedReport(receiveData);
+ }
}
- //闂ㄩ攣涓婃姤
- if (topic == gatewayId + "/Alarms/SendAlarmInform")
- {
- //淇濆瓨闂ㄩ攣鎶ヨ淇℃伅鍒版湰鍦�
- HdlAlarmsLogic.Current.SaveDoorLockAlarmInfo(receiveData);
-
- }
- //閫氳繃澶栭儴鏂瑰紡甯冮槻鎾ら槻鎴愬姛鏃舵姤鍛�
- else if (topic == gatewayId + "/Security/EnOrWithdrawSucceedReport")
+ catch (Exception ex)
{
- SecurityEnOrWithdrawSucceedReport(receiveData);
+ //Log鍑哄姏
+ HdlLogLogic.Current.WriteLog(ex);
}
}
--
Gitblit v1.8.0