yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove旧的发起私聊限制逻辑

Browse Source
This commit is contained in:
oujunhui
2020-09-30 14:06:03 +08:00
parent 872c0a5f50
commit b3516407c5
10 changed files with 10 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/yizhuan/erban/team/view/NimTeamMessageActivity.java
View File

@@ -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;
}

2
app/src/main/java/com/yizhuan/erban/ui/im/avtivity/NimP2PMessageActivity.java
View File

@@ -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;

20
app/src/main/java/com/yizhuan/erban/ui/im/fragment/MessageFragment.java
View File

@@ -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<Boolean> 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;
}
}

2
app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/HallTeamMessageActivity.java
View File

@@ -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;

1
app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MWTeamRoomMessageAct.java
View File

@@ -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)

1
app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldTeamMessageActivity.java
View File

@@ -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)

2
app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/NimHallTeamRoomMessageActivity.java
View File

@@ -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;

1
app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/NimRoomP2PMessageActivity.java
View File

@@ -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) {

2
app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/NimTeamRoomMessageActivity.java
View File

@@ -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;
}

13
nim_uikit/src/com/netease/nim/uikit/business/session/fragment/MessageFragment.java
View File

@@ -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) {