moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：修复上个版本做公聊误把私聊语言入口隐藏问题

Browse Source
This commit is contained in:
max
2024-05-22 16:05:18 +08:00
parent 17a56f4c65
commit 37eaf9d08d
4 changed files with 141 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/module_public_chat/res/layout/public_chat_message_fragment.xml
View File

@@ -85,7 +85,7 @@
</FrameLayout>
<include layout="@layout/nim_message_activity_bottom_layout" />
<include layout="@layout/nim_chat_room_message_activity_bottom_layout" />
</LinearLayout>

17
nim_uikit/res/layout/nim_chat_room_message_activity_bottom_layout.xml Normal file
View File

@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
android:id="@+id/messageActivityBottomLayout"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="vertical">
<include layout="@layout/nim_chat_room_message_activity_text_layout"/>
<com.netease.nim.uikit.business.session.emoji.EmoticonPickerView
android:id="@+id/emoticon_picker_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"/>
</LinearLayout>

121
nim_uikit/res/layout/nim_chat_room_message_activity_text_layout.xml Normal file
View File

@@ -0,0 +1,121 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/textMessageLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:paddingBottom="@dimen/bottom_component_margin_vertical"
android:paddingTop="@dimen/bottom_component_margin_vertical">
<FrameLayout
android:id="@+id/switchLayout"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/bottom_component_margin_horizontal"
android:layout_marginEnd="@dimen/bottom_component_margin_horizontal">
<ImageView
android:id="@+id/buttonAudioMessage"
android:layout_width="29dp"
android:layout_height="29dp"
android:background="@drawable/nim_message_button_bottom_audio_selector"
android:contentDescription="@string/empty"
android:scaleType="center" />
<ImageView
android:id="@+id/buttonTextMessage"
android:layout_width="29dp"
android:layout_height="29dp"
android:background="@drawable/nim_message_button_bottom_text_selector"
android:contentDescription="@string/empty"
android:scaleType="center" />
</FrameLayout>
<FrameLayout
android:id="@+id/audioTextSwitchLayout"
android:layout_width="0dip"
android:layout_height="30dp"
android:layout_alignBottom="@id/switchLayout"
android:layout_marginEnd="@dimen/bottom_component_margin_horizontal"
android:layout_toStartOf="@+id/emoji_button"
android:layout_toEndOf="@+id/switchLayout">
<Button
android:id="@+id/audioRecord"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/bg_message_voice"
android:text="@string/record_audio"
android:layout_gravity="center"
android:textColor="@color/white"
android:textSize="16sp"
android:visibility="gone" />
</FrameLayout>
<EditText
android:id="@+id/editTextMessage"
android:layout_width="match_parent"
android:layout_height="30dp"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/bottom_component_margin_horizontal"
android:layout_toStartOf="@+id/emoji_button"
android:layout_toEndOf="@+id/switchLayout"
android:autoLink="web|email|phone"
android:gravity="center_vertical"
android:background="@drawable/bg_message_input"
android:hint="@string/message_hint"
android:imeOptions="actionSend"
android:inputType="text"
android:maxLength="120"
android:maxLines="4"
android:paddingStart="@dimen/dp_10"
android:paddingEnd="10dp"
android:textColor="@color/color_C6C6E9"
android:textColorHint="@color/color_b3b3b3"
android:textCursorDrawable="@null"
android:textSize="13sp" />
<ImageView
android:id="@+id/emoji_button"
android:layout_width="29dp"
android:layout_height="29dp"
android:layout_marginEnd="@dimen/bottom_component_margin_horizontal"
android:layout_toStartOf="@+id/sendLayout"
android:layout_centerVertical="true"
android:background="@drawable/nim_message_button_bottom_emoji_selector"
android:contentDescription="@string/empty"
android:scaleType="center" />
<FrameLayout
android:id="@+id/sendLayout"
android:layout_width="43dp"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_alignParentEnd="true"
android:layout_marginEnd="@dimen/bottom_component_margin_horizontal">
<ImageView
android:id="@+id/buttonMoreFuntionInText"
android:layout_width="29dp"
android:layout_height="29dp"
android:layout_gravity="center"
android:background="@drawable/nim_message_input_plus"
android:contentDescription="@string/empty"
android:scaleType="center" />
<TextView
android:id="@+id/buttonSendMessage"
android:layout_width="43dp"
android:layout_height="29dp"
android:background="@drawable/nim_message_button_bottom_send_selector"
android:contentDescription="@string/empty"
android:gravity="center"
android:text="@string/send"
android:textColor="@color/white"
android:textSize="@dimen/sp_12"
tools:visibility="visible" />
</FrameLayout>
</RelativeLayout>

4
nim_uikit/res/layout/nim_message_activity_text_layout.xml
View File

@@ -10,8 +10,8 @@
<FrameLayout
android:id="@+id/switchLayout"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/bottom_component_margin_horizontal"
android:layout_marginEnd="@dimen/bottom_component_margin_horizontal">