Merge branch 'master' into leonard

client_Wu Xijin

2018-08-15 0012445c0109fa67987800a1bac8f32e989b2d19

 System/SystemSetting/ActivitiesPushMgr.cs

@@ -63,6 +63,8 @@
        {

            SetRankStartPushInfo();

            SetRankEndPushInfo();

            RemovePushByActiveClose(PushInfoType.RankStart);

            RemovePushByActiveClose(PushInfoType.RankEnd);

        }



        private void SetRankStartPushInfo()

@@ -115,6 +117,33 @@
            }

        }



        private void RemovePushByActiveClose(PushInfoType type)

        {

            switch (type)

            {

                case PushInfoType.RankStart:

                    for (int i = 0; i < rankTypelist.Count; i++)

                    {

                        int rankStartId = WholePeopleRankStart + rankTypelist[i];

                        if (impactRank.IsActivityClose(rankTypelist[i]))

                        {

                            RemovePushInfo(rankStartId);

                        }

                    }

                    break;

                case PushInfoType.RankEnd:

                    for (int i = 0; i < rankTypelist.Count; i++)

                    {

                        int rankEndId = WholePeopleRankEnd + rankTypelist[i];

                        if (impactRank.IsActivityClose(rankTypelist[i]))

                        {

                            RemovePushInfo(rankEndId);

                        }

                    }

                    break;

            }

        }



        private void RemovePushByTime(PushInfoType type,int time)

        {

            int remainHour = time - TimeUtility.ServerNow.Hour;

@@ -126,11 +155,7 @@
                    for (int i = 0; i < rankTypelist.Count; i++)

                    {

                        int rankStartId = WholePeopleRankStart + rankTypelist[i];

                        if (impactRank.IsActivityClose(rankTypelist[i]))

                        {

                            RemovePushInfo(rankStartId);

                        }

                        else

                        if (!impactRank.IsActivityClose(rankTypelist[i]))

                        {

                            int day = impactRank.GetOpenDay(rankTypelist[i]);

                            if (day <= 0 && remainSecond <= 120)

@@ -144,11 +169,7 @@
                    for (int i = 0; i < rankTypelist.Count; i++)

                    {

                        int rankEndId = WholePeopleRankEnd + rankTypelist[i];

                        if (impactRank.IsActivityClose(rankTypelist[i]))

                        {

                            RemovePushInfo(rankEndId);

                        }

                        else

                        if (!impactRank.IsActivityClose(rankTypelist[i]))

                        {

                            int day = impactRank.GetSurplusDay(rankTypelist[i]);

                            if (day <= 1 && remainSecond <= 120)