解决红包UI问题

jixin/src/main/java/com/jixin/im/fragment/BaseRedPacketFragment.java

@@ -242,7 +242,11 @@ public abstract class BaseRedPacketFragment extends EasyFragment {
         params.put("greetings", words);
         params.put("count",count);
         params.put("type",type);
-
+        if (isGroupChatType()){
+            params.put("roomJid",mRedPacketAcceptorId);
+        }else {
+            params.put("toUserId",mRedPacketAcceptorId);
+        }
 
 
 

jixin/src/main/java/com/jixin/im/fragment/NormalRedPacketFragment.java

@@ -159,7 +159,8 @@ public class NormalRedPacketFragment extends BaseRedPacketFragment{
     @Override
     protected HashMap<String, String> getSendRedPacketParameters() {
         HashMap<String,String> arrayMap = new HashMap<>();
-        arrayMap.put("toUserId",mRedPacketAcceptorId);
+
+
         return arrayMap;
     }
 

jixin/src/main/java/com/jixin/im/ui/me/redpacket/RedDetailsActivity.java

@@ -87,7 +87,6 @@ public class RedDetailsActivity extends BaseActivity implements View.OnClickList
 
     private void initView() {
         getSupportActionBar().hide();
-        findViewById(R.id.mergerStatus).setBackgroundColor(getResources().getColor(R.color.transparent));
         findViewById(R.id.iv_title_left).setOnClickListener(view -> finish());
         TextView tvTitle = findViewById(R.id.tv_title_center);
         tvTitle.setText("红包详情");

jixin/src/main/res/layout/activity_redpacket_details.xml

@@ -16,13 +16,50 @@
         android:layout_height="174dp"
         android:scaleType="fitXY"
         android:src="@mipmap/red_packet_details_bg" />
+    <FrameLayout
+        android:id="@+id/flt_title"
+        android:layout_width="match_parent"
+        android:layout_height="70dp">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_marginTop="20dp">
+
+            <ImageView
+                android:id="@+id/iv_title_left"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="15dp"
+                android:src="@mipmap/return_icon"
+                android:gravity="center"
+                android:tint="@color/white" />
+
+            <TextView
+                android:id="@+id/tv_title_center"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:layout_marginLeft="10dp"
+                android:text="@string/send_red_packet"
+                android:textColor="@color/white"
+                android:textSize="18sp" />
+            <TextView
+                android:id="@+id/tv_title_right"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:layout_marginEnd="10dp"
+                android:text="@string/send_red_packet"
+                android:textColor="@color/white"
+                android:textSize="18sp" />
+
+        </RelativeLayout>
+
+    </FrameLayout>
 
 
-    <include
-        android:id="@+id/mergerStatus"
-        layout="@layout/a_view_actionbar"
-        android:layout_width="match_parent"
-        android:layout_height="72dp" />
 
 
     <LinearLayout

jixin/src/main/res/layout/chat_from_item_redpacket.xml

@@ -9,8 +9,10 @@
 
     <TextView
         android:id="@+id/time_tv"
+
+        android:text="2020-09-10 22:10:15"
         style="@style/ChattingUISystem"
-        android:visibility="gone" />
+        android:visibility="visible" />
 
     <com.jixin.im.view.HeadView
         android:id="@+id/chat_head_iv"
@@ -37,13 +39,18 @@
         android:visibility="gone" />
     <include layout="@layout/include_chat_item_red_packet"
         android:layout_width="@dimen/chat_width_red"
-
+        android:layout_below="@+id/nick_name"
         android:id="@+id/chat_warp_view"
         android:layout_height="@dimen/chat_height_red"
         android:layout_marginTop="@dimen/chat_head_top"
         android:layout_toStartOf="@id/chat_head_iv"/>
 
-    <include layout="@layout/view_holder_state_from" />
+    <include
+        android:layout_below="@+id/time_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/view_include_state"
+        layout="@layout/view_holder_state_from" />
 
     <CheckBox
         android:id="@+id/chat_msc"

jixin/src/main/res/layout/chat_to_item_redpacket.xml

@@ -52,10 +52,10 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/time_tv"
         android:layout_marginTop="@dimen/chat_head_top"
-        android:layout_toRightOf="@id/ivNicknameIcon"
+        android:layout_toEndOf="@id/ivNicknameIcon"
         android:textSize="14sp"
         android:visibility="gone"
-        tools:text="sdfsdfs"
+        tools:text="zhangshan"
         tools:visibility="visible" />
 
     <TextView
@@ -76,6 +76,7 @@
 
     <include layout="@layout/include_chat_item_red_packet"
         android:layout_width="@dimen/chat_width_red"
+        android:layout_below="@+id/nick_name"
         android:layout_toEndOf="@id/chat_head_iv"
         android:id="@+id/chat_warp_view"
         android:layout_height="@dimen/chat_height_red"