Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -95,9 +95,7 @@ public class PDLiveConversationActivity extends AbsActivity implements View.OnCl
|
||||
private void initData() {
|
||||
targetId = getIntent().getStringExtra("targetId");
|
||||
NoviceInstructorModel model = NoviceInstructorManager.get(this).getNoviceInstructor();
|
||||
if (model != null && !TextUtils.isEmpty(model.getMsgZdySendText())) {
|
||||
inputPanel.setPresetInformation(model.getMsgZdySendText());
|
||||
}
|
||||
|
||||
//绑定聊天用户id
|
||||
inputPanel.setTargetId(targetId);
|
||||
//获取用户信息
|
||||
@@ -108,6 +106,9 @@ public class PDLiveConversationActivity extends AbsActivity implements View.OnCl
|
||||
SearchUserBean userBean = GsonUtils.fromJson(userInfo.getExtra(), SearchUserBean.class);
|
||||
//新手指导员
|
||||
if (!TextUtils.isEmpty(userBean.getIs_admin()) && TextUtils.equals(userBean.getIs_admin(), "1")) {
|
||||
if (model != null && !TextUtils.isEmpty(model.getMsgZdySendText())) {
|
||||
inputPanel.setPresetInformation(model.getMsgZdySendText());
|
||||
}
|
||||
isAdmin = true;
|
||||
imgMore.setVisibility(View.GONE);
|
||||
AdjustEvent adjustEvent1 = new AdjustEvent("exlgn3");
|
||||
|
||||
Reference in New Issue
Block a user