Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

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

@@ -1,7 +1,6 @@
using System;

using System.Collections.Generic;

using System.Text;

using System.Threading.Tasks;

using ZigBee.Device;



namespace Shared.Phone.UserCenter.SharedContent

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

        /// </summary>

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

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

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

        {

            this.lookRoom = i_room;