diff --git a/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyNamePlateAdapter.java b/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyNamePlateAdapter.java index 058c841ba..1cd3480c1 100644 --- a/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyNamePlateAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyNamePlateAdapter.java @@ -6,6 +6,7 @@ import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; +import com.netease.nim.uikit.common.util.sys.ScreenUtil; import com.netease.nim.uikit.support.glide.GlideApp; import com.yizhuan.erban.R; import com.yizhuan.xchat_android_core.decoration.nameplate.bean.NamePlateInfo; @@ -29,14 +30,16 @@ public class MyNamePlateAdapter extends BaseQuickAdapter + android:layout_height="64dp" + android:layout_marginTop="6dp" + android:layout_marginBottom="6dp" + android:background="@color/bg_normal_1c1b22"> + android:layout_marginStart="15dp" + android:background="@drawable/bg_secondary_radius_10" + android:orientation="vertical"> + android:layout_width="90dp" + android:layout_height="30dp" + android:layout_gravity="center" + android:scaleType="fitCenter" /> + android:layout_marginStart="5dp" + android:layout_marginTop="5dp" + tools:src="@drawable/ic_mark_limit" /> @@ -35,49 +37,45 @@ android:id="@+id/tv_nameplate_name" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:gravity="left" - android:textColor="@color/text_title_white" - android:singleLine="true" - android:layout_toEndOf="@+id/ll_nameplate_cover" - android:layout_marginTop="@dimen/dp_25" android:layout_marginStart="10dp" + android:layout_toEndOf="@+id/ll_nameplate_cover" + android:layout_alignTop="@id/ll_nameplate_cover" android:drawablePadding="5dp" - android:textSize="15sp" + android:gravity="left" + android:layout_marginTop="8dp" + android:singleLine="true" + android:textColor="@color/text_title_white" + android:textSize="14sp" tools:text="神豪座驾" /> + tools:visibility="visible" /> - \ No newline at end of file diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/module/input/InputPanel.java b/nim_uikit/src/com/netease/nim/uikit/business/session/module/input/InputPanel.java index bda99f791..7ada8d7fc 100644 --- a/nim_uikit/src/com/netease/nim/uikit/business/session/module/input/InputPanel.java +++ b/nim_uikit/src/com/netease/nim/uikit/business/session/module/input/InputPanel.java @@ -959,7 +959,7 @@ public class InputPanel implements IEmoticonSelectedListener, IAudioRecordCallba private void setEditTextState() { if (!isChat) { - messageEditText.setHint("暂无权利发起私聊"); + messageEditText.setHint("暂未达到可发起私聊等级"); messageEditText.setFocusable(false); messageEditText.setFocusableInTouchMode(false); messageEditText.setEnabled(false);