From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs
index 7309565..374d5fb 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs
@@ -446,16 +446,20 @@
string deviceFile = HdlShardLogic.Current.GetShardDeviceFileName(deviceKeys);
if (memberShardInfo.dicAllShardKeys.ContainsKey(deviceFile) == true)
{
- var strArry = deviceFile.Split('_');
- if (strArry.Length < 3)
+ //浠庡垎浜枃浠朵腑搴忓垪鍖栧洖鏉�
+ var deviceData = HdlShardLogic.Current.GetShardFileContent(deviceFile);
+ if (deviceData == null)
{
continue;
}
- //浠庡垎浜枃浠朵腑搴忓垪鍖栧洖鏉�
- var deviceData = HdlShardLogic.Current.GetShardFileContent(deviceFile);
try
{
- var device = ZigBee.Device.CommonDevice.CommonDeviceByByteString(strArry[1], System.Text.Encoding.UTF8.GetString(deviceData));
+ var jobject = Newtonsoft.Json.Linq.JObject.Parse(System.Text.Encoding.UTF8.GetString(deviceData));
+ if (jobject.Property("DeviceID") == null)
+ {
+ continue;
+ }
+ var device = ZigBee.Device.CommonDevice.CommonDeviceByByteString(Convert.ToInt32(jobject["DeviceID"].ToString()), System.Text.Encoding.UTF8.GetString(deviceData));
if (device != null)
{
listDevice.Add(device);
--
Gitblit v1.8.0