yutou/pandorapan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

11111

Browse Source
This commit is contained in:
18401019693
2022-07-26 18:28:47 +08:00
parent a4153da415
commit f00fcac663
8 changed files with 91 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
live/src/main/java/com/yunbao/live/activity/PDLiveConversationActivity.java
View File

@@ -22,7 +22,9 @@ import com.yunbao.common.activity.AbsActivity;
import com.yunbao.common.activity.SelectImageActivity;
import com.yunbao.common.bean.IMLoginModel;
import com.yunbao.common.bean.ImageEntity;
import com.yunbao.common.bean.NoviceInstructorModel;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.manager.NoviceInstructorManager;
import com.yunbao.common.manager.imrongcloud.MessageIMManager;
import com.yunbao.live.R;
import com.yunbao.live.bean.SearchUserBean;
@@ -81,11 +83,15 @@ 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);
//获取用户信息
UserInfo userInfo = RongUserInfoManager.getInstance().getUserInfo(targetId);
if (null!=userInfo){
if (null != userInfo) {
titleView.setText(userInfo.getName());
if (!TextUtils.isEmpty(userInfo.getExtra())) {
SearchUserBean userBean = GsonUtils.fromJson(userInfo.getExtra(), SearchUserBean.class);
@@ -99,7 +105,7 @@ public class PDLiveConversationActivity extends AbsActivity implements View.OnCl
}
Log.e("PDLiveConversation", userInfo.getExtra());
}
}else {
} else {
titleView.setText("系統消息");
inputPanel.setVisibility(View.GONE);
}
@@ -122,14 +128,7 @@ public class PDLiveConversationActivity extends AbsActivity implements View.OnCl
titleView = findViewById(R.id.titleView);
imgMore = findViewById(R.id.img_more);
imBack = findViewById(R.id.btn_back);
findViewById(R.id.root_layout).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
InputMethodManager imm = (InputMethodManager)
getSystemService(Context.INPUT_METHOD_SERVICE);
imm.hideSoftInputFromWindow(v.getWindowToken(), 0);
}
});
imgMore.setOnClickListener(this);
imBack.setOnClickListener(this);

18
live/src/main/java/com/yunbao/live/views/InputPanelViewHolder.java
View File

@@ -23,8 +23,6 @@ import com.yunbao.common.utils.ToastUtil;
import com.yunbao.live.R;
import com.yunbao.live.utils.FileSizeUtil;
import org.greenrobot.eventbus.EventBus;
import io.rong.imkit.IMCenter;
import io.rong.imlib.IRongCallback;
import io.rong.imlib.RongIMClient;
@@ -47,7 +45,14 @@ public class InputPanelViewHolder extends LinearLayout implements View.OnClickLi
//是否可以发送消息
private boolean isSend = false;
private LinearLayout pluginList;
//接口返回预置信息
private String presetInformation = "";
public InputPanelViewHolder setPresetInformation(String presetInformation) {
this.presetInformation = presetInformation;
editBtn.setText(presetInformation);
return this;
}
/**
* 必传字段
@@ -163,8 +168,9 @@ public class InputPanelViewHolder extends LinearLayout implements View.OnClickLi
} else {
ToastUtil.show("不可以发送空消息");
}
//发送以后删除相应标志
NoviceInstructorManager.get(getContext()).removeNoviceInstructor();
NoviceInstructorManager.get(getContext()).removeNoviceInstructor(targetId);
}
private TextWatcher mEditTextWatcher = new TextWatcher() {
@@ -240,7 +246,7 @@ public class InputPanelViewHolder extends LinearLayout implements View.OnClickLi
}
});
//发送以后删除相应标志
NoviceInstructorManager.get(getContext()).removeNoviceInstructor();
NoviceInstructorManager.get(getContext()).removeNoviceInstructor(targetId);
}
public void sendVideoFile(String filePath) {
@@ -300,7 +306,7 @@ public class InputPanelViewHolder extends LinearLayout implements View.OnClickLi
}
});//
//发送以后删除相应标志
NoviceInstructorManager.get(getContext()).removeNoviceInstructor();
NoviceInstructorManager.get(getContext()).removeNoviceInstructor(targetId);
}
/**
@@ -346,7 +352,7 @@ public class InputPanelViewHolder extends LinearLayout implements View.OnClickLi
}
});
//发送以后删除相应标志
NoviceInstructorManager.get(getContext()).removeNoviceInstructor();
NoviceInstructorManager.get(getContext()).removeNoviceInstructor(targetId);
}
/**

12
live/src/main/res/layout/rc_conversationlist_item.xml
View File

@@ -11,18 +11,18 @@
<RelativeLayout
android:id="@+id/rc_conversation_portrait_rl"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginStart="@dimen/rc_margin_size_12"
android:layout_marginTop="@dimen/rc_margin_size_12"
android:layout_width="54dp"
android:layout_height="54dp"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/rc_conversation_portrait"
android:layout_width="@dimen/rc_conversation_portrait_size"
android:layout_height="@dimen/rc_conversation_portrait_size"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop" />