合并了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>

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

@@ -297,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);

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

        /// </summary>

        /// <returns></returns>

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

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

        {

            //全部的设备

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

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

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

            foreach (var device in listDevice)

            {

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

@@ -398,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;

        }

@@ -428,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(() =>