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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zlzw
2022-09-06 17:47:01 +08:00
parent deb35bf5fe 5d7370e5dc
commit 4d9199eba9
4 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -3,16 +3,16 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/rc_conversation_item"
android:layout_width="match_parent"
android:layout_height="123dp">
android:layout_height="143dp">
<RelativeLayout
android:id="@+id/administrator_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="123dp"
android:layout_marginStart="8dp"
android:layout_marginTop="5dp"
android:layout_marginEnd="8dp"
android:visibility="gone">
android:visibility="visible">
<RelativeLayout
android:id="@+id/img_administrator_layout"
@@ -132,15 +132,15 @@
<RelativeLayout
android:id="@+id/rc_conversation_portrait_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="visible">
android:layout_height="77dp"
android:visibility="gone">
<RelativeLayout
android:id="@+id/rc_conversation_portrait_rl"
android:layout_width="54dp"
android:layout_height="54dp"
android:layout_marginStart="16dp"
android:layout_marginTop="39dp"
android:layout_marginTop="9dp"
android:layout_marginEnd="15dp">
<ImageView
@@ -164,7 +164,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="88dp"
android:layout_marginTop="41dp"
android:layout_marginTop="11dp"
android:layout_marginEnd="@dimen/rc_margin_size_12"
android:gravity="center_vertical">
@@ -237,7 +237,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_marginTop="41dp"
android:layout_marginTop="11dp"
android:layout_marginEnd="@dimen/rc_margin_size_12"
android:text="3 月 22 日"
android:textColor="@color/rc_auxiliary_color"