请合并最新多功能面板代码

xm

2020-07-21 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d

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

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