红包的修改

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

@@ -35,6 +35,8 @@ import com.xuan.xuanhttplibrary.okhttp.callback.BaseCallback;
 import com.xuan.xuanhttplibrary.okhttp.result.ObjectResult;
 import com.xuan.xuanhttplibrary.okhttp.result.Result;
 
+import java.util.HashMap;
+
 import okhttp3.Call;
 
 
@@ -92,7 +94,7 @@ public abstract class BaseRedPacketFragment extends EasyFragment {
                 String money = mEdtPacketMoney.getText().toString();
                 String words = mEdtRemark.getText().toString();
                 PaySecureHelper.inputPayPassword(getActivity(), getString(R.string.chat_redpacket), money, password -> {
-                    sendRedPacket(String.valueOf(tvRedPacketType), money, String.valueOf(mRedPacketCount), words, password);
+                    sendRedPacket(String.valueOf(mRedPacketType), money, String.valueOf(mRedPacketCount), words, password);
                 });
             }else {
                 setPayPassword();
@@ -223,7 +225,7 @@ public abstract class BaseRedPacketFragment extends EasyFragment {
     }
 
     //获取发送红包不同的参数
-    protected abstract ArrayMap<String, String> getSendRedPacketParameters();
+    protected abstract HashMap<String, String> getSendRedPacketParameters();
 
 
     private void sendRedPacket(final String type, String pMoney, String count, final String words, String payPassword) {
@@ -231,14 +233,16 @@ public abstract class BaseRedPacketFragment extends EasyFragment {
             return;
         }
         DialogHelper.showDefaulteMessageProgressDialog(getActivity());
-        ArrayMap<String, String> params = getSendRedPacketParameters();
+        HashMap<String, String> params = getSendRedPacketParameters();
         if (params==null){
-            params = new ArrayMap<>();
+            params = new HashMap<>();
         }
-        params.put("access_token", coreManager.getSelfStatus().accessToken);
+//        params.put("access_token", coreManager.getSelfStatus().accessToken);
         params.put("moneyStr", pMoney);
         params.put("greetings", words);
-        params.put("count",String.valueOf(mRedPacketCount));
+        params.put("count",count);
+        params.put("type",type);
+
 
 
 
@@ -270,7 +274,8 @@ public abstract class BaseRedPacketFragment extends EasyFragment {
                                         message.setObjectId(objectId); // 红包id
                                         Intent intent = new Intent();
                                         intent.putExtra(AppConstant.EXTRA_CHAT_MESSAGE, message.toJsonString());
-//                                        getActivity().setResult(viewPager.getCurrentItem() == 0 ? ChatActivity.REQUEST_CODE_SEND_RED_PT : ChatActivity.REQUEST_CODE_SEND_RED_KL, intent);
+
+                                        getActivity().setResult(mRedPacketType !=4 ? ChatActivity.REQUEST_CODE_SEND_RED_PT : ChatActivity.REQUEST_CODE_SEND_RED_KL, intent);
                                         getActivity().finish();
                                     }
                                 }

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

@@ -14,6 +14,7 @@ import com.jixin.im.bean.RoomMember;
 import com.jixin.im.ui.message.multi.GroupMoreFeaturesActivity;
 import com.klinker.android.link_builder.Link;
 
+import java.util.HashMap;
 import java.util.Objects;
 
 import static android.app.Activity.RESULT_OK;
@@ -95,7 +96,7 @@ public class ExclusiveRedPacketFragment extends BaseRedPacketFragment {
     }
 
     @Override
-    protected ArrayMap<String, String> getSendRedPacketParameters() {
+    protected HashMap<String, String> getSendRedPacketParameters() {
         return null;
     }
 

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

@@ -16,6 +16,7 @@ import com.klinker.android.link_builder.LinkBuilder;
 
 import org.jetbrains.annotations.NotNull;
 
+import java.util.HashMap;
 import java.util.Objects;
 import java.util.regex.Pattern;
 
@@ -156,8 +157,8 @@ public class NormalRedPacketFragment extends BaseRedPacketFragment{
     }
 
     @Override
-    protected ArrayMap<String, String> getSendRedPacketParameters() {
-        ArrayMap<String,String> arrayMap = new ArrayMap<>();
+    protected HashMap<String, String> getSendRedPacketParameters() {
+        HashMap<String,String> arrayMap = new HashMap<>();
         arrayMap.put("toUserId",mRedPacketAcceptorId);
         return arrayMap;
     }

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

@@ -12,6 +12,7 @@ import android.widget.EditText;
 import com.jixin.im.R;
 import com.klinker.android.link_builder.Link;
 
+import java.util.HashMap;
 import java.util.Objects;
 
 /**
@@ -101,7 +102,7 @@ public class PasswordRedPacketFragment extends BaseRedPacketFragment {
     }
 
     @Override
-    protected ArrayMap<String, String> getSendRedPacketParameters() {
+    protected HashMap<String, String> getSendRedPacketParameters() {
         return null;
     }
 

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

@@ -19,6 +19,7 @@
         android:layout_height="wrap_content"
         android:maxWidth="140dp"
         android:maxLines="1"
+        android:gravity="center"
         android:layout_centerHorizontal="true"
         android:layout_marginStart="10dp"
         android:layout_marginEnd="10dp"
@@ -28,7 +29,7 @@
         android:text="财源滚滚滚滚财源滚滚滚滚"
         android:layout_above="@+id/chat_status"
         android:textColor="#FDED5D"
-        android:textSize="12sp" />
+        android:textSize="16sp" />
 
 
     <TextView
@@ -42,6 +43,7 @@
         android:ellipsize="end"
         android:maxWidth="140dp"
         android:maxLines="1"
+        android:gravity="center"
         android:text="专属红包"
         android:textColor="#FDED5D"
         android:textSize="8sp" />
@@ -51,7 +53,7 @@
         android:layout_width="21dp"
         app:riv_oval="true"
         android:layout_alignBottom="@+id/view_red_packet_bg"
-        android:layout_marginBottom="12dp"
+        android:layout_marginBottom="8dp"
         android:layout_centerHorizontal="true"
         android:layout_height="21dp" />
     <TextView