合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

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

@@ -117,7 +117,7 @@
        private void InitTopRightMenuControl()

        {

            //获取楼层

            var dicFloor = Common.Room.CurrentRoom.GetFloorSortList();

            var dicFloor = HdlRoomLogic.Current.GetFloorSortList();

            if (dicFloor.Count == 0)

            {

                return;

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

            {

                //楼层菜单

                var contr = new TopRightMenuControl(dicFloor.Count, 449, 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;

@@ -170,7 +170,7 @@
        private void InitAreaListRow(string floorId)

        {

            dicSelectRoom.Clear();

            var listRoom = Common.Room.CurrentRoom.GetFloorSortRoom(floorId, false);

            var listRoom = HdlRoomLogic.Current.GetFloorSortRoom(floorId, false);

            HdlThreadLogic.Current.RunMain(() =>

            {

                var listDataRoom = new List<Common.Room>();

@@ -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)

                    {

@@ -331,9 +331,9 @@
                dicScene[i] = listScene;



                //获取房间全部设备

                foreach (var deviceUi in listRoom[i].DeviceUIList)

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

                {

                    var device = deviceUi.CommonDevice;

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

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

                    {

                        //异常

@@ -356,8 +356,9 @@
                var listChirdDevice = new List<CommonDevice>();

                var listChirdScene = new List<Common.SceneUI>();

                //获取房间全部场景

                foreach (var sceneUi in listRoom[i].SceneUIList)

                foreach (var sceneId in listRoom[i].ListSceneId)

                {

                    var sceneUi = HdlSceneLogic.Current.GetSceneUIBySceneId(sceneId);

                    if (sceneUi == null || memberShardInfo.dicAllShardKeys.ContainsKey(sceneUi.FileName) == true)

                    {

                        //异常，或者已经分享了的，不再显示

@@ -424,7 +425,7 @@
        /// <returns></returns>

        private bool CheckCanShowRow(Common.Room room)

        {

            if (room.DeviceUIList.Count == 0 && room.SceneUIList.Count == 0)

            if (room.ListDevice.Count == 0 && room.ListSceneId.Count == 0)

            {

                return false;

            }

@@ -437,20 +438,22 @@
                //没有这个房间

                return true;

            }

            foreach (var deviceUi in room.DeviceUIList)

            foreach (var deviceKeys in room.ListDevice)

            {

                if (deviceUi.CommonDevice == null)

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

                if (device == null)

                {

                    continue;

                }

                if (memberShardInfo.dicAllShardKeys.ContainsKey(deviceUi.CommonDevice.FilePath) == false)

                if (memberShardInfo.dicAllShardKeys.ContainsKey(device.FilePath) == false)

                {

                    //存在未分享的设备的话，此房间可以显示

                    return true;

                }

            }

            foreach (var sceneUi in room.SceneUIList)

            foreach (var sceneId in room.ListSceneId)

            {

                var sceneUi = HdlSceneLogic.Current.GetSceneUIBySceneId(sceneId);

                if (sceneUi == null)

                {

                    continue;