From 7923c95d11603f01e57d4c0fbc871c154de83960 Mon Sep 17 00:00:00 2001 From: duhui Date: Thu, 17 Jun 2021 10:53:11 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=83=8A=E5=96=9C=E7=A4=BC=E7=9B=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/logic/activity/ActivityType.java | 1 + .../logic/activity/ActivityTypeEnum.java | 1 + .../logic/activity/SuperBoxActivity.java | 192 ++++++++++++++++++ .../logic/activity/event/SuperBoxEvent.java | 35 ++++ .../jieling/logic/store/BuyGoodsNewLogic.java | 8 +- .../src/main/java/config/SSurpriseBox.java | 83 ++++++++ 6 files changed, 316 insertions(+), 4 deletions(-) create mode 100644 serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SuperBoxActivity.java create mode 100644 serverlogic/src/main/java/com/ljsd/jieling/logic/activity/event/SuperBoxEvent.java create mode 100644 tablemanager/src/main/java/config/SSurpriseBox.java diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java index 9de4eee0b..8e843f8f7 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java @@ -94,5 +94,6 @@ public interface ActivityType { int DEMON_TREASURE = 36;//降妖夺宝 int NEW_GENERAL_ATTACK = 200;//新将来袭 + int SUPER_BOX = 69;//惊喜礼盒 } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java index c8c00e210..a10f10292 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java @@ -72,6 +72,7 @@ public enum ActivityTypeEnum { EQUIP_UPLEVEL(ActivityType.EQUIP_UPLEVEL,EquipUpLevelActivity::new), TA_SUI_LING_XIAO(ActivityType.TA_SUI_LING_XIAO,TaSuiLingXiaoActivity::new), CHOICE_DRAW_CRAD(ActivityType.CHOICE_DRAW_CRAD,ChoiceDrawCardActivity::new), + SUPER_BOX(ActivityType.SUPER_BOX,SuperBoxActivity::new), ; private int type; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SuperBoxActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SuperBoxActivity.java new file mode 100644 index 000000000..4ba3d2aab --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SuperBoxActivity.java @@ -0,0 +1,192 @@ +package com.ljsd.jieling.logic.activity; + +import com.ljsd.jieling.globals.Global; +import com.ljsd.jieling.jbean.ActivityMission; +import com.ljsd.jieling.jbean.ActivityProgressInfo; +import com.ljsd.jieling.logic.OnlineUserManager; +import com.ljsd.jieling.logic.activity.event.IEvent; +import com.ljsd.jieling.logic.activity.event.Poster; +import com.ljsd.jieling.logic.activity.event.SuperBoxEvent; +import com.ljsd.jieling.logic.dao.UserManager; +import com.ljsd.jieling.logic.dao.root.User; +import com.ljsd.jieling.network.session.ISession; +import config.SGlobalActivity; +import config.SSurpriseBox; +import util.TimeUtils; + +import java.util.*; +import java.util.stream.Collectors; + +/** + * @author hj + * 惊喜礼盒活动 + * + * 礼盒状态: + * 已解锁可购买 1 + * 已解锁不可购买 2 + * 未解锁可见可预览 3 + * 未解锁可见不可预览 4 + * 未解锁不可见 5 + * 已购买 6 + */ +@SuppressWarnings("ALL") +public class SuperBoxActivity extends AbstractActivity { + + SuperBoxActivity(int id) { + super(id); + Poster.getPoster().listenEvent(this, SuperBoxEvent.class); + } + + @Override + public void initActivity(User user) throws Exception { + ActivityMission mission = new ActivityMission(); + // 读表获取阶段奖励信息 + Collection boxes = SSurpriseBox.map.get(id).values(); + if (boxes == null || boxes.isEmpty()){ + LOGGER.error("惊喜礼盒初始化失败,活动id:"+id); + boxes = new ArrayList<>(); + } + List list = boxes.stream().mapToInt(SSurpriseBox::getId).boxed().collect(Collectors.toList()); + // 初始化阶段奖励 + ActivityLogic.getInstance().initOtherMission(mission, list); + user.getActivityManager().getActivityMissionMap().put(id, mission); + LOGGER.info("惊喜礼盒初始化..."+id); + } + + @Override + public void onEvent(IEvent event) throws Exception { + // 类型验证 + if (!(event instanceof SuperBoxEvent)) { + return; + } + // 获取信息 + SuperBoxEvent event1 = (SuperBoxEvent) event; + User user = UserManager.getUser(event1.getUserId()); + // 礼包处理 + giftHandle(user, event1.getGiftId()); + // 状态刷新 + updateState(user); + } + + /** + * 礼包处理 + * @param user + * @param giftId + * @param missionMap + */ + private void giftHandle(User user, int giftId){ + if (giftId == -1){ + // 非礼包处理 + return; + } + + Map missionMap = user.getActivityManager().getActivityMissionMap().get(id).getActivityMissionMap(); + Collection boxes = SSurpriseBox.map.getOrDefault(id, new HashMap<>(0)).values(); + + for (SSurpriseBox box : boxes) { + if (box.getPackId() == giftId){ + // 当前礼包状态处理 + ActivityProgressInfo current = missionMap.get(box.getPackId()); + current.setState(8); + missionMap.put(box.getId(),current); + + // 下位礼包数据处理 + ActivityProgressInfo next = missionMap.get(box.getLimitPackId()); + next.setProgrss(1); + missionMap.put(box.getId(),next); + break; + } + } + } + + /** + * 修改状态 + * 次数代码非必要不要进行修改,包含N多的嵌套if + * 不要问我为啥写的这么恶心,因为我自己也不知怎么写出来的 + * @param user + */ + private void updateState(User user){ + long now = TimeUtils.now(); + SGlobalActivity activity = SGlobalActivity.getsGlobalActivityMap().get(id); + // 验证活动是否开启 + if (now < activity.getStartTimeLong() || now > activity.getEndTimeLong()){ + return; + } + ActivityMission mission = user.getActivityManager().getActivityMissionMap().get(id); + // 计算过去了几天 + int days = TimeUtils.getSoFarWentDays(activity.getStartTimeLong(), now); + mission.setV(days); + // mission 单个礼包 + Map missionMap = mission.getActivityMissionMap(); + Map boxMap = SSurpriseBox.map.get(id); + // 极为恶心的循环,包含超多的if-else + for (Map.Entry entry : missionMap.entrySet()) { + int k = entry.getKey(); + ActivityProgressInfo v = entry.getValue(); + int state = v.getState(); + // 是否已购买 + if (state == 8){ + // 已购买 + continue; + } + + SSurpriseBox box = boxMap.get(k); + // 未购买, 是否解锁 + if (days >= box.getUnlockDay()){ + // 已解锁, 可买天数 + if (days >= box.getBuyDay()){ + // 可买, 是否购买前置礼包 + if (v.getProgrss() == 1){ + // 已购买前置. 是否需要特权, 是否激活特权 + state = checkRule(user,box.getRule())?1:4; + }else { + // 未购买前置 + state = 3; + } + }else { + // 不可买 + state = 2; + } + }else { + // 未解锁, 是否可见 + if (days >= box.getVisibleDay()){ + // 可见, 是否可预览 + state = days >= box.getViewDay()?6:7; + }else { + // 不可见 + state = 5; + } + } + v.setState(state); + } + + // 客户端推送 + ISession session = OnlineUserManager.getSessionByUid(user.getId()); + sendActivityProgress(session, mission, null); + } + + /** + * 检测特殊权限 + * 0走默认 true + * @param user + * @param ruleId + * @return + */ + private boolean checkRule(User user, int ruleId){ + boolean result = true; + switch (ruleId){ + case 1: + // 普通月卡 + result = user.getPlayerInfoManager().getMonthCard().get(Global.MONTHCARDID) != null; + break; + case 2: + // 高级月卡 + result = user.getPlayerInfoManager().getMonthCard().get(Global.LMONTHCARDID) != null; + break; + default: + break; + } + return result; + } + +} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/event/SuperBoxEvent.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/event/SuperBoxEvent.java new file mode 100644 index 000000000..cea74ced7 --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/event/SuperBoxEvent.java @@ -0,0 +1,35 @@ +package com.ljsd.jieling.logic.activity.event; + +/** + * @Author hj + * @Date 2021/5/26 11:05 + * @Description: + * @Version 1.0 + */ +public class SuperBoxEvent implements IEvent { + + private int userId; + private int giftId = -1;//礼包id + + public SuperBoxEvent(int userId, int giftId) { + this.userId = userId; + this.giftId = giftId; + } + + public int getUserId() { + return userId; + } + + public void setUserId(int userId) { + this.userId = userId; + } + + public int getGiftId() { + return giftId; + } + + public void setGiftId(int giftId) { + this.giftId = giftId; + } + +} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java index 8f8813626..341bc7cbb 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java @@ -16,10 +16,7 @@ import com.ljsd.jieling.logic.GlobalDataManaager; import com.ljsd.jieling.logic.OnlineUserManager; import com.ljsd.jieling.logic.activity.ActivityLogic; import com.ljsd.jieling.logic.activity.ActivityType; -import com.ljsd.jieling.logic.activity.event.BuyGoodsDirectEvent; -import com.ljsd.jieling.logic.activity.event.NewWelfareEvent; -import com.ljsd.jieling.logic.activity.event.NewWelfareTypeEnum; -import com.ljsd.jieling.logic.activity.event.Poster; +import com.ljsd.jieling.logic.activity.event.*; import com.ljsd.jieling.logic.dao.PlayerManager; import com.ljsd.jieling.logic.dao.RechargeInfo; import com.ljsd.jieling.logic.dao.UserManager; @@ -220,6 +217,9 @@ public class BuyGoodsNewLogic { //活动 user.getPlayerInfoManager().setRechargedaily(user.getPlayerInfoManager().getRechargedaily()+price); changeActivity(user,price,info); + + // 惊喜礼盒,事件推送 + Poster.getPoster().dispatchEvent(new SuperBoxEvent(user.getId(),config.getId())); } if(!info.getIsFirst()){ info.setIsFirst(true); diff --git a/tablemanager/src/main/java/config/SSurpriseBox.java b/tablemanager/src/main/java/config/SSurpriseBox.java new file mode 100644 index 000000000..b4530bbad --- /dev/null +++ b/tablemanager/src/main/java/config/SSurpriseBox.java @@ -0,0 +1,83 @@ +package config; + +import manager.STableManager; +import manager.Table; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Table(name ="SurpriseBox") +public class SSurpriseBox implements BaseConfig { + + private int id; + + private int activityId; + + private int packId; + + private int unlockDay; + + private int visibleDay; + + private int viewDay; + + private int buyDay; + + private int limitPackId; + + private int rule; + + /** + * key: 活动id value: 对象list + */ + public static Map> map = new HashMap<>(); + + @Override + public void init() throws Exception { + Map config = STableManager.getConfig(SSurpriseBox.class); + config.values().forEach(v->{ + Map boxMap = map.getOrDefault(v.getActivityId(), new HashMap<>()); + boxMap.put(v.getId(),v); + map.put(v.getActivityId(),boxMap); + }); + } + + + public int getId() { + return id; + } + + public int getActivityId() { + return activityId; + } + + public int getPackId() { + return packId; + } + + public int getVisibleDay() { + return visibleDay; + } + + public int getBuyDay() { + return buyDay; + } + + public int getLimitPackId() { + return limitPackId; + } + + public int getRule() { + return rule; + } + + public int getUnlockDay() { + return unlockDay; + } + + public int getViewDay() { + return viewDay; + } +} \ No newline at end of file From eac97377b29dbaa3e9158a11d556d16af48e963c Mon Sep 17 00:00:00 2001 From: duhui Date: Thu, 17 Jun 2021 11:01:57 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=83=8A=E5=96=9C=E7=A4=BC=E7=9B=92,=20?= =?UTF-8?q?=E9=9B=B6=E7=82=B9=E5=88=B7=E6=96=B0=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/logic/GlobalDataManaager.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java index 2bcfe393d..30bd87bb0 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java @@ -13,6 +13,8 @@ import com.ljsd.jieling.logic.activity.ActivityLogic; import com.ljsd.jieling.logic.activity.FightMainEventHandler; import com.ljsd.jieling.logic.activity.RemoveEventHeroHandler; import com.ljsd.jieling.logic.activity.UserLevelEventHandler; +import com.ljsd.jieling.logic.activity.event.Poster; +import com.ljsd.jieling.logic.activity.event.SuperBoxEvent; import com.ljsd.jieling.logic.redpacket.WelfareRedPackSendHandler; import com.ljsd.jieling.logic.activity.eventhandler.ActivityStateChangeHandler; import com.ljsd.jieling.logic.activity.eventhandler.BuyGoodsDirectHandler; @@ -380,6 +382,9 @@ public class GlobalDataManaager implements IManager { // 道具刷新 BuyGoodsNewLogic.refreshWelfareState(user); user.getUserMissionManager().onGameEvent(user, GameEvent.LOGIN_GAME,0); + + // 惊喜礼盒,事件推送 + Poster.getPoster().dispatchEvent(new SuperBoxEvent(user.getId(),-1)); } user.getPlayerInfoManager().setLoginTime(TimeUtils.now()); } From 8811d07aced3b6c7165b62000f8a5b5290227335 Mon Sep 17 00:00:00 2001 From: duhui Date: Thu, 17 Jun 2021 14:21:20 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=83=8A=E5=96=9C=E7=9B=92=E5=AD=90,?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logic/activity/SuperBoxActivity.java | 36 +++++++++++++------ .../src/main/java/config/SSurpriseBox.java | 14 +++++--- 2 files changed, 35 insertions(+), 15 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SuperBoxActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SuperBoxActivity.java index 4ba3d2aab..04e932b24 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SuperBoxActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SuperBoxActivity.java @@ -41,15 +41,26 @@ public class SuperBoxActivity extends AbstractActivity { public void initActivity(User user) throws Exception { ActivityMission mission = new ActivityMission(); // 读表获取阶段奖励信息 - Collection boxes = SSurpriseBox.map.get(id).values(); - if (boxes == null || boxes.isEmpty()){ + Map boxMap = SSurpriseBox.map.getOrDefault(id,new HashMap<>()); + if (boxMap.isEmpty()){ LOGGER.error("惊喜礼盒初始化失败,活动id:"+id); - boxes = new ArrayList<>(); } - List list = boxes.stream().mapToInt(SSurpriseBox::getId).boxed().collect(Collectors.toList()); + List list = boxMap.values().stream().mapToInt(SSurpriseBox::getId).boxed().collect(Collectors.toList()); // 初始化阶段奖励 ActivityLogic.getInstance().initOtherMission(mission, list); + + // 第一位的礼包初始化参数 + for (Map.Entry entry : mission.getActivityMissionMap().entrySet()) { + SSurpriseBox box = boxMap.get(entry.getKey()); + if (box != null && box.getLimitPackFId() == 0){ + entry.getValue().setProgrss(1); + break; + } + } + user.getActivityManager().getActivityMissionMap().put(id, mission); + // 修改状态 + updateState(user); LOGGER.info("惊喜礼盒初始化..."+id); } @@ -86,14 +97,17 @@ public class SuperBoxActivity extends AbstractActivity { for (SSurpriseBox box : boxes) { if (box.getPackId() == giftId){ // 当前礼包状态处理 - ActivityProgressInfo current = missionMap.get(box.getPackId()); - current.setState(8); - missionMap.put(box.getId(),current); - + ActivityProgressInfo current = missionMap.get(box.getId()); + if (current != null){ + current.setState(8); + missionMap.put(box.getId(),current); + } // 下位礼包数据处理 - ActivityProgressInfo next = missionMap.get(box.getLimitPackId()); - next.setProgrss(1); - missionMap.put(box.getId(),next); + ActivityProgressInfo next = missionMap.get(box.getLimitPackBId()); + if (next != null){ + next.setProgrss(1); + missionMap.put(box.getId(),next); + } break; } } diff --git a/tablemanager/src/main/java/config/SSurpriseBox.java b/tablemanager/src/main/java/config/SSurpriseBox.java index b4530bbad..bf04bc914 100644 --- a/tablemanager/src/main/java/config/SSurpriseBox.java +++ b/tablemanager/src/main/java/config/SSurpriseBox.java @@ -25,7 +25,9 @@ public class SSurpriseBox implements BaseConfig { private int buyDay; - private int limitPackId; + private int limitPackFId; + + private int limitPackBId; private int rule; @@ -65,11 +67,15 @@ public class SSurpriseBox implements BaseConfig { return buyDay; } - public int getLimitPackId() { - return limitPackId; + public int getLimitPackFId() { + return limitPackFId; } - public int getRule() { + public int getLimitPackBId() { + return limitPackBId; + } + + public int getRule() { return rule; } From 374cd9d58da481254f43e875b430dc0a98e8fedf Mon Sep 17 00:00:00 2001 From: duhui Date: Sat, 12 Jun 2021 18:07:13 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=83=8A=E5=96=9C=E7=A4=BC=E7=9B=92,?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logic/activity/SuperBoxActivity.java | 61 +++++++++++-------- 1 file changed, 35 insertions(+), 26 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SuperBoxActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SuperBoxActivity.java index 04e932b24..a2392d61d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SuperBoxActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SuperBoxActivity.java @@ -12,6 +12,7 @@ import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.network.session.ISession; import config.SGlobalActivity; import config.SSurpriseBox; +import manager.STableManager; import util.TimeUtils; import java.util.*; @@ -48,16 +49,6 @@ public class SuperBoxActivity extends AbstractActivity { List list = boxMap.values().stream().mapToInt(SSurpriseBox::getId).boxed().collect(Collectors.toList()); // 初始化阶段奖励 ActivityLogic.getInstance().initOtherMission(mission, list); - - // 第一位的礼包初始化参数 - for (Map.Entry entry : mission.getActivityMissionMap().entrySet()) { - SSurpriseBox box = boxMap.get(entry.getKey()); - if (box != null && box.getLimitPackFId() == 0){ - entry.getValue().setProgrss(1); - break; - } - } - user.getActivityManager().getActivityMissionMap().put(id, mission); // 修改状态 updateState(user); @@ -99,15 +90,10 @@ public class SuperBoxActivity extends AbstractActivity { // 当前礼包状态处理 ActivityProgressInfo current = missionMap.get(box.getId()); if (current != null){ - current.setState(8); + current.setState(ActivityType.HAD_TAKED); + current.setProgrss(8); missionMap.put(box.getId(),current); } - // 下位礼包数据处理 - ActivityProgressInfo next = missionMap.get(box.getLimitPackBId()); - if (next != null){ - next.setProgrss(1); - missionMap.put(box.getId(),next); - } break; } } @@ -137,9 +123,9 @@ public class SuperBoxActivity extends AbstractActivity { for (Map.Entry entry : missionMap.entrySet()) { int k = entry.getKey(); ActivityProgressInfo v = entry.getValue(); - int state = v.getState(); + int progrss = v.getProgrss(); // 是否已购买 - if (state == 8){ + if (progrss == 8){ // 已购买 continue; } @@ -150,28 +136,28 @@ public class SuperBoxActivity extends AbstractActivity { // 已解锁, 可买天数 if (days >= box.getBuyDay()){ // 可买, 是否购买前置礼包 - if (v.getProgrss() == 1){ + if (checkBuyAgo(user,box.getId())){ // 已购买前置. 是否需要特权, 是否激活特权 - state = checkRule(user,box.getRule())?1:4; + progrss = checkRule(user,box.getRule())?1:4; }else { // 未购买前置 - state = 3; + progrss = 3; } }else { // 不可买 - state = 2; + progrss = 2; } }else { // 未解锁, 是否可见 if (days >= box.getVisibleDay()){ // 可见, 是否可预览 - state = days >= box.getViewDay()?6:7; + progrss = days >= box.getViewDay()?6:7; }else { // 不可见 - state = 5; + progrss = 5; } } - v.setState(state); + v.setProgrss(progrss); } // 客户端推送 @@ -179,6 +165,29 @@ public class SuperBoxActivity extends AbstractActivity { sendActivityProgress(session, mission, null); } + /** + * 验证前置礼包购买状态 + * @param user + * @param boxId + * @return + */ + private boolean checkBuyAgo(User user, int boxId){ + boolean result = true; + // 获取消息 + Map missionMap = user.getActivityManager().getActivityMissionMap().get(id).getActivityMissionMap(); + SSurpriseBox box = STableManager.getConfig(SSurpriseBox.class).get(boxId); + // 非空 + if (!missionMap.isEmpty() && box != null){ + // 前置礼包状态验证 + ActivityProgressInfo info = missionMap.get(box.getLimitPackFId()); + // info为null代表没有前置条件, state==2代表已买过 + if (info != null && info.getState() == ActivityType.WILL_TAKE){ + result = false; + } + } + return result; + } + /** * 检测特殊权限 * 0走默认 true