合并代码 ver.10086

黄学彪

2020-01-17 4b378188ce972df432b23d9cb73babb6cc0679c6

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs

@@ -72,7 +72,7 @@
            for (int i = 0; i < listDistributedMark.Count; i++)

            {

                string keys = listDistributedMark[i];

                var dataPra = new { DistributedMark = keys, HouseDistributedMark = Common.Config.Instance.Home.Id, IsOtherAccountControl = Common.Config.Instance.isAdministrator };

                var dataPra = new { DistributedMark = keys, HouseDistributedMark = Common.Config.Instance.Home.Id, IsOtherAccountControl = Common.Config.Instance.Home.IsOthreShare };

                var result = await UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeDataShare/GetOneShareData", false, dataPra);

                if (result == null)

                {

@@ -248,7 +248,7 @@
            }



            //获取主人分享给成员的文件列表

            var infoPra = new { DistributedMark = Config.Instance.Guid, HouseDistributedMark = Common.Config.Instance.Home.Id, IsOtherAccountControl = Common.Config.Instance.isAdministrator };

            var infoPra = new { DistributedMark = Config.Instance.Guid, HouseDistributedMark = Common.Config.Instance.Home.Id, IsOtherAccountControl = Common.Config.Instance.Home.IsOthreShare };

            var listNotShow = new List<string>() { "NotSetAgain" };

            var result = await UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeDataShare/GetShareDataBySubAccount", false, infoPra, listNotShow);

            if (string.IsNullOrEmpty(result) == true)

@@ -348,7 +348,7 @@
            {

                listShardFile = new HashSet<string>();

                //获取主人分享给成员的文件列表

                var infoPra = new { DistributedMark = Config.Instance.Guid, HouseDistributedMark = Common.Config.Instance.Home.Id, IsOtherAccountControl = Common.Config.Instance.isAdministrator };

                var infoPra = new { DistributedMark = Config.Instance.Guid, HouseDistributedMark = Common.Config.Instance.Home.Id, IsOtherAccountControl = Common.Config.Instance.Home.IsOthreShare };

                var listNotShow = new List<string>() { "NotSetAgain" };

                var result = await UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeDataShare/GetShareDataBySubAccount", false, infoPra, listNotShow);

                if (string.IsNullOrEmpty(result) == true)

@@ -502,7 +502,7 @@
            {

                DistributedMark = memberShardInfo.SubAccountDistributedMark,

                HouseDistributedMark = Shared.Common.Config.Instance.HomeId,

                IsOtherAccountControl = Common.Config.Instance.isAdministrator

                IsOtherAccountControl = Common.Config.Instance.Home.IsOthreShare

            };

            var result = await UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeDataShare/GetShareDataBySubAccount", false, infoPra);

            if (result == null)