合并了代码

黄学彪

2019-12-13 6cbd0936d3245fd7c433884ac9c1f5448a7cf657

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

@@ -572,41 +572,45 @@
            //先初始化房间

            foreach (string fileName in listFile)

            {

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

                try

                {

                    //房间文件

                    var byteData = this.GetShardFileContent(fileName);

                    if (byteData != null)

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

                    {

                        string valueData = System.Text.Encoding.UTF8.GetString(byteData);

                        var roomTemp = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.Room>(valueData);

                        memberShardInfo.dicShardRoom[fileName] = roomTemp;

                        //房间文件

                        var byteData = this.GetShardFileContent(fileName);

                        if (byteData != null)

                        {

                            string valueData = System.Text.Encoding.UTF8.GetString(byteData);

                            var roomTemp = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.Room>(valueData);

                            memberShardInfo.dicShardRoom[fileName] = roomTemp;

                        }

                    }

                }

                else if (fileName == DirNameResourse.ShardFloorFile)

                {

                    //楼层文件

                    var byteData = this.GetShardFileContent(fileName);

                    if (byteData != null)

                    else if (fileName == DirNameResourse.ShardFloorFile)

                    {

                        string valueData = System.Text.Encoding.UTF8.GetString(byteData);

                        memberShardInfo.dicShardFloor = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, string>>(valueData);

                        //楼层文件

                        var byteData = this.GetShardFileContent(fileName);

                        if (byteData != null)

                        {

                            string valueData = System.Text.Encoding.UTF8.GetString(byteData);

                            memberShardInfo.dicShardFloor = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, string>>(valueData);

                        }

                    }

                }

                else if (fileName.StartsWith("Device_") == true)

                {

                    string[] Arry = fileName.Split(new string[] { "_" }, StringSplitOptions.RemoveEmptyEntries);

                    string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(Arry[2], Convert.ToInt32(Arry[3]));

                    this.dicShardDeviceFile[mainKeys] = fileName;

                    else if (fileName.StartsWith("Device_") == true)

                    {

                        string[] Arry = fileName.Split(new string[] { "_" }, StringSplitOptions.RemoveEmptyEntries);

                        string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(Arry[2], Convert.ToInt32(Arry[3]));

                        this.dicShardDeviceFile[mainKeys] = fileName;



                    //设备文件

                    listDeviceFile.Add(fileName);

                        //设备文件

                        listDeviceFile.Add(fileName);

                    }

                    else if (fileName.StartsWith("Scene_") == true)

                    {

                        //场景文件

                        listSceneFile.Add(fileName);

                    }

                }

                else if (fileName.StartsWith("Scene_") == true)

                {

                    //场景文件

                    listSceneFile.Add(fileName);

                }

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

            }



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