Browse Source

1.修改IM聊天页面UI

王鹏鹏 2 years ago
parent
commit
3a5e1403a1

+ 2 - 0
.idea/misc.xml

@@ -274,6 +274,8 @@
         <entry key="..\:/workspace/hcp-pad/push/src/main/res/layout/item_push_type.xml" value="0.1" />
         <entry key="..\:/workspace/hcp-pad/setting/src/main/res/layout/activity_setting.xml" value="0.1" />
         <entry key="..\:/workspace/hcp-pad/superplayerkit/src/main/res/drawable/superplayer_biz_video_progressbar.xml" value="0.219" />
+        <entry key="..\:/workspace/hcp-pad/timcommon/src/main/res-light/drawable/core_title_bar_bg_light.xml" value="0.158" />
+        <entry key="..\:/workspace/hcp-pad/timcommon/src/main/res/layout/title_bar_layout.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pad/tuibeauty/src/main/res/layout/tuibeauty_view_panel.xml" value="0.22826086956521738" />
         <entry key="..\:/workspace/hcp-pad/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_menu_emoji_list_border.xml" value="0.155" />
         <entry key="..\:/workspace/hcp-pad/tuichat/src/main/res-minimalistui/layout/chat_minimalist_pop_menu_layout.xml" value="0.23697916666666666" />

+ 18 - 18
timcommon/src/main/java/com/tencent/qcloud/tuikit/timcommon/component/TitleBarLayout.java

@@ -6,19 +6,19 @@ import android.content.res.TypedArray;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
+
 import androidx.annotation.Nullable;
-import com.tencent.qcloud.tuicore.TUIThemeManager;
+
 import com.tencent.qcloud.tuikit.timcommon.R;
 import com.tencent.qcloud.tuikit.timcommon.component.interfaces.ITitleBarLayout;
