新云端的代码Ver1.0

黄学彪

2020-11-20 99253403b560f761d5f9af8b4f5140496996433a

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

@@ -76,7 +76,7 @@
            bodyFrameLayout.AddChidren(frameBack);

            //房间列表

            var btnTitle = new NormalViewControl(800, 60, true);

            btnTitle.X = ControlCommonResourse.XXLeft;

            btnTitle.X = HdlControlResourse.XXLeft;

            btnTitle.Y = Application.GetRealHeight(52);

            btnTitle.TextID = R.MyInternationalizationString.RoomList;

            btnTitle.TextColor = UserCenterColor.Current.TextColor2;

@@ -144,10 +144,10 @@
            btnIconContr.ButtonClickEvent += (sender, e) =>

            {

                //楼层菜单

                var contr = new TopRightMenuControl(dicFloor.Count, 2, Language.StringByID(R.MyInternationalizationString.SelectFloor));

                var contr = new TopRightFloorMenuControl(dicFloor.Count, 2, this.nowSelectFloorId, Language.StringByID(R.MyInternationalizationString.SelectFloor));

                foreach (var floorId in dicFloor.Keys)

                {

                    contr.AddRowMenu(dicFloor[floorId], "Floor/Floor.png", "Floor/FloorSelected.png", () =>

                    contr.AddRowMenu(floorId, () =>

                    {

                        //记录起选择的ID

                        this.nowSelectFloorId = floorId;

@@ -282,7 +282,7 @@
            int fileCount = this.GetUpLoadRoomData(listRoom, dicDevice, dicScene);



            var listCheckFile = new HashSet<string>();

            HdlThreadLogic.Current.RunThread(async () =>

            HdlThreadLogic.Current.RunThread(() =>

            {

                //打开进度条

                this.ShowProgressBar();

@@ -290,7 +290,7 @@
                for (int index = 0; index < listRoom.Count; index++)

                {

                    //执行上传

                    var result = await HdlShardLogic.Current.DoUploadSharedContent(memberShardInfo, listRoom[index], dicDevice[index], dicScene[index], fileCount, listCheckFile);

                    var result = HdlShardLogic.Current.DoUploadSharedContent(memberShardInfo, listRoom[index], dicDevice[index], dicScene[index], fileCount, listCheckFile);

                    if (result == false)

                    {

                        break;

@@ -300,7 +300,7 @@
                this.CloseProgressBar();



                //不管成功还是失败,都刷新界面

                Application.RunOnMainThread(() =>

                HdlThreadLogic.Current.RunMain(() =>

                {

                    if (this.Parent != null)

                    {

@@ -333,7 +333,7 @@
                //获取房间全部设备

                foreach (var deviceKeys in listRoom[i].ListDevice)

                {

                    var device = Common.LocalDevice.Current.GetDevice(deviceKeys);

                    var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);

                    if (device == null || memberShardInfo.dicAllShardKeys.ContainsKey(device.FilePath) == true)

                    {

                        //异常

@@ -440,7 +440,7 @@
            }

            foreach (var deviceKeys in room.ListDevice)

            {

                var device = Common.LocalDevice.Current.GetDevice(deviceKeys);

                var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);

                if (device == null)

                {

                    continue;