合并了代码

黄学彪

2019-12-13 6cbd0936d3245fd7c433884ac9c1f5448a7cf657

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs

@@ -572,6 +572,8 @@
            //先初始化房间

            foreach (string fileName in listFile)

            {

                try

                {

                if (fileName.StartsWith("Room_") == true)

                {

                    //房间文件

@@ -608,6 +610,8 @@
                    listSceneFile.Add(fileName);

                }

            }

                catch (Exception ex) { HdlLogLogic.Current.WriteLog(ex); }

            }



            //设置房间里面设备的UI对象(因为这个东西是反序列化出来的,设备UI对象是不序列化对象)

            foreach (var tempRoom in memberShardInfo.dicShardRoom.Values)