新云端Ver1.3

黄学彪

2020-12-17 9f326f4000847e6167d8166fa2f6a66f53cb3734

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

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

        private Common.Room lookRoom = null;

        /// <summary>

        /// 成员的分享数据

        /// 成员ID

        /// </summary>

        private MemberShardInfoData memberShardInfo = null;

        private string ChildAccountId = string.Empty;

        /// <summary>

        /// 设备桌布控件

        /// </summary>

@@ -57,11 +57,11 @@
        /// 画面显示(底层会固定调用此方法，借以完成画面创建)

        /// </summary>

        /// <param name="i_room">查看的房间对象</param>

        /// <param name="i_memberShardInfo">成员的分享数据</param>

        public void ShowForm(Common.Room i_room, MemberShardInfoData i_memberShardInfo)

        /// <param name="i_ChildAccountId">成员ID</param>

        public void ShowForm(Common.Room i_room, string i_ChildAccountId)

        {

            this.lookRoom = i_room;

            this.memberShardInfo = i_memberShardInfo;

            this.ChildAccountId = i_ChildAccountId;



            //设置头部信息

            base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uAddShared));

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

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

            var listScene = new List<int>();

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

            var shardRoom = HdlShardLogic.Current.GetShardRoomFromMemory(lookRoom.Id);

            if (shardRoom == null)

            {

                listScene.AddRange(lookRoom.ListSceneId);

            }

            else

            {

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

                foreach (var dataId in lookRoom.ListSceneId)

                {

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

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

                    {

                        listScene.Add(dataId);

                    }

@@ -390,9 +390,11 @@
            //全部的设备

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

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

            var shardRoom = HdlShardLogic.Current.GetShardRoomFromMemory(lookRoom.Id);

            foreach (var device in listDevice)

            {

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

                string mainkey = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(device);

                if (shardRoom.ListDevice.Contains(mainkey) == true)

                {

                    //如果已经分享了,则不显示

                    continue;

@@ -431,7 +433,7 @@
            HdlThreadLogic.Current.RunThread(() =>

            {

                //上传文件

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

                var result = HdlShardLogic.Current.UploadSharedContent(this.ChildAccountId, this.lookRoom, listDevice, listScene);

                if (result == true)

                {

                    HdlThreadLogic.Current.RunMain(() =>