From b3516407c5f2b0059d06bf797e6be7b1268a8e42 Mon Sep 17 00:00:00 2001 From: oujunhui <313127320@qq.com> Date: Wed, 30 Sep 2020 14:06:03 +0800 Subject: [PATCH] =?UTF-8?q?remove=E6=97=A7=E7=9A=84=E5=8F=91=E8=B5=B7?= =?UTF-8?q?=E7=A7=81=E8=81=8A=E9=99=90=E5=88=B6=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../team/view/NimTeamMessageActivity.java | 2 -- .../ui/im/avtivity/NimP2PMessageActivity.java | 2 -- .../erban/ui/im/fragment/MessageFragment.java | 20 +++++++++---------- .../activity/HallTeamMessageActivity.java | 2 -- .../activity/MWTeamRoomMessageAct.java | 1 - .../MiniWorldTeamMessageActivity.java | 1 - .../NimHallTeamRoomMessageActivity.java | 2 -- .../activity/NimRoomP2PMessageActivity.java | 1 - .../activity/NimTeamRoomMessageActivity.java | 2 -- .../session/fragment/MessageFragment.java | 13 +----------- 10 files changed, 10 insertions(+), 36 deletions(-) diff --git a/app/src/main/java/com/yizhuan/erban/team/view/NimTeamMessageActivity.java b/app/src/main/java/com/yizhuan/erban/team/view/NimTeamMessageActivity.java index 74ad1652d..669bfdf0c 100644 --- a/app/src/main/java/com/yizhuan/erban/team/view/NimTeamMessageActivity.java +++ b/app/src/main/java/com/yizhuan/erban/team/view/NimTeamMessageActivity.java @@ -395,12 +395,10 @@ public class NimTeamMessageActivity extends BaseMessageActivity { if (userLevelVo != null) { fragment.setCurrentLevel(userLevelVo.experLevelSeq); } - fragment.setCurrentRegisterDay(userInfo.getRegisterDay()); } InitInfo initInfo = InitialModel.get().getCacheInitInfo(); if (initInfo != null) { fragment.setLimitLevel(initInfo.getPrivateChatLevelNo()); - fragment.setLimitRegisterDay(initInfo.getPrivateChatRegisterDay()); } return fragment; } diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/NimP2PMessageActivity.java b/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/NimP2PMessageActivity.java index 5f8619b5f..8c0bc6e47 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/NimP2PMessageActivity.java +++ b/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/NimP2PMessageActivity.java @@ -431,12 +431,10 @@ public class NimP2PMessageActivity extends NewBaseMessageActivity { if (userLevelVo != null) { fragment.setCurrentLevel(userLevelVo.experLevelSeq); } - fragment.setCurrentRegisterDay(userInfo.getRegisterDay()); } InitInfo initInfo = InitialModel.get().getCacheInitInfo(); if (initInfo != null) { fragment.setLimitLevel(initInfo.getPrivateChatLevelNo()); - fragment.setLimitRegisterDay(initInfo.getPrivateChatRegisterDay()); } } return fragment; diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/fragment/MessageFragment.java b/app/src/main/java/com/yizhuan/erban/ui/im/fragment/MessageFragment.java index 5ef5459ff..07bf45b8f 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/fragment/MessageFragment.java +++ b/app/src/main/java/com/yizhuan/erban/ui/im/fragment/MessageFragment.java @@ -56,6 +56,7 @@ import com.yizhuan.erban.R; import com.yizhuan.erban.avroom.game.GameSelectDialog; import com.yizhuan.erban.avroom.game.PlayGameActivity; import com.yizhuan.erban.bindadapter.BaseAdapter; +import com.yizhuan.erban.event.MessageSizeEvent; import com.yizhuan.erban.ui.im.GreetPresenter; import com.yizhuan.erban.ui.im.MessageListPanelEx; import com.yizhuan.erban.ui.im.avtivity.NimP2PMessageActivity; @@ -139,9 +140,6 @@ public class MessageFragment extends TFragment implements ModuleProxy, MessageLi private int limitLevel; private int currentLevel; - private int limitRegisterDay; - private int currentRegisterDay; - @Override public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); @@ -345,7 +343,7 @@ public class MessageFragment extends TFragment implements ModuleProxy, MessageLi if (inputPanel == null) { inputPanel = new InputPanel(container, rootView, getActionList()); inputPanel.setCustomization(customization); - inputPanel.setLimitLevel(limitLevel, currentLevel,limitRegisterDay,currentRegisterDay); + inputPanel.setLimitLevel(limitLevel, currentLevel); } else { inputPanel.reload(container, customization); } @@ -763,6 +761,13 @@ public class MessageFragment extends TFragment implements ModuleProxy, MessageLi } } +// @Subscribe(threadMode = ThreadMode.MAIN) +// public void onReloadInputPanel(MessageSizeEvent event) { +// if (inputPanel != null) { +// inputPanel.setLimitLevel(limitLevel, currentLevel); +// } +// } + @SuppressLint("CheckResult") public Observable checkPermission(String... mPerms) { return rxPermissions.request(mPerms); @@ -803,11 +808,4 @@ public class MessageFragment extends TFragment implements ModuleProxy, MessageLi this.currentLevel = currentLevel; } - public void setLimitRegisterDay(int limitRegisterDay) { - this.limitRegisterDay = limitRegisterDay; - } - - public void setCurrentRegisterDay(int currentRegisterDay){ - this.currentRegisterDay = currentRegisterDay; - } } diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/HallTeamMessageActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/HallTeamMessageActivity.java index d0c3f7ae7..760588dcf 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/HallTeamMessageActivity.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/HallTeamMessageActivity.java @@ -340,12 +340,10 @@ public class HallTeamMessageActivity extends BaseMessageActivity { if (userLevelVo != null) { fragment.setCurrentLevel(userLevelVo.experLevelSeq); } - fragment.setCurrentRegisterDay(userInfo.getRegisterDay()); } InitInfo initInfo = InitialModel.get().getCacheInitInfo(); if (initInfo != null) { fragment.setLimitLevel(initInfo.getPrivateChatLevelNo()); - fragment.setLimitRegisterDay(initInfo.getPrivateChatRegisterDay()); } return fragment; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MWTeamRoomMessageAct.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MWTeamRoomMessageAct.java index 985838192..9c25cd025 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MWTeamRoomMessageAct.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MWTeamRoomMessageAct.java @@ -534,7 +534,6 @@ public class MWTeamRoomMessageAct extends BaseMessageActivity implements IMWTeam if (userLevelVo != null){ fragment.setCurrentLevel(userLevelVo.experLevelSeq); } - fragment.setCurrentRegisterDay(userInfo.getRegisterDay()); } InitInfo initInfo = InitialModel.get().getCacheInitInfo(); if (initInfo != null) diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldTeamMessageActivity.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldTeamMessageActivity.java index ea896751c..f37a37b74 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldTeamMessageActivity.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldTeamMessageActivity.java @@ -583,7 +583,6 @@ public class MiniWorldTeamMessageActivity extends BaseMessageActivity implements if (userLevelVo != null){ fragment.setCurrentLevel(userLevelVo.experLevelSeq); } - fragment.setCurrentRegisterDay(userInfo.getRegisterDay()); } InitInfo initInfo = InitialModel.get().getCacheInitInfo(); if (initInfo != null) diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/NimHallTeamRoomMessageActivity.java b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/NimHallTeamRoomMessageActivity.java index 0f2881643..2242194fc 100644 --- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/NimHallTeamRoomMessageActivity.java +++ b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/NimHallTeamRoomMessageActivity.java @@ -328,12 +328,10 @@ public class NimHallTeamRoomMessageActivity extends BaseMessageActivity { if (userLevelVo != null) { fragment.setCurrentLevel(userLevelVo.experLevelSeq); } - fragment.setCurrentRegisterDay(userInfo.getRegisterDay()); } InitInfo initInfo = InitialModel.get().getCacheInitInfo(); if (initInfo != null) { fragment.setLimitLevel(initInfo.getPrivateChatLevelNo()); - fragment.setLimitRegisterDay(initInfo.getPrivateChatRegisterDay()); } return fragment; diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/NimRoomP2PMessageActivity.java b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/NimRoomP2PMessageActivity.java index 26bc12cba..7c2e33c69 100644 --- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/NimRoomP2PMessageActivity.java +++ b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/NimRoomP2PMessageActivity.java @@ -284,7 +284,6 @@ public class NimRoomP2PMessageActivity extends NewBaseMessageActivity { if (userLevelVo != null) { fragment.setCurrentLevel(userLevelVo.experLevelSeq); } - fragment.setCurrentRegisterDay(userInfo.getRegisterDay()); } InitInfo initInfo = InitialModel.get().getCacheInitInfo(); if (initInfo != null) { diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/NimTeamRoomMessageActivity.java b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/NimTeamRoomMessageActivity.java index 0f117eb29..0b67ca25e 100644 --- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/NimTeamRoomMessageActivity.java +++ b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/NimTeamRoomMessageActivity.java @@ -386,12 +386,10 @@ public class NimTeamRoomMessageActivity extends BaseMessageActivity { if (userLevelVo != null) { fragment.setCurrentLevel(userLevelVo.experLevelSeq); } - fragment.setCurrentRegisterDay(userInfo.getRegisterDay()); } InitInfo initInfo = InitialModel.get().getCacheInitInfo(); if (initInfo != null) { fragment.setLimitLevel(initInfo.getPrivateChatLevelNo()); - fragment.setLimitRegisterDay(initInfo.getPrivateChatRegisterDay()); } return fragment; } diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/fragment/MessageFragment.java b/nim_uikit/src/com/netease/nim/uikit/business/session/fragment/MessageFragment.java index 3c8b65412..74c58b1c7 100644 --- a/nim_uikit/src/com/netease/nim/uikit/business/session/fragment/MessageFragment.java +++ b/nim_uikit/src/com/netease/nim/uikit/business/session/fragment/MessageFragment.java @@ -161,7 +161,7 @@ public class MessageFragment extends TFragment implements ModuleProxy, MessageLi boolean isTextAudioSwitchShow = getArguments().getBoolean("isTextAudioSwitchShow", true); inputPanel = new InputPanel(container, rootView, getActionList(), isTextAudioSwitchShow); inputPanel.setCustomization(customization); - inputPanel.setLimitLevel(limitLevel, currentLevel,limitRegisterDay,currentRegisterDay); + inputPanel.setLimitLevel(limitLevel, currentLevel); if (moreCustomDrawable > 0 && moreCustomId > 0) // 自定义更多按钮只响应哪个功能 inputPanel.setMoreFuntionButtonInInputBar(moreCustomDrawable, moreCustomId); @@ -476,17 +476,6 @@ public class MessageFragment extends TFragment implements ModuleProxy, MessageLi this.currentLevel = currentLevel; } - private int limitRegisterDay; - public void setLimitRegisterDay(int limitRegisterDay) { - Log.i("setLimitRegisterDay", "" + limitRegisterDay); - this.limitRegisterDay = limitRegisterDay; - } - - private int currentRegisterDay; - public void setCurrentRegisterDay(int currentRegisterDay) { - this.currentRegisterDay = currentRegisterDay; - } - boolean canAudioPartyOpen = true; public void setmAudioPartyOpenVisible(boolean visible) {