请合并最新版代码

xm

2020-06-19 ce1feeeb0aaa2e53bca4e8d64953edaba2b41106

 Home0618/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs

old mode 100755
new mode 100644
@@ -384,7 +384,7 @@

                var rowLayout = new RowLayoutControl(midVerticalScrolViewLayout.rowSpace / 2);
                rowLayout.BackgroundColor = ZigbeeColor.Current.XMWhite;
                midVerticalScrolViewLayout.AddChidrenRow(rowLayout);
                midVerticalScrolViewLayout.AddChidren(rowLayout);
                rowLayout.frameTable.UseClickStatu = false;
                var devicePic = rowLayout.frameTable.AddLeftIcon();
                devicePic.Y = Application.GetRealHeight(25);//49
@@ -485,7 +485,7 @@
                            //获取房间的名字
                            var tempDevRoomName = tempDevRoom.Name;
                            //获取楼层的名字
                            var tempDevFloorName = Common.Config.Instance.Home.GetFloorNameById(tempDevFloorId);
                            var tempDevFloorName = HdlResidenceLogic .Current.GetFloorNameById(tempDevFloorId);
                            if (string.IsNullOrEmpty(tempDevFloorName))
                            {
                                if (string.IsNullOrEmpty(tempDevRoomName))