合并了新代码

黄学彪

2020-08-11 26d1cdf2f5246c1ad7890e6740444c4a6a80e6fb

 ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedListRoomForm.cs

@@ -276,6 +276,7 @@
                    continue;

                }

                var device = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice>(System.Text.Encoding.UTF8.GetString(byteData));

                device.Type = (DeviceType)device.DeviceID;

                listDevice.Add(device);

            }

            //获取全部场景