Merge branch 'CJL' into NewFilePath

wxr

2020-12-23 fa7d172c21d4a78925ae39b3cbfe7b100c3dead9

 HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs

old mode 100755
new mode 100644
@@ -67,11 +67,12 @@
                        act = new PublicAssmebly().TipLoadingMsgDialog(Language.StringByID(StringId.SavingPleaseWait));
                    });

                    if (!string.IsNullOrEmpty(roomId))
                    {
                        //如果房间ID不为空，管理房间
                        ManageRoomSharing();
                    }
                    //2020-12-22 屏蔽房间分享管理
                    //if (!string.IsNullOrEmpty(roomId))
                    //{
                    //    //如果房间ID不为空，管理房间
                    //    ManageRoomSharing();
                    //}
                  

                    //2.批量删除分享
@@ -296,12 +297,12 @@
        /// <param name="btn2"></param>
        /// <param name="btn3"></param>
        /// <param name="function"></param>
        void LoadMethod_SharedDataChange(Button btnChoose, Button btn2, FrameLayout btn3, Function function)
        void LoadMethod_SharedDataChange(Button btnChoose, Button btn2, FrameLayout btn3, RoomData roomData)
        {
            EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
            {
                btnChoose.IsSelected = !btnChoose.IsSelected;
                var sd = curResidenceShareData.Find((obj) => obj.shareTypeId == function.deviceId);
                var sd = curResidenceShareData.Find((obj) => obj.shareTypeId == roomData.shareTypeId);
                if (btnChoose.IsSelected)
                {
                    try
@@ -320,14 +321,14 @@
                        else
                        {
                            var newSd = new ShareData();
                            newSd.shareTypeId = function.deviceId;
                            newSd.shareTypeId = roomData.shareTypeId;

                            funs_RoomAll.Add(newSd);
                        }
                        btnChooseAll.IsSelected = true;
                        foreach (var f in roomFunctionList)
                        foreach (var f in roomFunctionOrSceneList)
                        {
                            if (funs_RoomAll.Find((obj) => obj.shareTypeId == f.deviceId) == null)
                            if (funs_RoomAll.Find((obj) => obj.shareTypeId == f.shareTypeId) == null)
                            {
                                btnChooseAll.IsSelected = false;
                                break;
@@ -341,7 +342,7 @@
                }
                else
                {
                    var onFuns = funs_RoomAll.Find((obj) => obj.shareTypeId == function.deviceId);
                    var onFuns = funs_RoomAll.Find((obj) => obj.shareTypeId == roomData.shareTypeId);
                    if (funs_RoomAll.Contains(onFuns))
                    {
                        funs_RoomAll.Remove(onFuns);
@@ -374,18 +375,19 @@
                funs_RoomAll = new List<ShareData>();
                if (btnChooseAll.IsSelected)
                {
                    foreach (var f in roomFunctionList)
                    foreach (var f in roomFunctionOrSceneList)
                    {
                        var ssdd = new ShareData();
                        ssdd.shareTypeId = f.deviceId;
                        ssdd.shareTypeId = f.shareTypeId;
                        ssdd.shareType = f.shareType;
                        funs_RoomAll.Add(ssdd);
                    }
                }
                else
                {
                    foreach (var f in roomFunctionList)
                    foreach (var f in roomFunctionOrSceneList)
                    {
                        var sd = curResidenceShareData.Find((obj) => obj.shareTypeId == f.deviceId);
                        var sd = curResidenceShareData.Find((obj) => obj.shareTypeId == f.shareTypeId);
                        if (sd != null)
                        {
                            funs_Del.Add(sd);
@@ -399,4 +401,7 @@

        }
    }


   
}