-import com.tencent.qcloud.tuikit.timcommon.util.ScreenUtil;
 
 public class TitleBarLayout extends LinearLayout implements ITitleBarLayout {
+
     private LinearLayout mLeftGroup;
     private LinearLayout mRightGroup;
     private TextView mLeftTitle;
@@ -64,21 +64,21 @@ public class TitleBarLayout extends LinearLayout implements ITitleBarLayout {
         mRightIcon = findViewById(R.id.page_title_right_icon);
         unreadCountTextView = findViewById(R.id.new_message_total_unread);
 
-        LayoutParams params = (LayoutParams) mTitleLayout.getLayoutParams();
-        params.height = ScreenUtil.getPxByDp(50);
-        mTitleLayout.setLayoutParams(params);
-        setBackgroundResource(TUIThemeManager.getAttrResId(getContext(), R.attr.core_title_bar_bg));
-
-        int iconSize = ScreenUtil.dip2px(20);
-        ViewGroup.LayoutParams iconParams = mLeftIcon.getLayoutParams();
-        iconParams.width = iconSize;
-        iconParams.height = iconSize;
-        mLeftIcon.setLayoutParams(iconParams);
-        iconParams = mRightIcon.getLayoutParams();
-        iconParams.width = iconSize;
-        iconParams.height = iconSize;
-
-        mRightIcon.setLayoutParams(iconParams);
+//        LayoutParams params = (LayoutParams) mTitleLayout.getLayoutParams();
+//        params.height = ScreenUtil.getPxByDp(50);
+//        mTitleLayout.setLayoutParams(params);
+//        setBackgroundResource(TUIThemeManager.getAttrResId(getContext(), R.attr.core_title_bar_bg));
+
+//        int iconSize = ScreenUtil.dip2px(20);
+//        ViewGroup.LayoutParams iconParams = mLeftIcon.getLayoutParams();
+//        iconParams.width = iconSize;
+//        iconParams.height = iconSize;
+//        mLeftIcon.setLayoutParams(iconParams);
+//        iconParams = mRightIcon.getLayoutParams();
+//        iconParams.width = iconSize;
+//        iconParams.height = iconSize;
+
+//        mRightIcon.setLayoutParams(iconParams);
 
         if (canReturn) {
             setLeftReturnListener(context);

BIN
timcommon/src/main/res-light/drawable-xxhdpi/core_title_bar_back_light.png


+ 1 - 1
timcommon/src/main/res-light/values/light_styles.xml

@@ -14,7 +14,7 @@
         <item name="core_line_controller_view_switch_btn_selected_bg">@color/core_primary_color_light</item>
         <item name="core_selected_icon">@drawable/core_selected_icon_light</item>
         <item name="core_title_bar_bg">@drawable/core_title_bar_bg_light</item>
-        <item name="core_title_bar_text_bg">@color/core_title_bar_text_bg_light</item>
+        <item name="core_title_bar_text_bg">@android:color/white</item>
         <item name="core_title_bar_back_icon">@drawable/core_title_bar_back_light</item>
         <item name="core_default_group_icon_public">@drawable/core_default_group_icon_public_light</item>
         <item name="core_default_group_icon_work">@drawable/core_default_group_icon_work_light</item>

+ 22 - 21
timcommon/src/main/res/layout/title_bar_layout.xml

@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/page_title_layout">
+    android:id="@+id/page_title_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
 
     <LinearLayout
         android:id="@+id/page_title_left_group"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_alignParentStart="true"
-        android:gravity="center_vertical"
-        android:minWidth="80dp"
-        android:orientation="horizontal"
-        android:paddingLeft="16dp">
+        android:minWidth="@dimen/divider_183px"
+        android:orientation="horizontal">
 
         <ImageView
             android:id="@+id/page_title_left_icon"
-            android:layout_width="20dp"
-            android:layout_height="20dp"
-            android:clickable="false"
-            android:background="?attr/core_title_bar_back_icon" />
+            android:layout_width="@dimen/divider_53px"
+            android:layout_height="@dimen/divider_53px"
+            android:layout_marginStart="@dimen/divider_52px"
+            android:layout_marginTop="@dimen/divider_32px"
+            android:background="?attr/core_title_bar_back_icon"
+            android:clickable="false" />
 
         <com.tencent.qcloud.tuikit.timcommon.component.UnreadCountTextView
             android:id="@+id/new_message_total_unread"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="5dp"
             android:gravity="center"
             android:includeFontPadding="false"
-            android:layout_marginEnd="5dp"
             android:minWidth="18.4dp"
             android:minHeight="18.4dp"
-            android:textColor="#ffffff"
+            android:textColor="@android:color/white"
             android:textSize="13.4sp"
             android:visibility="gone" />
 
@@ -39,28 +39,29 @@
             android:id="@+id/page_title_left_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="?attr/core_title_bar_text_bg"
             android:gravity="center"
-            android:textSize="16.3sp"
-            android:textStyle="bold"/>
+            android:layout_marginTop="@dimen/divider_32px"
+            android:layout_marginStart="@dimen/divider_18px"
+            android:textColor="@android:color/white"
+            android:textSize="@dimen/divider_38px"
+            android:textStyle="bold" />
 
     </LinearLayout>
 
-
     <TextView
         android:id="@+id/page_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
+        android:ellipsize="end"
+        android:gravity="center"
         android:maxWidth="200dp"
         android:singleLine="true"
-        android:ellipsize="end"
         android:textAlignment="gravity"
         android:textColor="?attr/core_title_bar_text_bg"
         android:textSize="16.3sp"
         android:textStyle="bold"
-        android:gravity="center"
-        tools:text="Title"/>
+        tools:text="Title" />
 
     <LinearLayout
         android:id="@+id/page_title_right_group"
@@ -79,7 +80,7 @@
             android:gravity="right"
             android:textColor="?attr/core_title_bar_text_bg"
             android:textSize="16.3sp"
-            android:textStyle="bold"/>
+            android:textStyle="bold" />
 
         <ImageView
             android:id="@+id/page_title_right_icon"

+ 147 - 1
timcommon/src/main/res/values/dimens.xml

@@ -1,5 +1,151 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <dimen name="divider_689px" tools:ignore="MissingDefaultResource">689px</dimen>
+    <dimen name="divider_533px" tools:ignore="MissingDefaultResource">533px</dimen>
+    <dimen name="divider_440px" tools:ignore="MissingDefaultResource">440px</dimen>
+    <dimen name="divider_430px" tools:ignore="MissingDefaultResource">430px</dimen>
+    <dimen name="divider_418px" tools:ignore="MissingDefaultResource">418px</dimen>
+    <dimen name="divider_416px" tools:ignore="MissingDefaultResource">416px</dimen>
+    <dimen name="divider_415px" tools:ignore="MissingDefaultResource">415px</dimen>
+    <dimen name="divider_413px" tools:ignore="MissingDefaultResource">413px</dimen>
+    <dimen name="divider_409px" tools:ignore="MissingDefaultResource">409px</dimen>
+    <dimen name="divider_377px" tools:ignore="MissingDefaultResource">377px</dimen>
+    <dimen name="divider_354px" tools:ignore="MissingDefaultResource">354px</dimen>
+    <dimen name="divider_348px" tools:ignore="MissingDefaultResource">348px</dimen>
+    <dimen name="divider_345px" tools:ignore="MissingDefaultResource">345px</dimen>
+    <dimen name="divider_340px" tools:ignore="MissingDefaultResource">340px</dimen>
+    <dimen name="divider_339px" tools:ignore="MissingDefaultResource">339px</dimen>
+    <dimen name="divider_335px" tools:ignore="MissingDefaultResource">335px</dimen>
+    <dimen name="divider_333px" tools:ignore="MissingDefaultResource">333px</dimen>
+    <dimen name="divider_331px" tools:ignore="MissingDefaultResource">331px</dimen>
+    <dimen name="divider_330px" tools:ignore="MissingDefaultResource">330px</dimen>
+    <dimen name="divider_329px" tools:ignore="MissingDefaultResource">329px</dimen>
+    <dimen name="divider_327px" tools:ignore="MissingDefaultResource">327px</dimen>
+    <dimen name="divider_320px" tools:ignore="MissingDefaultResource">320px</dimen>
+    <dimen name="divider_289px" tools:ignore="MissingDefaultResource">289px</dimen>
+    <dimen name="divider_270px" tools:ignore="MissingDefaultResource">270px</dimen>
+    <dimen name="divider_264px" tools:ignore="MissingDefaultResource">264px</dimen>
+    <dimen name="divider_260px" tools:ignore="MissingDefaultResource">260px</dimen>
+    <dimen name="divider_250px" tools:ignore="MissingDefaultResource">250px</dimen>
+    <dimen name="divider_249px" tools:ignore="MissingDefaultResource">249px</dimen>
+    <dimen name="divider_237px" tools:ignore="MissingDefaultResource">237px</dimen>
+    <dimen name="divider_230px" tools:ignore="MissingDefaultResource">230px</dimen>
+    <dimen name="divider_215px" tools:ignore="MissingDefaultResource">215px</dimen>
+    <dimen name="divider_195px" tools:ignore="MissingDefaultResource">195px</dimen>
+    <dimen name="divider_190px" tools:ignore="MissingDefaultResource">190px</dimen>
+    <dimen name="divider_184px" tools:ignore="MissingDefaultResource">184px</dimen>
+    <dimen name="divider_183px" tools:ignore="MissingDefaultResource">183px</dimen>
+    <dimen name="divider_180px" tools:ignore="MissingDefaultResource">180px</dimen>
+    <dimen name="divider_176px" tools:ignore="MissingDefaultResource">176px</dimen>
+    <dimen name="divider_140px" tools:ignore="MissingDefaultResource">140px</dimen>
+    <dimen name="divider_133px" tools:ignore="MissingDefaultResource">133px</dimen>
+    <dimen name="divider_130px" tools:ignore="MissingDefaultResource">130px</dimen>
+    <dimen name="divider_128px" tools:ignore="MissingDefaultResource">128px</dimen>
+    <dimen name="divider_120px" tools:ignore="MissingDefaultResource">120px</dimen>
+    <dimen name="divider_119px" tools:ignore="MissingDefaultResource">119px</dimen>
+    <dimen name="divider_118px" tools:ignore="MissingDefaultResource">118px</dimen>
+    <dimen name="divider_117px" tools:ignore="MissingDefaultResource">117px</dimen>
+    <dimen name="divider_116px" tools:ignore="MissingDefaultResource">116px</dimen>
+    <dimen name="divider_115px" tools:ignore="MissingDefaultResource">115px</dimen>
+    <dimen name="divider_114px" tools:ignore="MissingDefaultResource">114px</dimen>
+    <dimen name="divider_113px" tools:ignore="MissingDefaultResource">113px</dimen>
+    <dimen name="divider_112px" tools:ignore="MissingDefaultResource">112px</dimen>
+    <dimen name="divider_111px" tools:ignore="MissingDefaultResource">111px</dimen>
+    <dimen name="divider_110px" tools:ignore="MissingDefaultResource">110px</dimen>
+    <dimen name="divider_109px" tools:ignore="MissingDefaultResource">109px</dimen>
+    <dimen name="divider_108px" tools:ignore="MissingDefaultResource">108px</dimen>
+    <dimen name="divider_107px" tools:ignore="MissingDefaultResource">107px</dimen>
+    <dimen name="divider_106px" tools:ignore="MissingDefaultResource">106px</dimen>
+    <dimen name="divider_105px" tools:ignore="MissingDefaultResource">105px</dimen>
+    <dimen name="divider_104px" tools:ignore="MissingDefaultResource">104px</dimen>
+    <dimen name="divider_103px" tools:ignore="MissingDefaultResource">103px</dimen>
+    <dimen name="divider_102px" tools:ignore="MissingDefaultResource">102px</dimen>
+    <dimen name="divider_101px" tools:ignore="MissingDefaultResource">101px</dimen>
+    <dimen name="divider_100px" tools:ignore="MissingDefaultResource">100px</dimen>
+    <dimen name="divider_88px" tools:ignore="MissingDefaultResource">88px</dimen>
+    <dimen name="divider_82px" tools:ignore="MissingDefaultResource">82px</dimen>
+    <dimen name="divider_80px" tools:ignore="MissingDefaultResource">80px</dimen>
+    <dimen name="divider_79px" tools:ignore="MissingDefaultResource">79px</dimen>
+    <dimen name="divider_78px" tools:ignore="MissingDefaultResource">78px</dimen>
+    <dimen name="divider_77px" tools:ignore="MissingDefaultResource">77px</dimen>
+    <dimen name="divider_76px" tools:ignore="MissingDefaultResource">76px</dimen>
+    <dimen name="divider_75px" tools:ignore="MissingDefaultResource">75px</dimen>
+    <dimen name="divider_74px" tools:ignore="MissingDefaultResource">74px</dimen>
+    <dimen name="divider_73px" tools:ignore="MissingDefaultResource">73px</dimen>
+    <dimen name="divider_72px" tools:ignore="MissingDefaultResource">72px</dimen>
+    <dimen name="divider_71px" tools:ignore="MissingDefaultResource">71px</dimen>
+    <dimen name="divider_70px" tools:ignore="MissingDefaultResource">70px</dimen>
+    <dimen name="divider_69px" tools:ignore="MissingDefaultResource">69px</dimen>
+    <dimen name="divider_68px" tools:ignore="MissingDefaultResource">68px</dimen>
+    <dimen name="divider_67px" tools:ignore="MissingDefaultResource">67px</dimen>
+    <dimen name="divider_66px" tools:ignore="MissingDefaultResource">66px</dimen>
+    <dimen name="divider_65px" tools:ignore="MissingDefaultResource">65px</dimen>
+    <dimen name="divider_64px" tools:ignore="MissingDefaultResource">64px</dimen>
+    <dimen name="divider_63px" tools:ignore="MissingDefaultResource">63px</dimen>
+    <dimen name="divider_62px" tools:ignore="MissingDefaultResource">62px</dimen>
+    <dimen name="divider_61px" tools:ignore="MissingDefaultResource">61px</dimen>
+    <dimen name="divider_60px" tools:ignore="MissingDefaultResource">60px</dimen>
+    <dimen name="divider_59px" tools:ignore="MissingDefaultResource">59px</dimen>
+    <dimen name="divider_58px" tools:ignore="MissingDefaultResource">58px</dimen>
+    <dimen name="divider_57px" tools:ignore="MissingDefaultResource">57px</dimen>
+    <dimen name="divider_56px" tools:ignore="MissingDefaultResource">56px</dimen>
+    <dimen name="divider_55px" tools:ignore="MissingDefaultResource">55px</dimen>
+    <dimen name="divider_54px" tools:ignore="MissingDefaultResource">54px</dimen>
+    <dimen name="divider_53px" tools:ignore="MissingDefaultResource">53px</dimen>
+    <dimen name="divider_52px" tools:ignore="MissingDefaultResource">52px</dimen>
+    <dimen name="divider_51px" tools:ignore="MissingDefaultResource">51px</dimen>
+    <dimen name="divider_50px" tools:ignore="MissingDefaultResource">50px</dimen>
+    <dimen name="divider_49px" tools:ignore="MissingDefaultResource">49px</dimen>
+    <dimen name="divider_48px" tools:ignore="MissingDefaultResource">48px</dimen>
+    <dimen name="divider_47px" tools:ignore="MissingDefaultResource">47px</dimen>
+    <dimen name="divider_46px" tools:ignore="MissingDefaultResource">46px</dimen>
+    <dimen name="divider_45px" tools:ignore="MissingDefaultResource">45px</dimen>
+    <dimen name="divider_44px" tools:ignore="MissingDefaultResource">44px</dimen>
+    <dimen name="divider_43px" tools:ignore="MissingDefaultResource">43px</dimen>
+    <dimen name="divider_42px" tools:ignore="MissingDefaultResource">42px</dimen>
+    <dimen name="divider_41px" tools:ignore="MissingDefaultResource">41px</dimen>
+    <dimen name="divider_40px" tools:ignore="MissingDefaultResource">40px</dimen>
+    <dimen name="divider_39px" tools:ignore="MissingDefaultResource">39px</dimen>
+    <dimen name="divider_38px" tools:ignore="MissingDefaultResource">38px</dimen>
+    <dimen name="divider_37px" tools:ignore="MissingDefaultResource">37px</dimen>
+    <dimen name="divider_36px" tools:ignore="MissingDefaultResource">36px</dimen>
+    <dimen name="divider_35px" tools:ignore="MissingDefaultResource">35px</dimen>
+    <dimen name="divider_34px" tools:ignore="MissingDefaultResource">34px</dimen>
+    <dimen name="divider_33px" tools:ignore="MissingDefaultResource">33px</dimen>
+    <dimen name="divider_32px" tools:ignore="MissingDefaultResource">32px</dimen>
+    <dimen name="divider_31px" tools:ignore="MissingDefaultResource">31px</dimen>
+    <dimen name="divider_30px" tools:ignore="MissingDefaultResource">30px</dimen>
+    <dimen name="divider_29px" tools:ignore="MissingDefaultResource">29px</dimen>
+    <dimen name="divider_28px" tools:ignore="MissingDefaultResource">28px</dimen>
+    <dimen name="divider_27px" tools:ignore="MissingDefaultResource">27px</dimen>
+    <dimen name="divider_26px" tools:ignore="MissingDefaultResource">26px</dimen>
+    <dimen name="divider_25px" tools:ignore="MissingDefaultResource">25px</dimen>
+    <dimen name="divider_24px" tools:ignore="MissingDefaultResource">24px</dimen>
+    <dimen name="divider_23px" tools:ignore="MissingDefaultResource">23px</dimen>
+    <dimen name="divider_22px" tools:ignore="MissingDefaultResource">22px</dimen>
+    <dimen name="divider_21px" tools:ignore="MissingDefaultResource">21px</dimen>
+    <dimen name="divider_20px" tools:ignore="MissingDefaultResource">20px</dimen>
+    <dimen name="divider_19px" tools:ignore="MissingDefaultResource">19px</dimen>
+    <dimen name="divider_18px" tools:ignore="MissingDefaultResource">18px</dimen>
+    <dimen name="divider_17px" tools:ignore="MissingDefaultResource">17px</dimen>
+    <dimen name="divider_16px" tools:ignore="MissingDefaultResource">16px</dimen>
+    <dimen name="divider_15px" tools:ignore="MissingDefaultResource">15px</dimen>
+    <dimen name="divider_14px" tools:ignore="MissingDefaultResource">14px</dimen>
+    <dimen name="divider_13px" tools:ignore="MissingDefaultResource">13px</dimen>
+    <dimen name="divider_12px" tools:ignore="MissingDefaultResource">12px</dimen>
+    <dimen name="divider_11px" tools:ignore="MissingDefaultResource">11px</dimen>
+    <dimen name="divider_10px" tools:ignore="MissingDefaultResource">10px</dimen>
+    <dimen name="divider_9px" tools:ignore="MissingDefaultResource">9px</dimen>
+    <dimen name="divider_8px" tools:ignore="MissingDefaultResource">8px</dimen>
+    <dimen name="divider_7px" tools:ignore="MissingDefaultResource">7px</dimen>
+    <dimen name="divider_6px" tools:ignore="MissingDefaultResource">6px</dimen>
+    <dimen name="divider_5px" tools:ignore="MissingDefaultResource">5px</dimen>
+    <dimen name="divider_4px" tools:ignore="MissingDefaultResource">4px</dimen>
+    <dimen name="divider_3px" tools:ignore="MissingDefaultResource">3px</dimen>
+    <dimen name="divider_2px" tools:ignore="MissingDefaultResource">2px</dimen>
+    <dimen name="divider_1px" tools:ignore="MissingDefaultResource">1px</dimen>
+
     <dimen name="page_margin">10dp</dimen>
 
     <dimen name="switch_thumb_padding">2dp</dimen>

+ 3 - 1
tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/TUIBaseChatFragment.java

@@ -46,6 +46,8 @@ import com.tencent.qcloud.tuikit.tuichat.presenter.ChatPresenter;
 import com.tencent.qcloud.tuikit.tuichat.util.DataStoreUtil;
 import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
 import com.tencent.qcloud.tuikit.tuichat.util.TUIChatUtils;
+import com.tencent.qcloud.tuikit.tuichat.util.ViewTool;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -72,7 +74,7 @@ public class TUIBaseChatFragment extends BaseFragment {
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
         TUIChatLog.i(TAG, "oncreate view " + this);
-        baseView = inflater.inflate(R.layout.chat_fragment, container, false);
+        baseView = ViewTool.inflateFragmentPixels(getActivity(), R.layout.chat_fragment, container,1194, 834);
         //        // TODO 通过api设置ChatLayout各种属性的样例
         //        // Example of setting various properties of ChatLayout through api
         //        ChatLayoutSetting helper = new ChatLayoutSetting(getActivity());

+ 4 - 4
tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/ChatView.java

@@ -939,7 +939,7 @@ public class ChatView extends LinearLayout implements IChatLayout {
         ChatLayoutSetting chatLayoutSetting = new ChatLayoutSetting(getContext());
         chatLayoutSetting.customizeChatLayout(this);
         initListener();
-        resetForwardState("");
+        resetForwardState("返回");
     }
 
     @Override
@@ -1115,11 +1115,11 @@ public class ChatView extends LinearLayout implements IChatLayout {
                 showForwardLimitDialog(messageInfoList);
             } else {
                 startSelectForwardActivity(TUIChatConstants.FORWARD_MODE_ONE_BY_ONE, messageInfoList);
-                resetForwardState("");
+                resetForwardState("返回");
             }
         } else {
             startSelectForwardActivity(TUIChatConstants.FORWARD_MODE_MERGE, messageInfoList);
-            resetForwardState("");
+            resetForwardState("返回");
         }
     }
 
@@ -1135,7 +1135,7 @@ public class ChatView extends LinearLayout implements IChatLayout {
                                               @Override
                                               public void onClick(View v) {
                                                   startSelectForwardActivity(TUIChatConstants.FORWARD_MODE_MERGE, messageInfoList);
-                                                  resetForwardState("");
+                                                  resetForwardState("返回");
                                               }
                                           })
                                       .setNegativeButton(getContext().getString(com.tencent.qcloud.tuicore.R.string.cancel), new View.OnClickListener() {

BIN
tuichat/src/main/res/drawable-xxhdpi/icon_uniform_background.png


+ 2 - 2
tuichat/src/main/res/layout/chat_layout.xml

@@ -4,12 +4,12 @@
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:background="@color/chat_background_color">
+    android:background="@drawable/icon_uniform_background">
 
     <com.tencent.qcloud.tuikit.timcommon.component.TitleBarLayout
         android:id="@+id/chat_title_bar"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/page_title_height" />
+        android:layout_height="@dimen/divider_108px" />
 
     <View
         android:id="@+id/view_line"

+ 147 - 1
tuichat/src/main/res/values/dimens.xml

@@ -1,5 +1,151 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+
+    <dimen name="divider_689px" tools:ignore="ResourceName">689px</dimen>
+    <dimen name="divider_533px" tools:ignore="ResourceName">533px</dimen>
+    <dimen name="divider_440px" tools:ignore="ResourceName">440px</dimen>
+    <dimen name="divider_430px" tools:ignore="ResourceName">430px</dimen>
+    <dimen name="divider_418px" tools:ignore="ResourceName">418px</dimen>
+    <dimen name="divider_416px" tools:ignore="ResourceName">416px</dimen>
+    <dimen name="divider_415px" tools:ignore="ResourceName">415px</dimen>
+    <dimen name="divider_413px" tools:ignore="ResourceName">413px</dimen>
+    <dimen name="divider_409px" tools:ignore="ResourceName">409px</dimen>
+    <dimen name="divider_377px" tools:ignore="ResourceName">377px</dimen>
+    <dimen name="divider_354px" tools:ignore="ResourceName">354px</dimen>
+    <dimen name="divider_348px" tools:ignore="ResourceName">348px</dimen>
+    <dimen name="divider_345px" tools:ignore="ResourceName">345px</dimen>
+    <dimen name="divider_340px" tools:ignore="ResourceName">340px</dimen>
+    <dimen name="divider_339px" tools:ignore="ResourceName">339px</dimen>
+    <dimen name="divider_335px" tools:ignore="ResourceName">335px</dimen>
+    <dimen name="divider_333px" tools:ignore="ResourceName">333px</dimen>
+    <dimen name="divider_331px" tools:ignore="ResourceName">331px</dimen>
+    <dimen name="divider_330px" tools:ignore="ResourceName">330px</dimen>
+    <dimen name="divider_329px" tools:ignore="ResourceName">329px</dimen>
+    <dimen name="divider_327px" tools:ignore="ResourceName">327px</dimen>
+    <dimen name="divider_320px" tools:ignore="ResourceName">320px</dimen>
+    <dimen name="divider_289px" tools:ignore="ResourceName">289px</dimen>
+    <dimen name="divider_270px" tools:ignore="ResourceName">270px</dimen>
+    <dimen name="divider_264px" tools:ignore="ResourceName">264px</dimen>
+    <dimen name="divider_260px" tools:ignore="ResourceName">260px</dimen>
+    <dimen name="divider_250px" tools:ignore="ResourceName">250px</dimen>
+    <dimen name="divider_249px" tools:ignore="ResourceName">249px</dimen>
+    <dimen name="divider_237px" tools:ignore="ResourceName">237px</dimen>
+    <dimen name="divider_230px" tools:ignore="ResourceName">230px</dimen>
+    <dimen name="divider_215px" tools:ignore="ResourceName">215px</dimen>
+    <dimen name="divider_195px" tools:ignore="ResourceName">195px</dimen>
+    <dimen name="divider_190px" tools:ignore="ResourceName">190px</dimen>
+    <dimen name="divider_184px" tools:ignore="ResourceName">184px</dimen>
+    <dimen name="divider_180px" tools:ignore="ResourceName">180px</dimen>
+    <dimen name="divider_176px" tools:ignore="ResourceName">176px</dimen>
+    <dimen name="divider_140px" tools:ignore="ResourceName">140px</dimen>
+    <dimen name="divider_133px" tools:ignore="ResourceName">133px</dimen>
+    <dimen name="divider_130px" tools:ignore="ResourceName">130px</dimen>
+    <dimen name="divider_128px" tools:ignore="ResourceName">128px</dimen>
+    <dimen name="divider_120px" tools:ignore="ResourceName">120px</dimen>
+    <dimen name="divider_119px" tools:ignore="ResourceName">119px</dimen>
+    <dimen name="divider_118px" tools:ignore="ResourceName">118px</dimen>
+    <dimen name="divider_117px" tools:ignore="ResourceName">117px</dimen>
+    <dimen name="divider_116px" tools:ignore="ResourceName">116px</dimen>
+    <dimen name="divider_115px" tools:ignore="ResourceName">115px</dimen>
+    <dimen name="divider_114px" tools:ignore="ResourceName">114px</dimen>
+    <dimen name="divider_113px" tools:ignore="ResourceName">113px</dimen>
+    <dimen name="divider_112px" tools:ignore="ResourceName">112px</dimen>
+    <dimen name="divider_111px" tools:ignore="ResourceName">111px</dimen>
+    <dimen name="divider_110px" tools:ignore="ResourceName">110px</dimen>
+    <dimen name="divider_109px" tools:ignore="ResourceName">109px</dimen>
+    <dimen name="divider_108px" tools:ignore="ResourceName">108px</dimen>
+    <dimen name="divider_107px" tools:ignore="ResourceName">107px</dimen>
+    <dimen name="divider_106px" tools:ignore="ResourceName">106px</dimen>
+    <dimen name="divider_105px" tools:ignore="ResourceName">105px</dimen>
+    <dimen name="divider_104px" tools:ignore="ResourceName">104px</dimen>
+    <dimen name="divider_103px" tools:ignore="ResourceName">103px</dimen>
+    <dimen name="divider_102px" tools:ignore="ResourceName">102px</dimen>
+    <dimen name="divider_101px" tools:ignore="ResourceName">101px</dimen>
+    <dimen name="divider_100px" tools:ignore="ResourceName">100px</dimen>
+    <dimen name="divider_88px" tools:ignore="ResourceName">88px</dimen>
+    <dimen name="divider_82px" tools:ignore="ResourceName">82px</dimen>
+    <dimen name="divider_80px" tools:ignore="ResourceName">80px</dimen>
+    <dimen name="divider_79px" tools:ignore="ResourceName">79px</dimen>
+    <dimen name="divider_78px" tools:ignore="ResourceName">78px</dimen>
+    <dimen name="divider_77px" tools:ignore="ResourceName">77px</dimen>
+    <dimen name="divider_76px" tools:ignore="ResourceName">76px</dimen>
+    <dimen name="divider_75px" tools:ignore="ResourceName">75px</dimen>
+    <dimen name="divider_74px" tools:ignore="ResourceName">74px</dimen>
+    <dimen name="divider_73px" tools:ignore="ResourceName">73px</dimen>
+    <dimen name="divider_72px" tools:ignore="ResourceName">72px</dimen>
+    <dimen name="divider_71px" tools:ignore="ResourceName">71px</dimen>
+    <dimen name="divider_70px" tools:ignore="ResourceName">70px</dimen>
+    <dimen name="divider_69px" tools:ignore="ResourceName">69px</dimen>
+    <dimen name="divider_68px" tools:ignore="ResourceName">68px</dimen>
+    <dimen name="divider_67px" tools:ignore="ResourceName">67px</dimen>
+    <dimen name="divider_66px" tools:ignore="ResourceName">66px</dimen>
+    <dimen name="divider_65px" tools:ignore="ResourceName">65px</dimen>
+    <dimen name="divider_64px" tools:ignore="ResourceName">64px</dimen>
+    <dimen name="divider_63px" tools:ignore="ResourceName">63px</dimen>
+    <dimen name="divider_62px" tools:ignore="ResourceName">62px</dimen>
+    <dimen name="divider_61px" tools:ignore="ResourceName">61px</dimen>
+    <dimen name="divider_60px" tools:ignore="ResourceName">60px</dimen>
+    <dimen name="divider_59px" tools:ignore="ResourceName">59px</dimen>
+    <dimen name="divider_58px" tools:ignore="ResourceName">58px</dimen>
+    <dimen name="divider_57px" tools:ignore="ResourceName">57px</dimen>
+    <dimen name="divider_56px" tools:ignore="ResourceName">56px</dimen>
+    <dimen name="divider_55px" tools:ignore="ResourceName">55px</dimen>
+    <dimen name="divider_54px" tools:ignore="ResourceName">54px</dimen>
+    <dimen name="divider_53px" tools:ignore="ResourceName">53px</dimen>
+    <dimen name="divider_52px" tools:ignore="ResourceName">52px</dimen>
+    <dimen name="divider_51px" tools:ignore="ResourceName">51px</dimen>
+    <dimen name="divider_50px" tools:ignore="ResourceName">50px</dimen>
+    <dimen name="divider_49px" tools:ignore="ResourceName">49px</dimen>
+    <dimen name="divider_48px" tools:ignore="ResourceName">48px</dimen>
+    <dimen name="divider_47px" tools:ignore="ResourceName">47px</dimen>
+    <dimen name="divider_46px" tools:ignore="ResourceName">46px</dimen>
+    <dimen name="divider_45px" tools:ignore="ResourceName">45px</dimen>
+    <dimen name="divider_44px" tools:ignore="ResourceName">44px</dimen>
+    <dimen name="divider_43px" tools:ignore="ResourceName">43px</dimen>
+    <dimen name="divider_42px" tools:ignore="ResourceName">42px</dimen>
+    <dimen name="divider_41px" tools:ignore="ResourceName">41px</dimen>
+    <dimen name="divider_40px" tools:ignore="ResourceName">40px</dimen>
+    <dimen name="divider_39px" tools:ignore="ResourceName">39px</dimen>
+    <dimen name="divider_38px" tools:ignore="ResourceName">38px</dimen>
+    <dimen name="divider_37px" tools:ignore="ResourceName">37px</dimen>
+    <dimen name="divider_36px" tools:ignore="ResourceName">36px</dimen>
+    <dimen name="divider_35px" tools:ignore="ResourceName">35px</dimen>
+    <dimen name="divider_34px" tools:ignore="ResourceName">34px</dimen>
+    <dimen name="divider_33px" tools:ignore="ResourceName">33px</dimen>
+    <dimen name="divider_32px" tools:ignore="ResourceName">32px</dimen>
+    <dimen name="divider_31px" tools:ignore="ResourceName">31px</dimen>
+    <dimen name="divider_30px" tools:ignore="ResourceName">30px</dimen>
+    <dimen name="divider_29px" tools:ignore="ResourceName">29px</dimen>
+    <dimen name="divider_28px" tools:ignore="ResourceName">28px</dimen>
+    <dimen name="divider_27px" tools:ignore="ResourceName">27px</dimen>
+    <dimen name="divider_26px" tools:ignore="ResourceName">26px</dimen>
+    <dimen name="divider_25px" tools:ignore="ResourceName">25px</dimen>
+    <dimen name="divider_24px" tools:ignore="ResourceName">24px</dimen>
+    <dimen name="divider_23px" tools:ignore="ResourceName">23px</dimen>
+    <dimen name="divider_22px" tools:ignore="ResourceName">22px</dimen>
+    <dimen name="divider_21px" tools:ignore="ResourceName">21px</dimen>
+    <dimen name="divider_20px" tools:ignore="ResourceName">20px</dimen>
+    <dimen name="divider_19px" tools:ignore="ResourceName">19px</dimen>
+    <dimen name="divider_18px" tools:ignore="ResourceName">18px</dimen>
+    <dimen name="divider_17px" tools:ignore="ResourceName">17px</dimen>
+    <dimen name="divider_16px" tools:ignore="ResourceName">16px</dimen>
+    <dimen name="divider_15px" tools:ignore="ResourceName">15px</dimen>
+    <dimen name="divider_14px" tools:ignore="ResourceName">14px</dimen>
+    <dimen name="divider_13px" tools:ignore="ResourceName">13px</dimen>
+    <dimen name="divider_12px" tools:ignore="ResourceName">12px</dimen>
+    <dimen name="divider_11px" tools:ignore="ResourceName">11px</dimen>
+    <dimen name="divider_10px" tools:ignore="ResourceName">10px</dimen>
+    <dimen name="divider_9px" tools:ignore="ResourceName">9px</dimen>
+    <dimen name="divider_8px" tools:ignore="ResourceName">8px</dimen>
+    <dimen name="divider_7px" tools:ignore="ResourceName">7px</dimen>
+    <dimen name="divider_6px" tools:ignore="ResourceName">6px</dimen>
+    <dimen name="divider_5px" tools:ignore="ResourceName">5px</dimen>
+    <dimen name="divider_4px" tools:ignore="ResourceName">4px</dimen>
+    <dimen name="divider_3px" tools:ignore="ResourceName">3px</dimen>
+    <dimen name="divider_2px" tools:ignore="ResourceName">2px</dimen>
+    <dimen name="divider_1px" tools:ignore="ResourceName">1px</dimen>
+
     <dimen name="page_title_height">45dp</dimen>
     <dimen name="page_margin">10dp</dimen>