2020-09-01

wxr

2020-09-01 7d005a7618e3d7a80d8ede3baf6ecc4bf8019cd5

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

@@ -110,7 +110,7 @@
            //        funss.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<ShareData>(CommonPage.MyEncodingUTF8.GetString(sd.ShareDataBytes)));
            //    }
            //}
            foreach (var room in DB_ResidenceData.residenceData.rooms)
            foreach (var room in DB_ResidenceData.rooms)
            {
                var roomView = new FrameLayout()
                {
@@ -136,7 +136,7 @@
                int addCount = 0;
                foreach (var sd in memberInfo.CurResidenceShareDate)
                {
                    if (room.functions.Find((obj) => obj.sid == sd.ShareName) != null)
                    if (room.GetRoomFunctions(false).Find((obj) => obj.sid == sd.ShareName) != null)
                    {
                        addCount++;
                    }
@@ -145,7 +145,7 @@
                for(int i= 0;i< memberInfo.CurResidenceShareDate.Count;)
                {
                    var sd = memberInfo.CurResidenceShareDate[i];
                    if (DB_ResidenceData.residenceData.functionList.functions.Find((obj) => obj.sid == sd.ShareName) == null)
                    if (DB_ResidenceData.functionList.GetAllFunction().Find((obj) => obj.sid == sd.ShareName) == null)
                    {
                        new DAL.Server.HttpServerRequest().DeleteShareData(sd);
                        memberInfo.CurResidenceShareDate.Remove(sd);
@@ -165,7 +165,7 @@
                    TextAlignment = TextAlignment.CenterLeft,
                    TextColor = CSS_Color.PromptingColor1,
                    TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
                    Text = addCount + "/" + room.functions.Count.ToString(),
                    Text = addCount + "/" + room.GetRoomFunctions(false).Count.ToString(),
                };
                roomView.AddChidren(btnFunctionCount);

@@ -182,7 +182,7 @@
                EventHandler<MouseEventArgs> eHandler = (sender, e) =>
                {
                    Action<string> refreshFunctionCount = (newCount) => {
                        btnFunctionCount.Text = newCount + "/" + room.functions.Count.ToString();
                        btnFunctionCount.Text = newCount + "/" + room.GetRoomFunctions(false).Count.ToString();
                    };
                    var mmp = new MemberFunctionPermissionPage(memberInfo, room,refreshFunctionCount);
                    MainPage.BasePageView.AddChidren(mmp);
@@ -193,7 +193,7 @@
                btnRoomName.MouseUpEventHandler = eHandler;
                btnRight.MouseUpEventHandler = eHandler;

                if (DB_ResidenceData.residenceData.rooms.IndexOf(room) < DB_ResidenceData.residenceData.rooms.Count - 2)
                if (DB_ResidenceData.rooms.IndexOf(room) < DB_ResidenceData.rooms.Count - 2)
                {
                    var btnRoomLine = new Button()
                    {
@@ -207,7 +207,7 @@
                }
            }

            if (DB_ResidenceData.residenceData.rooms.Count > 10)
            if (DB_ResidenceData.rooms.Count > 10)
            {
                roomListView.ScrollEnabled = true;
            }