合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

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

@@ -23,11 +23,11 @@
        /// <summary>

        /// 设备桌布控件

        /// </summary>

        private FrameLayout frameDeviceTable = null;

        private NormalFrameLayout frameDeviceTable = null;

        /// <summary>

        /// 设备桌布控件

        /// </summary>

        private FrameLayout frameSceneTable = null;

        private NormalFrameLayout frameSceneTable = null;

        /// <summary>

        /// 功能按钮

        /// </summary>

@@ -41,9 +41,9 @@
        /// </summary>

        private Dictionary<string, CommonDevice> dicSelectDevice = new Dictionary<string, CommonDevice>();

        /// <summary>

        /// 当前选择的分支 1：场景  2：功能

        /// 当前选择的分支 0：场景  1：功能

        /// </summary>

        private int nowSwitchIndex = 1;

        private int nowSwitchIndex = 0;

        /// <summary>

        /// 当前选择的设备索引

        /// </summary>

@@ -81,12 +81,12 @@
            this.dicSelectScene = new Dictionary<int, Common.SceneUI>();



            //初始化桌布控件

            this.frameSceneTable = new FrameLayout();

            this.frameSceneTable = new NormalFrameLayout();

            frameSceneTable.Y = Application.GetRealHeight(132);

            frameSceneTable.Height = bodyFrameLayout.Height - Application.GetRealHeight(132);

            bodyFrameLayout.AddChidren(frameSceneTable);



            this.frameDeviceTable = new FrameLayout();

            this.frameDeviceTable = new NormalFrameLayout();

            frameDeviceTable.Y = frameSceneTable.Y;

            frameDeviceTable.Height = frameSceneTable.Height;

            bodyFrameLayout.AddChidren(frameDeviceTable);

@@ -133,7 +133,7 @@
            tabControl.SelectTabEvent += (tabIndex) =>

            {

                this.nowSwitchIndex = tabIndex;

                if (tabIndex == 1)

                if (tabIndex == 0)

                {

                    //显示场景列表

                    this.frameSceneTable.Visible = true;

@@ -146,7 +146,11 @@
                    this.frameDeviceTable.Visible = true;

                }

            };

            tabControl.InitControl();

            //开始初始化场景功能切换控件

            var listTitle = new List<string>();

            listTitle.Add(Language.StringByID(R.MyInternationalizationString.uScence));

            listTitle.Add(Language.StringByID(R.MyInternationalizationString.uFunction));

            tabControl.InitControl(listTitle);

        }



        #endregion

@@ -163,19 +167,19 @@


            //场景有点特殊,如果同一个房间内,已经分享了,则不再显示 

            //如果这个场景是由嵌套而分享的,这个时候,它可以显示出来

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

            var listScene = new List<int>();

            if (memberShardInfo.dicShardRoom.ContainsKey(lookRoom.FileName) == false)

            {

                listScene.AddRange(lookRoom.SceneUIList);

                listScene.AddRange(lookRoom.ListSceneId);

            }

            else

            {

                var tempRoom = memberShardInfo.dicShardRoom[lookRoom.FileName];

                foreach (var data in lookRoom.SceneUIList)

                foreach (var dataId in lookRoom.ListSceneId)

                {

                    if (tempRoom.SceneUIFilePathList.Contains(data.FileName) == false)

                    if (tempRoom.ListSceneId.Contains(dataId) == false)

                    {

                        listScene.Add(data);

                        listScene.Add(dataId);

                    }

                }

            }

@@ -193,11 +197,16 @@
                listView.Height = bodyFrameLayout.Height - Application.GetRealHeight(187);

                frameSceneTable.AddChidren(listView);



                foreach (var data in listScene)

                foreach (var dataId in listScene)

                {

                    var data = HdlSceneLogic.Current.GetSceneUIBySceneId(dataId);

                    if (data == null)

                    {

                        continue;

                    }

                    //场景图片

                    var frameContr = new ScenePictrueControl();

                    listView.AddChidrenFrame(frameContr);

                    listView.AddChidren(frameContr);

                    frameContr.InitControl(data);



                    var btnSelect = new IconViewControl(58);

@@ -205,7 +214,7 @@
                    btnSelect.SelectedImagePath = "Item/ItemSelected.png";

                    btnSelect.X = Application.GetRealWidth(887);

                    btnSelect.Y = Application.GetRealHeight(35);

                    frameContr.AddChidren(btnSelect, ChidrenBindMode.BindEventOnly);

                    frameContr.AddChidren(btnSelect, ChidrenBindMode.BindEvent);

                    if (dicSelectScene.ContainsKey(data.Id) == true)

                    {

                        btnSelect.IsSelected = true;

@@ -288,7 +297,7 @@
        /// </summary>

        /// <param name="dicData"></param>

        /// <param name="listView"></param>

        private void InitDeviceObjectRow(Dictionary<int, List<CommonDevice>> dicData, VerticalListControl listView)

        private void InitDeviceObjectRow(Dictionary<string, List<CommonDevice>> dicData, VerticalListControl listView)

        {

            var scrolContr = new RoomDeviceGroupMenuControl(dicData);

            this.frameDeviceTable.AddChidren(scrolContr);

@@ -376,11 +385,11 @@
        /// 获取分组后的设备

        /// </summary>

        /// <returns></returns>

        private Dictionary<int, List<CommonDevice>> GetAllGroupDevice()

        private Dictionary<string, List<CommonDevice>> GetAllGroupDevice()

        {

            //全部的设备

            var listDevice = lookRoom.GetRoomListDevice();

            var dic = new Dictionary<int, List<CommonDevice>>();

            var listDevice = HdlRoomLogic.Current.GetRoomListDevice(lookRoom);

            var dic = new Dictionary<string, List<CommonDevice>>();

            foreach (var device in listDevice)

            {

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

@@ -389,11 +398,11 @@
                    continue;

                }

                var typeInfo = Common.LocalDevice.Current.GetDeviceBelongEnumInfo(device);

                if (dic.ContainsKey(typeInfo.BeloneTextId) == false)

                if (dic.ContainsKey(typeInfo.BeloneText) == false)

                {

                    dic[typeInfo.BeloneTextId] = new List<CommonDevice>();

                    dic[typeInfo.BeloneText] = new List<CommonDevice>();

                }

                dic[typeInfo.BeloneTextId].Add(device);

                dic[typeInfo.BeloneText].Add(device);

            }

            return dic;

        }

@@ -419,10 +428,10 @@
            {

                listScene.Add(scene);

            }

            HdlThreadLogic.Current.RunThread(async () =>

            HdlThreadLogic.Current.RunThread(() =>

            {

                //上传文件

                var result = await HdlShardLogic.Current.DoUploadSharedContent(memberShardInfo, this.lookRoom, listDevice, listScene);

                var result = HdlShardLogic.Current.DoUploadSharedContent(memberShardInfo, this.lookRoom, listDevice, listScene);

                if (result == true)

                {

                    HdlThreadLogic.Current.RunMain(() =>