From 66a9965c44ecc32a6696abca876ab9d1cd091584 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 28 二月 2020 15:25:13 +0800
Subject: [PATCH] 2020.2.28
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs | 92 +++++++++++++++++++++++++++++-----------------
1 files changed, 58 insertions(+), 34 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
index 51ed3a9..303e827 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
@@ -51,8 +51,8 @@
/// <param name="gatewayId">缃戝叧ID</param>
/// <param name="topic">鏁翠釜涓婚</param>
/// <param name="reportTopic">涓婃姤鏁版嵁鐨勪富棰�</param>
- /// <param name="receiveData">鎺ユ敹鐨勬暟鎹�</param>
- public void GatewayOverallMsgReceive(string gatewayId, string topic, string reportTopic, JObject receiveData)
+ /// <param name="msgData">鎺ユ敹鐨勬暟鎹�</param>
+ public void GatewayOverallMsgReceive(string gatewayId, string topic, string reportTopic, string msgData)
{
if (topic == "AppNoLogin")
{
@@ -67,7 +67,7 @@
});
return;
}
- else if (topic == "BeingSqueezedOffline")
+ else if (topic == "ZigbeeGateWayToClient/" + Common.Config.Instance.ConnEmqClientId + "/Push/NotifySqueeze")
{
HdlThreadLogic.Current.RunMain(() =>
{
@@ -93,6 +93,23 @@
});
return;
}
+ else if (topic == "ZigbeeGateWayToClient/" + Common.Config.Instance.Guid + "/Push/Deleted"
+ || topic == "ZigbeeGateWayToClient/" + Common.Config.Instance.Guid + "/Push/DeletedShareData")
+ {
+ if (UserCenterResourse.UserInfo.AuthorityNo == 3)
+ {
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //鍒嗕韩鏁版嵁宸茬粡鍙樻洿,璇烽噸鏂扮櫥闄�
+ string msg = Language.StringByID(R.MyInternationalizationString.uShardDataIsChangedPleaseLoginAgain);
+ var contr = new ShowMsgControl(ShowMsgType.Tip, msg);
+ contr.Show();
+
+ UserCenterLogic.ReLoginAgain(UserCenterResourse.UserInfo.Account, false);
+ });
+ }
+ return;
+ }
try
{
if (HdlGatewayLogic.Current.IsGatewayExist(gatewayId) == false)
@@ -100,52 +117,51 @@
//涓嶆槸鑷繁缁戝畾鐨勭綉鍏筹紝鍒欎笉澶勭悊
return;
}
-
//璁惧灞炴�т笂鎶�
if (reportTopic == "DeviceStatusReport")
{
//璁惧灞炴�т笂鎶�
- this.DeviceAttributeReportPush(receiveData);
+ this.DeviceAttributeReportPush(JObject.Parse(msgData));
}
//浼犳劅鍣ㄤ笂鎶�
else if (reportTopic == "IASInfoReport")
{
- this.SensorDeviceReportPush(receiveData);
+ this.SensorDeviceReportPush(JObject.Parse(msgData));
}
//闂ㄩ攣涓婃姤
else if (topic == gatewayId + "/Alarms/SendAlarmInform")
{
- this.DoorLockDeviceReportPush(receiveData);
+ this.DoorLockDeviceReportPush(null);
}
//閫氳繃澶栭儴鏂瑰紡甯冮槻鎾ら槻鎴愬姛鏃舵姤鍛�
else if (topic == gatewayId + "/Security/EnOrWithdrawSucceedReport")
{
- this.SecurityEnOrWithdrawSucceedReport(receiveData);
+ this.SecurityEnOrWithdrawSucceedReport(JObject.Parse(msgData));
}
//璁惧鍦ㄧ嚎鐘舵�佹洿鏂板弽棣�
else if (reportTopic == "OnlineStatusChange_Respon")
{
- this.DeviceOnlineChangePush(receiveData);
+ this.DeviceOnlineChangePush(JObject.Parse(msgData));
}
//鎾ら槻
else if (topic == gatewayId + "/Security/WithdrawMode_Respon")
{
- this.RemoveSafetyGarrisonPush(receiveData);
+ this.RemoveSafetyGarrisonPush(JObject.Parse(msgData));
}
//甯冮槻
else if (topic == gatewayId + "/Security/EnableMode_Respon")
{
- this.SetSafetyGarrisonPush(receiveData);
+ this.SetSafetyGarrisonPush(JObject.Parse(msgData));
}
//閫昏緫瑙﹀彂涓婃姤
else if (topic == gatewayId + "/Logic/Execute_Respon")
{
- this.LogicExecutePush(receiveData);
+ this.LogicExecutePush(null);
}
//鍦烘櫙瑙﹀彂涓婃姤
else if (topic == gatewayId + "/Scene/Exec_Respon")
{
- this.SceneExecPush(receiveData);
+ this.SceneExecPush(null);
}
}
catch (Exception ex)
@@ -165,6 +181,11 @@
/// <param name="receiveData"></param>
private void DeviceAttributeReportPush(JObject receiveData)
{
+ if (this.dicDeviceEvent.Count == 0)
+ {
+ //娌℃湁娣诲姞鐩戝惉
+ return;
+ }
var deviceAddr = receiveData.Value<string>("DeviceAddr");
var deviceEpoint = receiveData.Value<int>("Epoint");
@@ -211,7 +232,7 @@
private void DoorLockDeviceReportPush(JObject receiveData)
{
//淇濆瓨闂ㄩ攣淇℃伅鍒版湰鍦�
- HdlAlarmsLogic.Current.SaveDoorLockAlarmInfo(receiveData);
+ //HdlAlarmsLogic.Current.SaveDoorLockAlarmInfo(receiveData);
//鏄剧ず鏈夋柊娑堟伅鐨勭壒鏁�
this.ShowHadNewMessageAppeal();
@@ -227,8 +248,13 @@
/// <param name="receiveData"></param>
private void DeviceOnlineChangePush (JObject receiveData)
{
+ if (this.dicDeviceEvent.Count == 0)
+ {
+ //娌℃湁娣诲姞鐩戝惉
+ return;
+ }
var tempDevice = new CommonDevice() { DeviceAddr = receiveData.Value<string>("DeviceAddr"), DeviceEpoint = receiveData.Value<int>("Epoint") };
- tempDevice.IsOnline = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(receiveData["Data"]["IsOnline"].ToString());
+ tempDevice.IsOnline = Convert.ToInt32(receiveData["Data"]["IsOnline"].ToString());
this.DeviceReportPush(tempDevice, ReceiveComandDiv.A璁惧鍦ㄧ嚎涓婃姤);
}
@@ -391,6 +417,8 @@
#endregion
+
+
#region 鈻� 娣诲姞璁惧浜嬩欢_______________________
/// <summary>
@@ -470,14 +498,13 @@
/// <param name="comand"></param>
private void DeviceReportPush(CommonDevice common, ReceiveComandDiv comand)
{
+ if (this.dicDeviceEvent.Count == 0)
+ {
+ //娌℃湁娣诲姞鐩戝惉
+ return;
+ }
lock (this.dicDeviceEvent)
{
- if (this.dicDeviceEvent.Count == 0)
- {
- //娌℃湁娣诲姞鐩戝惉
- return;
- }
-
var list = new List<Action<CommonDevice>>();
foreach (string keys in this.dicDeviceEvent.Keys)
{
@@ -490,22 +517,19 @@
list.Add(this.dicDeviceEvent[keys]);
}
//鏈夊彲鑳藉湪鍥炶皟鍑芥暟涓Щ闄や簡浜嬩欢锛屽鑷存姤閿欙紝鎵�浠ュ厛鏀堕泦锛屽啀璋冪敤
- Application.RunOnMainThread(() =>
+ foreach (var action in list)
{
- foreach (var action in list)
+ try
{
- try
- {
- action?.Invoke(common);
- }
- catch (Exception ex)
- {
- //Log鍑哄姏
- string msg = "褰撳墠婵�娲荤殑鐣岄潰[" + UserCenterResourse.NowActionFormID + "]";
- HdlLogLogic.Current.WriteLog(ex, msg);
- }
+ action?.Invoke(common);
}
- });
+ catch (Exception ex)
+ {
+ //Log鍑哄姏
+ string msg = "鎺ㄩ�侀敊璇�! 褰撳墠婵�娲荤殑鐣岄潰[" + UserCenterResourse.NowActionFormID + "]";
+ HdlLogLogic.Current.WriteLog(ex, msg);
+ }
+ }
}
}
--
Gitblit v1.8.0