MM 礼品积分红包修改

app/src/main/java/com/dskj/rbchat/redpack/ReceiveRedPacketActivity.java

@@ -338,12 +338,12 @@ public class ReceiveRedPacketActivity extends BaseActivity implements View.OnCli
         } else if (redpacketBean.getStatus() == 1) {
             if (redpacketBean.getCoinType() == 0) {
                 viewBinding.titleTipsTvuser.setText("1个红包，共" + String.format("%.2f", redpacketBean.getAmount() / 100f) + getTypeName());
+                viewBinding.toWalletTv.setText(getString(R.string.to_wallet_send_redpack_txt));
             } else {
                 viewBinding.titleTipsTvuser.setText("1个红包，共" + String.format("%.2f", redpacketBean.getAmount() / 100f) + getTypeName());
+                viewBinding.toWalletTv.setText(getString(R.string.to_wallet_send_redpack_txt1));
             }
 
-            viewBinding.toWalletTv.setText(getString(R.string.to_wallet_send_redpack_txt));
-
             viewBinding.toWalletTv.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {

app/src/main/java/com/dskj/rbchat/redpack/SendRedPacketActivity.java

@@ -3,6 +3,7 @@ package com.dskj.rbchat.redpack;
 
 import android.app.Activity;
 import android.content.Intent;
+import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
@@ -20,6 +21,8 @@ import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.drawable.DrawableCompat;
 
 
 import com.codersun.fingerprintcompat.AonFingerChangeCallback;
@@ -43,6 +46,7 @@ import com.dskj.rbchat.network.BaseObserver;
 import com.dskj.rbchat.network.Result;
 import com.dskj.rbchat.pay.CollectionAndPaymentActivity;
 import com.dskj.rbchat.utils.AdaptScreenUtils;
+import com.dskj.rbchat.utils.AppUtils;
 import com.dskj.rbchat.utils.DataUtils;
 import com.dskj.rbchat.utils.GsonUtils;
 import com.dskj.rbchat.utils.LogUtils;
@@ -84,10 +88,11 @@ public class SendRedPacketActivity extends BaseActivity {
     WalletBean walletBean;
     int maxNumber = 100;
 
-    private boolean isJinBi = true;
+    private boolean isJinBi = false;
     private ActivitySendRedPacketBinding viewBinding;
     PayCashFingerDialog payCashFingerDialog;
     PayCashDialog payDialog;
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         getWindow().setStatusBarColor(getResources().getColor(R.color.color_fcfcfc));
@@ -100,7 +105,9 @@ public class SendRedPacketActivity extends BaseActivity {
         initView();
         initListeners();
     }
+
     /**
+     *
      */
     protected void initView() {
 
@@ -111,7 +118,6 @@ public class SendRedPacketActivity extends BaseActivity {
 //        setTitle(getString(R.string.hbxq_txt));
 
 
-
 //        u = lu1();
 
         // 设置标题（自定义标题栏后的title文本设置是不同的哦，见CustomeTitleBar中的说明）
@@ -130,8 +136,8 @@ public class SendRedPacketActivity extends BaseActivity {
 //            }
 //            LogUtils.i(getString(R.string.qunrenyuanshu_txt) + maxNumber);
             Team user = NIMClient.getService(TeamService.class).queryTeamBlock(getIntent().getStringExtra("receiverUid"));
-            if(user!=null){
+            if (user != null) {
-                viewBinding.tipsNamesTv.setText(String.format(getString(R.string.hbq_tips_txt),user.getMemberCount()));
+                viewBinding.tipsNamesTv.setText(String.format(getString(R.string.hbq_tips_txt), user.getMemberCount()));
                 maxNumber = user.getMemberCount();
             }
         }
@@ -140,6 +146,7 @@ public class SendRedPacketActivity extends BaseActivity {
 
 
     }
+
     private TextView coloseIv;
     private LinearLayout ftLy;
     private LinearLayout jtLy;
@@ -182,29 +189,36 @@ public class SendRedPacketActivity extends BaseActivity {
     }
 
     private void getWallet() {
-            Api.getInstance().walletInfo(IMKitClient.account())
+        Api.getInstance().walletInfo(IMKitClient.account())
-                    .subscribeOn(Schedulers.io())
+                .subscribeOn(Schedulers.io())
-                    .observeOn(AndroidSchedulers.mainThread())
+                .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(new BaseObserver<Result<WalletBean>>() {
+                .subscribe(new BaseObserver<Result<WalletBean>>() {
 
-                        @Override
+                    @Override
-                        public void onSuccess(Result<WalletBean> feedbackResp) {
+                    public void onSuccess(Result<WalletBean> feedbackResp) {
-                            walletBean = feedbackResp.data;
+                        walletBean = feedbackResp.data;
-                            if(walletBean!=null){
+                        if (walletBean != null) {
-                                viewBinding.jinbiTv.setText(String.format(getString(R.string.qbyf_txt), walletBean.getGoldCoin() / 100f));
+                            if (isJinBi) {
-//                                viewBinding.yinbiTv.setText(String.format("%.2f",  walletBean.getSilverCoin() / 100f));
+                                viewBinding.jinbiTv.setText(String.format(getString(R.string.qbyf_txt), AppUtils.getQian(walletBean.getGoldCoin())));
-                            }else{
+                            } else {
-                                viewBinding.jinbiTv.setText(String.format(getString(R.string.qbyf_txt), 0f));
+                                viewBinding.jinbiTv.setText(String.format(getString(R.string.hljfye_txt), AppUtils.getQian(walletBean.getSilverCoin())));
-//                                viewBinding.yinbiTv.setText(String.format("%.2f",  0f));
                             }
+                        } else {
+                            if (isJinBi) {
+                                viewBinding.jinbiTv.setText(String.format(getString(R.string.qbyf_txt), "0.00"));
+                            } else {
+                                viewBinding.jinbiTv.setText(String.format(getString(R.string.hljfye_txt), "0.00"));
+                            }
+//
                         }
+                    }
 
-                        @Override
+                    @Override
-                        public void onError(int code, String msg) {
+                    public void onError(int code, String msg) {
 //                            WidgetUtils.showToast(getActivity(), msg, WidgetUtils.ToastType.ERROR);
 
-                        }
+                    }
-                    });
+                });
 
 
     }
@@ -216,8 +230,8 @@ public class SendRedPacketActivity extends BaseActivity {
 //            tips1Tv.setText(getString(R.string.putong_txt));
             viewBinding.tipsTv.setText(getString(R.string.psjhb_txt));
             viewBinding.numberHintEt.setHint(getString(R.string.red_packet_number_hint_txt));
-            if(isGroup) {
+            if (isGroup) {
-                Drawable drawable = getResources().getDrawable(R.mipmap.left_pin_img);
+                Drawable drawable = getResources().getDrawable(R.mipmap.left_pin_gift);
                 drawable.setBounds(0, 0, drawable.getMinimumWidth(), drawable.getMinimumHeight());
                 viewBinding.jintLeftTv.setCompoundDrawables(drawable, null, null, null);
             }
@@ -234,28 +248,29 @@ public class SendRedPacketActivity extends BaseActivity {
     }
 
     BindBean bindBean;
+
     private void bindInfo() {
 //        if (u != null) {
-            Api.getInstance().bindInfo(IMKitClient.account())
+        Api.getInstance().bindInfo(IMKitClient.account())
-                    .subscribeOn(Schedulers.io())
+                .subscribeOn(Schedulers.io())
-                    .observeOn(AndroidSchedulers.mainThread())
+                .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(new BaseObserver<Result<BindBean>>() {
+                .subscribe(new BaseObserver<Result<BindBean>>() {
-                        @Override
+                    @Override
-                        public void onSuccess(Result<BindBean> feedbackResp) {
+                    public void onSuccess(Result<BindBean> feedbackResp) {
-                            bindBean = feedbackResp.data;
+                        bindBean = feedbackResp.data;
-                            if(bindBean.isAllowSilverCoin() == true){
+                        if (bindBean.isAllowSilverCoin() == true) {
-                                viewBinding.topSelectLy.setVisibility(View.GONE);
+                            viewBinding.topSelectLy.setVisibility(View.GONE);
-                            }else{
+                        } else {
-                                viewBinding.topSelectLy.setVisibility(View.GONE);
+                            viewBinding.topSelectLy.setVisibility(View.GONE);
 
-                            }
                         }
+                    }
 
-                        @Override
+                    @Override
-                        public void onError(int code, String msg) {
+                    public void onError(int code, String msg) {
-                            LogUtils.i("获取到的错误:" + code + "" + msg);
+                        LogUtils.i("获取到的错误:" + code + "" + msg);
-                        }
+                    }
-                    });
+                });
 //        }
     }
 
@@ -276,7 +291,7 @@ public class SendRedPacketActivity extends BaseActivity {
                     return;
                 }
 
-                if (Integer.parseInt(viewBinding.sizeHintEt.getText().toString().trim())<1) {
+                if (Integer.parseInt(viewBinding.sizeHintEt.getText().toString().trim()) < 1) {
                     ToastX.showShortToast(R.string.qsrhbgs_txt);
 
                     return;
@@ -290,17 +305,17 @@ public class SendRedPacketActivity extends BaseActivity {
 
                 return;
             }
-            float number1 =Float.parseFloat( viewBinding.numberTv.getText().toString().trim())*100;
+            float number1 = Float.parseFloat(viewBinding.numberTv.getText().toString().trim()) * 100;
-            LogUtils.i("红包金额："+number1);
+            LogUtils.i("红包金额：" + number1);
-            if (number1<1) {
+            if (number1 < 1) {
                 ToastX.showShortToast(R.string.hbjebnsy_txt);
 
                 return;
             }
 
             if (isGroup) {
-                float number =Float.parseFloat(viewBinding. numberHintEt.getText().toString().trim())*100;
+                float number = Float.parseFloat(viewBinding.numberHintEt.getText().toString().trim()) * 100;
-                if (number/Integer.parseInt(viewBinding.sizeHintEt.getText().toString().trim())<1) {
+                if (number / Integer.parseInt(viewBinding.sizeHintEt.getText().toString().trim()) < 1) {
                     ToastX.showShortToast(R.string.dghbjebnsy_txt);
 
                     return;
@@ -309,7 +324,7 @@ public class SendRedPacketActivity extends BaseActivity {
 
                 if (Float.parseFloat(viewBinding.numberHintEt.getText().toString().trim()) > IMUIKitConfig.GROUP_MAX_MONEY) {
 //                        ToastUtils.showShort(String.format(getString(R.string.max_red_packet_tips_txt),getString(R.string.danwei_txt),Const.GROUP_MAX_MONEY));
-                    ToastX.showShortToast(getString(R.string.dghbjebndy_txt)+" "+IMUIKitConfig.GROUP_MAX_MONEY);
+                    ToastX.showShortToast(getString(R.string.dghbjebndy_txt) + " " + IMUIKitConfig.GROUP_MAX_MONEY);
 
                     return;
                 }
@@ -324,7 +339,7 @@ public class SendRedPacketActivity extends BaseActivity {
             } else {
                 if (Float.parseFloat(viewBinding.numberHintEt.getText().toString().trim()) > IMUIKitConfig.SINGLE_MAX_MONEY) {
 //                        ToastUtils.showShort(String.format(getString(R.string.max_red_packet_tips_txt),getString(R.string.danwei_txt),Const.SINGLE_MAX_MONEY));
-                    ToastX.showShortToast(getString(R.string.dghbjebndy_txt)+" "+IMUIKitConfig.SINGLE_MAX_MONEY);
+                    ToastX.showShortToast(getString(R.string.dghbjebndy_txt) + " " + IMUIKitConfig.SINGLE_MAX_MONEY);
 
                     return;
                 }
@@ -341,14 +356,15 @@ public class SendRedPacketActivity extends BaseActivity {
 //                            .setNegativeButton($$(R.string.general_cancel), null)
 //                            .show();
 
-                    ActionConfirmDialog actionDialog = new ActionConfirmDialog(SendRedPacketActivity.this,getString(R.string.sfqcz_txt),getString(R.string.general_cancel),getString(R.string.quchongzhi_txt));
+                    ActionConfirmDialog actionDialog = new ActionConfirmDialog(SendRedPacketActivity.this, getString(R.string.sfqcz_txt), getString(R.string.general_cancel), getString(R.string.quchongzhi_txt));
                     actionDialog.setOnToActionListener(new ActionConfirmDialog.OnToActionListener() {
                         @Override
                         public void toSumbit() {
                             Intent intent = new Intent(SendRedPacketActivity.this, WalletInfoActivity.class);
-                            intent.putExtra("isG",true);
+                            intent.putExtra("isG", true);
                             startActivity(intent);
                         }
+
                         @Override
                         public void toCancel() {
 
@@ -385,17 +401,15 @@ public class SendRedPacketActivity extends BaseActivity {
 //                    toChange(null, number,2);
 //                }else{
 
-                    if(DataUtils.get(SendRedPacketActivity.this, "hasFinger", false)){
+                if (DataUtils.get(SendRedPacketActivity.this, "hasFinger", false)) {
-                        showPayCashFingerDialog();
+                    showPayCashFingerDialog();
 
-                    }else{
+                } else {
-                        showPayCashDialog();
+                    showPayCashDialog();
-                    }
+                }
 //                }
 
 
-
-
             } else {
                 ToastX.showShortToast(R.string.hqqbxxsb_txt);
 
@@ -435,13 +449,13 @@ public class SendRedPacketActivity extends BaseActivity {
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
                 String input = s.toString();
-                if(input.startsWith(".")){
+                if (input.startsWith(".")) {
-                    viewBinding.numberHintEt.setText("0"+viewBinding.numberHintEt.getText().toString());
+                    viewBinding.numberHintEt.setText("0" + viewBinding.numberHintEt.getText().toString());
                 }
-                if(input.contains(".")){
+                if (input.contains(".")) {
                     int dotIndex = input.indexOf(".");
-                    if(input.length()-dotIndex-1>2){
+                    if (input.length() - dotIndex - 1 > 2) {
-                        viewBinding.numberHintEt.setText(input.substring(0,dotIndex+3));
+                        viewBinding.numberHintEt.setText(input.substring(0, dotIndex + 3));
                     }
                 }
                 viewBinding.numberHintEt.setSelection(viewBinding.numberHintEt.getText().length());
@@ -481,17 +495,17 @@ public class SendRedPacketActivity extends BaseActivity {
     }
 
     private void showPayCashDialog() {
-        if(isJinBi) {
+        if (isJinBi) {
             payDialog = new PayCashDialog(SendRedPacketActivity.this, number + "", true, 0, walletBean,
                     null, 2, getString(R.string.fahongbao_txt));
-        }else{
+        } else {
             payDialog = new PayCashDialog(SendRedPacketActivity.this, number + "", true, 0, walletBean,
-                    null, 2, getString(R.string.fahongbao_txt),1);
+                    null, 2, getString(R.string.fahongbao_txt), 1);
         }
         payDialog.setOntoAlbumListener(new PayCashDialog.OnListItemClickListener() {
             @Override
             public void onPayPass(String position) {
-                toChange(position, number,1);
+                toChange(position, number, 1);
 
             }
 
@@ -511,10 +525,10 @@ public class SendRedPacketActivity extends BaseActivity {
 
     private void showPayCashFingerDialog() {
         //Context context, String data, boolean showNumber, int payType, WalletBean walletBean, SelectPayTypeDialog.OnToTypeListener onToTypeListener, int isShowFinger
-        if(isJinBi) {
+        if (isJinBi) {
             payCashFingerDialog = new PayCashFingerDialog(this, number + "", true, 0, walletBean, null, 2, getString(R.string.fahongbao_txt));
-        }else{
+        } else {
-            payCashFingerDialog = new PayCashFingerDialog(this, number + "", true, 0, walletBean, null, 2, getString(R.string.fahongbao_txt),true);
+            payCashFingerDialog = new PayCashFingerDialog(this, number + "", true, 0, walletBean, null, 2, getString(R.string.fahongbao_txt), true);
 
         }
         payCashFingerDialog.setOntoAlbumListener(new PayCashFingerDialog.OnListItemClickListener() {
@@ -546,37 +560,31 @@ public class SendRedPacketActivity extends BaseActivity {
                 .setTitle("  ")
                 .setDes("  ")
                 .setNegativeText("  ")
-                .setFingerCheckCallback(new SimpleFingerCheckCallback()
+                .setFingerCheckCallback(new SimpleFingerCheckCallback() {
-                {
 
                     @Override
-                    public void onSucceed()
+                    public void onSucceed() {
-                    {
                         ToastX.showShortToast("验证成功");
                         payCashFingerDialog.dismiss();
-                        toChange(null, number,2);
+                        toChange(null, number, 2);
                     }
 
                     @Override
-                    public void onError(String error)
+                    public void onError(String error) {
-                    {
                         ToastX.showShortToast("验证失败");
 
                     }
 
                     @Override
-                    public void onCancel()
+                    public void onCancel() {
-                    {
                         ToastX.showShortToast("您取消了识别");
 
                     }
                 })
-                .setFingerChangeCallback(new AonFingerChangeCallback()
+                .setFingerChangeCallback(new AonFingerChangeCallback() {
-                {
 
                     @Override
-                    protected void onFingerDataChange()
+                    protected void onFingerDataChange() {
-                    {
 //                        ToastX.showShortToast("指纹数据发生了变化");
                         FingerManager.updateFingerData(SendRedPacketActivity.this);
                         new Handler().postDelayed(() -> checkPayFinger(), 1000);
@@ -609,7 +617,7 @@ public class SendRedPacketActivity extends BaseActivity {
     private void changeTop() {
         if (isJinBi) {
             viewBinding.jinbiLy.setBackgroundResource(R.drawable.logout_btn_main1);
-            viewBinding. ytinbiLy.setBackgroundResource(R.drawable.logout_btn_c1);
+            viewBinding.ytinbiLy.setBackgroundResource(R.drawable.logout_btn_c1);
 //            tvLogin.setBackgroundResource(R.drawable.logout_btn_red);
             viewBinding.tvLogin.setText(getString(R.string.send_in_redenvelope_txt1));
             changeStatus();
@@ -629,31 +637,30 @@ public class SendRedPacketActivity extends BaseActivity {
         }
 
 
-
     }
 
 
     private void changeStatus() {
-        if(isJinBi){
+        if (isJinBi) {
             viewBinding.tvLogin.setBackgroundResource(R.drawable.logout_btn_z_88);
             if (isGroup) {
-                if (!TextUtils.isEmpty(viewBinding.numberHintEt.getText().toString().trim())&&!TextUtils.isEmpty(viewBinding.sizeHintEt.getText().toString().trim())) {
+                if (!TextUtils.isEmpty(viewBinding.numberHintEt.getText().toString().trim()) && !TextUtils.isEmpty(viewBinding.sizeHintEt.getText().toString().trim())) {
                     viewBinding.tvLogin.setBackgroundResource(R.drawable.logout_btn_red);
                 }
-            }else {
+            } else {
                 if (!TextUtils.isEmpty(viewBinding.numberHintEt.getText().toString().trim())) {
                     viewBinding.tvLogin.setBackgroundResource(R.drawable.logout_btn_red);
                 }
             }
-        }else{
+        } else {
-            viewBinding.tvLogin.setBackgroundResource(R.drawable.logout_btn_sl_88);
+            viewBinding.tvLogin.setBackgroundResource(R.drawable.logout_btn_z_88);
             if (isGroup) {
-                if (!TextUtils.isEmpty(viewBinding.numberHintEt.getText().toString().trim())&&!TextUtils.isEmpty(viewBinding.sizeHintEt.getText().toString().trim())) {
+                if (!TextUtils.isEmpty(viewBinding.numberHintEt.getText().toString().trim()) && !TextUtils.isEmpty(viewBinding.sizeHintEt.getText().toString().trim())) {
-                    viewBinding.tvLogin.setBackgroundResource(R.drawable.logout_btn_sl);
+                    viewBinding.tvLogin.setBackgroundResource(R.drawable.logout_btn_red);
                 }
-            }else {
+            } else {
                 if (!TextUtils.isEmpty(viewBinding.numberHintEt.getText().toString().trim())) {
-                    viewBinding.tvLogin.setBackgroundResource(R.drawable.logout_btn_sl);
+                    viewBinding.tvLogin.setBackgroundResource(R.drawable.logout_btn_red);
                 }
             }
         }
@@ -661,15 +668,15 @@ public class SendRedPacketActivity extends BaseActivity {
 
     private void changeInfo() {
         if (!TextUtils.isEmpty(viewBinding.numberHintEt.getText().toString().trim())) {
-            if(viewBinding.numberHintEt.getText().toString().trim().equals(".")){
+            if (viewBinding.numberHintEt.getText().toString().trim().equals(".")) {
-                viewBinding. numberHintEt.setText("0.");
+                viewBinding.numberHintEt.setText("0.");
                 viewBinding.numberHintEt.setSelection(2);
 
             }
-            if(viewBinding.numberHintEt.getText().toString().trim().indexOf(".")!=-1){
+            if (viewBinding.numberHintEt.getText().toString().trim().indexOf(".") != -1) {
                 String[] nams = viewBinding.numberHintEt.getText().toString().trim().split("[.]");
-                if(nams.length>1){
+                if (nams.length > 1) {
-                    if(nams[1].length()>2) {
+                    if (nams[1].length() > 2) {
                         viewBinding.numberHintEt.setText(nams[0] + "." + nams[1].substring(0, 2));
                         viewBinding.numberHintEt.setSelection(viewBinding.numberHintEt.getText().toString().length());
                     }
@@ -679,7 +686,7 @@ public class SendRedPacketActivity extends BaseActivity {
             float number1 = Float.parseFloat(viewBinding.numberHintEt.getText().toString().trim());
             String text1 = String.format("%.2f", number1);
             viewBinding.numberTv.setText(text1);
-            if(isGroup) {
+            if (isGroup) {
                 if (!isPinShouQi) {
                     if (TextUtils.isEmpty(viewBinding.sizeHintEt.getText().toString().trim())) {
                         viewBinding.numberTv.setText("0.00");
@@ -707,7 +714,7 @@ public class SendRedPacketActivity extends BaseActivity {
 
     }
 
-    private void toChange(String position, float number,int type) {
+    private void toChange(String position, float number, int type) {
         if (isGroup) {
             HashMap<String, Object> maps = new HashMap<>();
             maps.put("type", isPinShouQi ? 0 : 1);
@@ -716,7 +723,7 @@ public class SendRedPacketActivity extends BaseActivity {
             maps.put("senderUid", Integer.parseInt(IMKitClient.account()));
             maps.put("groupId", getIntent().getStringExtra("receiverUid"));
             LogUtils.i("群ID：" + getIntent().getStringExtra("receiverUid"));
-            if(!TextUtils.isEmpty(position)) {
+            if (!TextUtils.isEmpty(position)) {
                 maps.put("payPassword", position);
             }
             if (!TextUtils.isEmpty(viewBinding.memoEt.getText().toString().trim())) {
@@ -724,7 +731,7 @@ public class SendRedPacketActivity extends BaseActivity {
             } else {
                 maps.put("remark", getString(R.string.remarks_hit_txt));
             }
-            maps.put("coinType",isJinBi?0:1);
+            maps.put("coinType", isJinBi ? 0 : 1);
             maps.put("substationId", IMUIKitConfig.SUBSTATIONID);
             maps.put("payVerifyCode", type);
 
@@ -741,20 +748,20 @@ public class SendRedPacketActivity extends BaseActivity {
                             //                              List<GrabbersBean> grabbers, Integer receiverUid, String receiveTime
 
                             List<GrabbersBean1> grabbersBean1List = null;
-                            if(groupBean.getGrabbers()!=null&&groupBean.getGrabbers().size()>0){
+                            if (groupBean.getGrabbers() != null && groupBean.getGrabbers().size() > 0) {
                                 //String redEnvelopeId, String grabberUid, String grabAmount, String grabTime, String grabberNickname, String grabberAvatar
                                 grabbersBean1List = new ArrayList<>();
-                                for (GrabbersBean grabbersBean:groupBean.getGrabbers())
+                                for (GrabbersBean grabbersBean : groupBean.getGrabbers())
-                                    grabbersBean1List.add(new GrabbersBean1(grabbersBean.getRedEnvelopeId()+"",grabbersBean.getGrabberUid()+"",
+                                    grabbersBean1List.add(new GrabbersBean1(grabbersBean.getRedEnvelopeId() + "", grabbersBean.getGrabberUid() + "",
-                                            grabbersBean.getGrabAmount()+"",grabbersBean.getGrabTime()+"",grabbersBean.getGrabberNickname(),grabbersBean.getGrabberAvatar()));
+                                            grabbersBean.getGrabAmount() + "", grabbersBean.getGrabTime() + "", grabbersBean.getGrabberNickname(), grabbersBean.getGrabberAvatar()));
                             }
 
 
-                            RedPacketAttachment redPacketAttachment = new RedPacketAttachment(groupBean.getId()+"",groupBean.getStatus()+"",groupBean.getAmount()+"",
+                            RedPacketAttachment redPacketAttachment = new RedPacketAttachment(groupBean.getId() + "", groupBean.getStatus() + "", groupBean.getAmount() + "",
-                                    groupBean.getSenderUid()+"",groupBean.getGroupId(),
+                                    groupBean.getSenderUid() + "", groupBean.getGroupId(),
-                                    groupBean.getCount()+"",groupBean.getResidualCount()+"",groupBean.getResidualAmount()+"",groupBean.getSendTime(),
+                                    groupBean.getCount() + "", groupBean.getResidualCount() + "", groupBean.getResidualAmount() + "", groupBean.getSendTime(),
-                                    groupBean.getFinishTime(),groupBean.getRemark(),groupBean.getSenderNickname(),groupBean.getCoinType()+"",
+                                    groupBean.getFinishTime(), groupBean.getRemark(), groupBean.getSenderNickname(), groupBean.getCoinType() + "",
-                                    null,null);
+                                    null, null);
                             toShareMessageGroup(redPacketAttachment);
 
                         }
@@ -770,15 +777,15 @@ public class SendRedPacketActivity extends BaseActivity {
             maps.put("amount", (int) (number * 100));
             maps.put("senderUid", Integer.parseInt(IMKitClient.account()));
             maps.put("receiverUid", Integer.parseInt(getIntent().getStringExtra("receiverUid")));
-            if(!TextUtils.isEmpty(position)) {
+            if (!TextUtils.isEmpty(position)) {
                 maps.put("payPassword", position);
             }
             if (!TextUtils.isEmpty(viewBinding.memoEt.getText().toString().trim())) {
                 maps.put("remark", viewBinding.memoEt.getText().toString().trim());
             } else {
-                maps.put("remark",getString(R.string.remarks_hit_txt));
+                maps.put("remark", getString(R.string.remarks_hit_txt));
             }
-            maps.put("coinType",isJinBi?0:1);
+            maps.put("coinType", isJinBi ? 0 : 1);
             maps.put("substationId", IMUIKitConfig.SUBSTATIONID);
             maps.put("payVerifyCode", type);
 
@@ -794,10 +801,10 @@ public class SendRedPacketActivity extends BaseActivity {
                             //                              String finishTime, String remark, String senderNickname, Integer coinType,
                             //                              List<GrabbersBean> grabbers, Integer receiverUid, String receiveTime
                             RedpacketBean redpacketBean = feedbackResp.data;
-                            RedPacketAttachment redPacketAttachment = new RedPacketAttachment(redpacketBean.getId()+"",redpacketBean.getStatus()+"",redpacketBean.getAmount()+"",
+                            RedPacketAttachment redPacketAttachment = new RedPacketAttachment(redpacketBean.getId() + "", redpacketBean.getStatus() + "", redpacketBean.getAmount() + "",
-                                    redpacketBean.getSenderUid()+"",null,
+                                    redpacketBean.getSenderUid() + "", null,
-                                    0+"",0+"",0+"",redpacketBean.getSendTime(),null,redpacketBean.getRemark(),null,redpacketBean.getCoinType()+"",
+                                    0 + "", 0 + "", 0 + "", redpacketBean.getSendTime(), null, redpacketBean.getRemark(), null, redpacketBean.getCoinType() + "",
-                                    redpacketBean.getReceiverUid()+"",redpacketBean.getReceiveTime());
+                                    redpacketBean.getReceiverUid() + "", redpacketBean.getReceiveTime());
                             toShareMessage(redPacketAttachment);
 
                         }
@@ -811,7 +818,6 @@ public class SendRedPacketActivity extends BaseActivity {
     }
 
 
-
     private void toShareMessage(RedPacketAttachment customerAttachment) {
         IMMessage customMessage = MessageBuilder.createCustomMessage(getIntent().getStringExtra("receiverUid"), SessionTypeEnum.P2P,
                 getString(com.netease.yunxin.kit.chatkit.ui.R.string.hongbao_chat_txt), customerAttachment);
@@ -865,14 +871,15 @@ public class SendRedPacketActivity extends BaseActivity {
             });
         }
     }
+
     public boolean onTouchEvent(MotionEvent event) {
-        if(null != this.getCurrentFocus()){
+        if (null != this.getCurrentFocus()) {
             /**
              * 点击空白位置 隐藏软键盘
              */
             InputMethodManager mInputMethodManager = (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE);
             return mInputMethodManager.hideSoftInputFromWindow(this.getCurrentFocus().getWindowToken(), 0);
         }
-        return super .onTouchEvent(event);
+        return super.onTouchEvent(event);
     }
 }

app/src/main/res/drawable/logout_btn_red.xml

@@ -18,7 +18,7 @@
                 android:useLevel="true" />
             <stroke android:width="0dp" android:color="@color/color_fa6650"/>
             <corners
-                android:radius="12dp" />
+                android:radius="50dp" />
         </shape>
     </item>
 </ripple>

app/src/main/res/drawable/logout_btn_z_88.xml

@@ -18,7 +18,7 @@
                 android:useLevel="true" />
             <stroke android:width="0dp" android:color="#88E44F3E"/>
             <corners
-                android:radius="12dp" />
+                android:radius="50dp" />
         </shape>
     </item>
 </ripple>

app/src/main/res/layout/activity_receive_red_packet.xml

@@ -53,6 +53,8 @@
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
         android:layout_gravity="center_horizontal"
+        android:layout_marginStart="@dimen/dimen_15_dp"
+        android:layout_marginEnd="@dimen/dimen_15_dp"
         android:layout_marginTop="40dp"
         android:gravity="center_vertical"
         android:orientation="horizontal">

app/src/main/res/layout/activity_send_red_packet.xml

@@ -29,7 +29,7 @@
         android:layout_marginLeft="@dimen/dp_30"
         android:text="@string/psjhb_txt"
         android:drawablePadding="@dimen/dp_5"
-        android:textColor="@color/color_6b3689"
+        android:textColor="#6D94FF"
         android:textSize="@dimen/sp_14" />
 
 
@@ -216,7 +216,7 @@
             android:layout_marginRight="10dp"
             android:drawablePadding="@dimen/dp_5"
             android:layout_weight="1"
-            android:drawableRight="@mipmap/wallet_jinbi_img"
+            android:drawableRight="@mipmap/wallet_yinbi_img"
             android:background="@color/transparent"
             android:gravity="right|center_vertical"
             android:hint="0.00"
@@ -243,7 +243,7 @@
         android:gravity="right"
         android:layout_marginRight="@dimen/dp_30"
         android:layout_marginLeft="@dimen/dp_15"
-        android:text="@string/species_txt"
+        android:text="@string/silver_coins_txt"
         android:layout_marginTop="@dimen/dp_4"
         android:textColor="@color/color_999999"
         android:textSize="14sp" />
@@ -316,14 +316,16 @@
 
     <TextView
         android:id="@+id/tv_login"
-        android:layout_width="180dp"
+        android:layout_width="match_parent"
+        android:layout_marginStart="@dimen/dp_30"
+        android:layout_marginEnd="@dimen/dp_30"
         android:layout_height="48dp"
         android:layout_gravity="center_horizontal"
-        android:layout_marginTop="15dp"
+        android:layout_marginTop="20dp"
         android:background="@drawable/logout_btn_z_88"
         android:clickable="true"
         android:gravity="center"
-        android:text="@string/send_in_redenvelope_txt1"
+        android:text="@string/send_in_lipinjifen_txt1"
         android:textColor="@color/white"
         android:textSize="18sp" />
 

app/src/main/res/layout/fragment_chatconversation.xml

@@ -18,6 +18,191 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:orientation="vertical">
+                <!-- 世界聊天窗口-->
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/layout_chatall"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:visibility="gone">
+
+
+                    <com.netease.yunxin.kit.common.ui.widgets.ContactAvatarView
+                        android:id="@+id/avatarView"
+                        android:layout_width="@dimen/dimen_45_dp"
+                        android:layout_height="@dimen/dimen_45_dp"
+                        android:layout_marginStart="@dimen/fun_conversation_margin_15dp"
+                        android:layout_marginTop="15dp"
+                        app:avatarCorner="@dimen/dimen_45_dp"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:id="@+id/contentLayout"
+                        android:layout_width="0dp"
+                        android:layout_height="@dimen/dimen_45_dp"
+                        android:layout_marginVertical="15dp"
+                        android:layout_marginStart="@dimen/fun_conversation_margin_15dp"
+                        android:layout_marginEnd="@dimen/fun_conversation_margin_15dp"
+                        app:layout_constraintLeft_toRightOf="@+id/avatarView"
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintTop_toTopOf="parent">
+
+                        <LinearLayout
+                            android:id="@+id/ll_name"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:orientation="horizontal"
+                            app:layout_constraintLeft_toLeftOf="parent"
+                            app:layout_constraintTop_toTopOf="parent">
+
+                            <TextView
+                                android:id="@+id/nameTv"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:ellipsize="middle"
+                                android:maxWidth="@dimen/dimen_120_dp"
+                                android:singleLine="true"
+                                android:text="@string/str_chat_all"
+                                android:textColor="@color/fun_conversation_item_title_text_color"
+                                android:textSize="@dimen/text_size_16" />
+                        </LinearLayout>
+
+
+                        <!--            <TextView-->
+                        <!--                android:id="@+id/groupNumber"-->
+                        <!--                android:layout_width="0dp"-->
+                        <!--                android:layout_height="wrap_content"-->
+                        <!--                android:layout_marginStart="@dimen/dimen_5_dp"-->
+                        <!--                android:layout_marginEnd="@dimen/dimen_16_dp"-->
+                        <!--                android:textColor="@color/fun_conversation_item_title_text_color"-->
+                        <!--                android:textSize="@dimen/text_size_16"-->
+                        <!--                android:textStyle="bold"-->
+                        <!--                android:visibility="visible"-->
+                        <!--                app:layout_constraintLeft_toRightOf="@+id/muteIv"-->
+                        <!--                app:layout_constraintRight_toLeftOf="@+id/timeTv"-->
+                        <!--                app:layout_constraintTop_toTopOf="parent" />-->
+
+                        <LinearLayout
+                            android:id="@+id/messageLayout"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginRight="@dimen/dimen_7_dp"
+                            android:orientation="horizontal"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintLeft_toLeftOf="parent"
+                            app:layout_constraintRight_toLeftOf="@+id/unreadTv">
+
+                            <TextView
+                                android:id="@+id/aitTv"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginEnd="@dimen/dimen_4_dp"
+                                android:ellipsize="end"
+                                android:maxLines="1"
+                                android:text="@string/conversation_ait_tip"
+                                android:textColor="@color/color_ff4e54"
+                                android:textSize="@dimen/text_size_14"
+                                android:visibility="gone" />
+
+                            <TextView
+                                android:id="@+id/draftTv"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_vertical"
+                                android:layout_marginEnd="@dimen/dimen_4_dp"
+                                android:ellipsize="end"
+                                android:maxLines="1"
+                                android:text="@string/conversation_draft_tip"
+                                android:textColor="@color/color_ff4e54"
+                                android:textSize="@dimen/text_size_14"
+                                android:visibility="gone" />
+
+                            <TextView
+                                android:id="@+id/draftTvContent"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_vertical"
+                                android:ellipsize="end"
+                                android:maxLines="1"
+                                android:textSize="@dimen/text_size_14"
+                                android:visibility="gone" />
+
+                            <TextView
+                                android:id="@+id/messageTv"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:ellipsize="end"
+                                android:maxLines="1"
+                                android:textSize="@dimen/text_size_14" />
+                        </LinearLayout>
+
+                        <TextView
+                            android:id="@+id/timeTv"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="end"
+                            android:ellipsize="end"
+                            android:maxWidth="@dimen/dimen_100_dp"
+                            android:maxLines="1"
+                            android:textColor="@color/fun_conversation_item_time_text_color"
+                            android:textSize="@dimen/text_size_12"
+                            app:layout_constraintBottom_toBottomOf="@+id/ll_name"
+                            app:layout_constraintRight_toRightOf="parent"
+                            app:layout_constraintTop_toTopOf="@+id/ll_name" />
+
+
+                        <ImageView
+                            android:id="@+id/muteIv"
+                            android:layout_width="wrap_content"
+                            android:layout_height="0dp"
+                            android:layout_marginLeft="@dimen/dimen_5_dp"
+                            android:src="@drawable/fun_ic_conversation_mute"
+                            android:visibility="gone"
+                            app:layout_constraintBottom_toBottomOf="@+id/ll_name"
+                            app:layout_constraintLeft_toRightOf="@+id/ll_name"
+                            app:layout_constraintTop_toTopOf="@+id/ll_name" />
+
+                        <TextView
+                            android:id="@+id/tv_myteamtype"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="@dimen/dimen_5_dp"
+                            android:layout_marginEnd="@dimen/dimen_10_dp"
+                            android:ellipsize="middle"
+                            android:maxWidth="@dimen/dimen_60_dp"
+                            android:paddingStart="@dimen/dimen_5_dp"
+                            android:paddingEnd="@dimen/dimen_5_dp"
+                            android:singleLine="true"
+                            android:textSize="@dimen/text_size_12"
+                            android:visibility="visible"
+                            app:layout_constraintBottom_toBottomOf="@+id/ll_name"
+                            app:layout_constraintLeft_toRightOf="@+id/muteIv"
+                            app:layout_constraintTop_toTopOf="@+id/ll_name" />
+
+                        <TextView
+                            android:id="@+id/unreadTv"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginEnd="@dimen/dimen_2_dp"
+                            android:background="@drawable/bg_conversation_red_dot"
+                            android:gravity="center"
+                            android:paddingStart="@dimen/dimen_5_dp"
+                            android:paddingEnd="@dimen/dimen_5_dp"
+                            android:textColor="@color/color_white"
+                            android:textSize="@dimen/text_size_12"
+                            android:visibility="gone"
+
+                            app:layout_constraintBottom_toBottomOf="@+id/messageLayout"
+                            app:layout_constraintRight_toRightOf="parent" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="0.5dp"
+                        android:background="#EDE3E3"
+                        app:layout_constraintBottom_toBottomOf="parent" />
+                </androidx.constraintlayout.widget.ConstraintLayout>
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/layout_mycreate"

app/src/main/res/layout/fragment_mine_new.xml

@@ -28,7 +28,7 @@
                     android:layout_width="0dp"
                     android:layout_height="0dp"
                     android:background="@mipmap/user_info_bg1"
-                    app:layout_constraintDimensionRatio="375:146"
+                    app:layout_constraintDimensionRatio="375:175"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -179,7 +179,7 @@
                     app:layout_constraintDimensionRatio="375:210"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintRight_toRightOf="parent"
-                    android:visibility="gone"
+                    android:visibility="visible"
                     app:layout_constraintTop_toTopOf="parent">
 
                     <LinearLayout
@@ -208,6 +208,7 @@
                                 android:layout_height="match_parent"
                                 android:layout_weight="1"
                                 android:gravity="center"
+                                android:visibility="gone"
                                 android:orientation="horizontal">
 
                                 <TextView
@@ -233,7 +234,6 @@
                                 android:layout_height="match_parent"
                                 android:layout_weight="1"
                                 android:gravity="center"
-
                                 android:orientation="horizontal">
 
                                 <TextView
@@ -291,6 +291,7 @@
                                 android:ellipsize="end"
                                 android:gravity="center"
                                 android:lines="1"
+                                android:visibility="gone"
                                 android:textColor="#FA6947"
                                 android:textStyle="bold"
                                 tools:text="8888" />

app/src/main/res/values-en/strings.xml

@@ -347,6 +347,7 @@
     <string name="nmhmylg_txt">You guys haven’t talked yet~</string>
     <string name="myltjl_txt">There is no chat record yet~</string>
     <string name="to_wallet_send_redpack_txt">Gold coin balance has been deposited, click to view></string>
+    <string name="to_wallet_send_redpack_txt1">Gift points balance has been credited, click to view></string>
     <string name="species_txt">Gold coins</string>
     <string name="silver_coins_txt">Silver coins</string>
     <string name="gift_redpacket_txt">Gift money</string>
@@ -360,6 +361,7 @@
     <string name="danwei_txt">pc</string>
     <string name="remarks_hit_txt">Congratulations on getting rich and good luck</string>
     <string name="send_in_redenvelope_txt1">Put Cash into the red envelope</string>
+    <string name="send_in_lipinjifen_txt1">Stuff gift points into the red envelope</string>
     <string name="send_in_redtype_txt1">Put gold coins into the red envelope</string>
     <string name="no_get_to_back_txt">If not collected within 24 hours, the red envelope amount will be returned</string>
     <string name="zhuanzhangobject_txt">Click to select give away object</string>
@@ -902,4 +904,5 @@
     <string name="str_qi">%d Issue</string>
     <string name="str_installment_tips">Including service fee NT$ %d</string>
     <string name="str_installment_toast">Please select the number of installments</string>
+    <string name="str_chat_all">Global Chat</string>
 </resources>

app/src/main/res/values-ja/strings.xml

@@ -344,6 +344,7 @@
     <string name="nmhmylg_txt">まだ話していませんね~</string>
     <string name="myltjl_txt">まだチャット記録がありません~</string>
     <string name="to_wallet_send_redpack_txt">金貨残高が入金されているので、をクリックして確認してください></string>
+    <string name="to_wallet_send_redpack_txt1">ギフトポイント残高が入金されました。クリックして確認></string>
     <string name="species_txt">金貨</string>
     <string name="silver_coins_txt">銀貨</string>
     <string name="gift_redpacket_txt">贈り物のお金</string>
@@ -357,6 +358,7 @@
     <string name="danwei_txt">パソコン</string>
     <string name="remarks_hit_txt">お金持ちになり、幸運を祈ります</string>
     <string name="send_in_redenvelope_txt1">赤い封筒に金貨を入れます</string>
+    <string name="send_in_lipinjifen_txt1">ギフトポイントを赤い封筒に詰める</string>
     <string name="send_in_redtype_txt1">赤い封筒に金貨を詰める</string>
     <string name="no_get_to_back_txt">未受領のお年玉は、24時間以内に返却されます</string>
     <string name="zhuanzhangobject_txt">クリックして転送オブジェクトを選択します</string>
@@ -900,4 +902,5 @@
     <string name="str_qi">%d期</string>
     <string name="str_installment_tips">サービス料込み NT$ %d</string>
     <string name="str_installment_toast">分割回数を選択してください</string>
+    <string name="str_chat_all">世界チャット</string>
 </resources>

app/src/main/res/values-zh-rTW/strings.xml

@@ -335,6 +335,7 @@
     <string name="nmhmylg_txt">你們還沒聊過喔~</string>
     <string name="myltjl_txt">還沒聊天記錄哦~</string>
     <string name="to_wallet_send_redpack_txt">已存入Cash餘額，點擊查看></string>
+    <string name="to_wallet_send_redpack_txt1">已存入禮品積分餘額，點擊查看></string>
     <string name="species_txt">Cash</string>
     <string name="jifen_txt">積分</string>
     <string name="silver_coins_txt">禮品積分</string>
@@ -349,6 +350,7 @@
     <string name="danwei_txt">個</string>
     <string name="remarks_hit_txt">恭喜發財，大吉大利</string>
     <string name="send_in_redenvelope_txt1">塞Cash進紅包</string>
+    <string name="send_in_lipinjifen_txt1">塞礼品积分进红包</string>
     <string name="send_in_redtype_txt1">塞金幣進紅包</string>
     <string name="no_get_to_back_txt">未領取的紅包，將於24小時候退回</string>
     <string name="zhuanzhangobject_txt">點選選擇贈送對象</string>
@@ -896,4 +898,5 @@
     <string name="str_qi">%d期</string>
     <string name="str_installment_tips">含服務費NT$ %d</string>
     <string name="str_installment_toast">請選擇分期數</string>
+    <string name="str_chat_all">世界聊天</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -342,6 +342,7 @@
     <string name="nmhmylg_txt">你们还没有聊过哦~</string>
     <string name="myltjl_txt">还没有聊天记录哦~</string>
     <string name="to_wallet_send_redpack_txt">已存入Cash余额，点击查看></string>
+    <string name="to_wallet_send_redpack_txt1">已存入礼品积分余额，點擊查看></string>
     <string name="species_txt">Cash</string>
     <string name="silver_coins_txt">礼品积分</string>
     <string name="gift_redpacket_txt">礼金</string>
@@ -355,6 +356,7 @@
     <string name="danwei_txt">个</string>
     <string name="remarks_hit_txt">恭喜发财，大吉大利</string>
     <string name="send_in_redenvelope_txt1">塞Cash进红包</string>
+    <string name="send_in_lipinjifen_txt1">塞禮品積分進紅包</string>
     <string name="send_in_redtype_txt1">塞金币进红包</string>
     <string name="no_get_to_back_txt">未领取的红包，将于24小时候退回</string>
     <string name="zhuanzhangobject_txt">点击选择赠送对象</string>
@@ -893,4 +895,5 @@
     <string name="str_qi">%d期</string>
     <string name="str_installment_tips">含服务费NT$ %d</string>
     <string name="str_installment_toast">请选择分期数</string>
+    <string name="str_chat_all">世界聊天</string>
 </resources>

chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/custom/RedPacketViewHolder.java

@@ -163,8 +163,8 @@ public class RedPacketViewHolder extends ChatBaseMessageViewHolder {
 
 
     private void getRedInfo(RedpacketBean1 data, RedpacketViewheadBinding binding, ChatMessageBean message, boolean isTopRed) {
-        Log.i("名片", "名片获取到的数据4：" + data.getGroupId());
+        Log.i("名片", "名片获取到的数据4：" + data.getGroupId()); //兼容ios
-        if (TextUtils.isEmpty(data.getGroupId())) {
+        if (TextUtils.isEmpty(data.getGroupId())||data.getGroupId().equals("(null)")) {
             Api.getInstance().redPacketInfo(data.getId() + "")
                     .subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread())

chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/fun/view/MessageBottomLayout.java

@@ -863,7 +863,7 @@ public class MessageBottomLayout extends FrameLayout
 
     public void morePanelShow(boolean show, long delay) {
         // init more panel
-        if (!mActionsPanel.hasInit() && show) {
+        if (!mActionsPanel.hasInit()) {
             mActionsPanel.init(
                     mBinding.actionsPanelVp,
                     FunBottomActionFactory.assembleInputMoreActions(mProxy.getSessionType(), mProxy.getSessionId()),

chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/fun/view/input/FunBottomActionFactory.java

@@ -57,19 +57,15 @@ public class FunBottomActionFactory {
 //                            R.drawable.ic_video_call,
 //                            R.string.chat_message_video_call));
 //        }
+        boolean isAdd = true;
         //聊天 赠送  红包  分享名片入口 黑名单用户 不需要这三个入口
         if (sessionType == SessionTypeEnum.P2P || sessionType == SessionTypeEnum.Team || sessionType == SessionTypeEnum.SUPER_TEAM) {
-            boolean isAdd = true;
+            if (sessionType == SessionTypeEnum.P2P && ContactRepo.isBlackList(sessionId)) {
-//            if(sessionType==SessionTypeEnum.P2P&& ContactRepo.isBlackList(sessionId)){
+                isAdd = false;
-//                isAdd = false;
+            }
-//            }
-//            if(isAdd) {
-//                actions.add(new ActionItem(ActionConstants.ACTION_TYPE_REP_PACKET, R.drawable.ic_action_red_packet, R.string.hongbao_txt));
-//            }
             if (isAdd) {
                 actions.add(new ActionItem(ActionConstants.ACTION_TYPE_MINGPIAN, R.drawable.ic_action_mingpian, R.string.mingpian_txt));
             }
-
         }
         actions.add(
                 new ActionItem(
@@ -78,15 +74,18 @@ public class FunBottomActionFactory {
                         R.string.chat_message_location));
         actions.add(new ActionItem(ActionConstants.ACTION_TYPE_ALBUMS, R.drawable.ic_action_share_albums, R.string.sharealbums_txt));
 
+        //礼品积分红包
+        actions.add(new ActionItem(ActionConstants.ACTION_TYPE_REP_PACKET, R.drawable.ic_action_red_packet, R.string.hongbao_txt));
+
         //赠送功能入口
-//        if (sessionType == SessionTypeEnum.P2P) {
+        if (sessionType == SessionTypeEnum.P2P) {
-//            if (getConfig(IMKitClient.getApplicationContext(), "transfer_jifen", false)) { //积分赠送
+            if (getConfig(IMKitClient.getApplicationContext(), "transfer_jifen", false)) { //积分赠送
-//                actions.add(new ActionItem(ActionConstants.ACTION_TYPE_TRANSFER, R.drawable.ic_action_tur, R.string.zhuanzhang_txtq));
+                actions.add(new ActionItem(ActionConstants.ACTION_TYPE_TRANSFER, R.drawable.ic_action_tur, R.string.zhuanzhang_txtq));
-//            }
+            }
 //            if (getConfig(IMKitClient.getApplicationContext(), "transfer_cash", false)) { //cash赠送
 //                actions.add(new ActionItem(ActionConstants.ACTION_TYPE_TRANSFER_CASH, R.drawable.ic_action_tur, R.string.zhuanzhang_cash_txtq));
 //            }
-//        }
+        }
 //        actions.add(
 //                new ActionItem(
 //                        ActionConstants.ACTION_TYPE_FILE, R.drawable.ic_send_file, R.string.chat_message_file));

chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/network/ApiService.java

@@ -49,12 +49,12 @@ public interface ApiService {
     /**
      * 正式环境
      */
-    String URL = "https://api.letschat2023.com/";
+    //String URL = "https://api.letschat2023.com/";
 
     /**
      * 测试环境
      */
-   // String URL = "https://api-test.letschat2023.com/";
+    String URL = "https://api-test.letschat2023.com/";
 
 
     String SUBSTATIONID = "1703655363476242434";

chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/normal/view/MessageBottomLayout.java

@@ -416,7 +416,7 @@ public class MessageBottomLayout extends FrameLayout
   }
 
   public void morePanelShow(boolean show, long delay) {
-    if (!mActionsPanel.hasInit() && show) {
+    if (!mActionsPanel.hasInit()) {
       mActionsPanel.init(
           mBinding.chatMessageActionsPanel,
           BottomActionFactory.assembleInputMoreActions(mProxy.getSessionType()),

chatkit-ui/src/main/res/layout/dialog_get_red_packet.xml

@@ -26,6 +26,8 @@
             android:layout_height="wrap_content"
             android:layout_centerHorizontal="true"
             android:layout_marginTop="70dp"
+            android:layout_marginStart="@dimen/dimen_15_dp"
+            android:layout_marginEnd="@dimen/dimen_15_dp"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 

chatkit-ui/src/main/res/layout/redpacket_viewhead.xml

@@ -5,16 +5,16 @@
     <LinearLayout
         android:id="@+id/big_ly"
         android:layout_width="218dp"
-        android:layout_height="102dp"
+        android:layout_height="@dimen/dimen_92_dp"
         android:background="@drawable/hongbnao_f_g"
         android:orientation="vertical">
 
         <LinearLayout
             android:id="@+id/layout_hongbao"
             android:layout_width="match_parent"
-            android:layout_height="70dp"
+            android:layout_height="60dp"
-            android:visibility="visible"
+            android:orientation="vertical"
-            android:orientation="vertical">
+            android:visibility="visible">
 
             <TextView
                 android:id="@+id/item_title_tv"
@@ -47,8 +47,8 @@
         <LinearLayout
             android:id="@+id/layout_lijin"
             android:layout_width="match_parent"
-            android:visibility="gone"
+            android:layout_height="wrap_content"
-            android:layout_height="wrap_content">
+            android:visibility="gone">
 
             <TextView
                 android:layout_width="match_parent"
@@ -64,12 +64,12 @@
         <TextView
             android:id="@+id/mingpian_tv"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/dimen_24_dp"
+            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/dimen_10_dp"
+            android:layout_marginStart="@dimen/dimen_15_dp"
-            android:layout_weight="1"
+            android:layout_marginTop="@dimen/dimen_12_dp"
             android:gravity="center_vertical"
             android:textColor="#ffffffff"
-            android:textSize="10sp" />
+            android:textSize="@dimen/text_size_12" />
 
         <TextView
             android:id="@+id/tv_lijinstatus"
@@ -78,8 +78,7 @@
             android:layout_marginTop="@dimen/dimen_12_dp"
             android:gravity="center"
             android:textColor="#ffffffff"
-            android:textSize="@dimen/text_size_12"
+            android:textSize="@dimen/text_size_12" />
-            />
     </LinearLayout>
 
 </merge>

chatkit-ui/src/main/res/values-en/strings.xml

@@ -216,7 +216,7 @@
     <string name="chat_input_more_album_title">Album</string>
     <string name="chat_input_audio_record_title">Hold to Talk</string>
     <string name="zidingyi_txt">Custom</string>
-    <string name="hongbao_txt">Red envelope</string>
+    <string name="hongbao_txt">Points Bonus</string>
     <string name="zhuanzhang_txtq">Points Give away</string>
     <string name="zhuanzhang_cash_txtq">Cash Give away</string>
     <string name="mingpian_txt">Business card</string>
@@ -255,8 +255,8 @@
     <string name="received_txt2">has been received</string>
     <string name="yituihuan_txt1">has been returned</string>
     <string name="yiguoqi_txt1">expired</string>
-    <string name="hongbao_des_txt">Taomenggou Cash red envelope</string>
+    <string name="hongbao_des_txt">MM Cash red envelope</string>
-    <string name="hongbao_des_txt1">Taomenggou Silver Coin Red Packet</string>
+    <string name="hongbao_des_txt1">MM Gift Points Red Envelope</string>
     <string name="hongbao_chat_txt">[红包]</string>
     <string name="dailinqu_txt1">To be collected</string>
     <string name="look_get_info_red_txt">View collection details</string>
@@ -265,8 +265,8 @@
     <string name="redexpired_txt">Red envelopes cannot be collected if they are over 24 hours old</string>
     <string name="s_font_color_fc605c_font_txt"><![CDATA[%s received your <font color = \'#FC605C\'>Cash red envelope</font>]]></string>
     <string name="s_font_color_fc605c_font_txt1"><![CDATA[You received %s <font color = \'#FC605C\'>Cash red envelope</font>]]></string>
-    <string name="s_font_color_629cff_font_txt"><![CDATA[%s received your <font color = \'#629CFF\'>silver coin red envelope</font>]]></string>
+    <string name="s_font_color_629cff_font_txt"><![CDATA[%s received your <font color = \'#629CFF\'>Gift Points Red Envelope</font>]]></string>
-    <string name="s_font_color_629cff_font_txt1"><![CDATA[You received %s <font color = \'#629CFF\'>silver coin red envelope</font>]]></string>
+    <string name="s_font_color_629cff_font_txt1"><![CDATA[You received %s <font color = \'#629CFF\'>Gift Points Red Envelope</font>]]></string>
     <string name="s_font_color_gift_font_txt"><![CDATA[%s received your <font color = \'#FC605C\'>Gift Money Red Envelope</font>]]></string>
     <string name="s_font_color_gift_font_txt1"><![CDATA[You received %s <font color = \'#FC605C\'>Gift Money Red Envelope</font>]]></string>
     <string name="ni_txt">You</string>

chatkit-ui/src/main/res/values-ja/strings.xml

@@ -216,7 +216,7 @@
     <string name="chat_input_more_album_title">アルバム</string>
     <string name="chat_input_audio_record_title">長押しして話す</string>
     <string name="zidingyi_txt">カスタマイズ済み</string>
-    <string name="hongbao_txt">赤い封筒</string>
+    <string name="hongbao_txt">ポイントボーナス</string>
     <string name="zhuanzhang_txtq">ポイント贈与</string>
     <string name="zhuanzhang_cash_txtq">Cash転送</string>
     <string name="mingpian_txt">名刺</string>
@@ -256,8 +256,8 @@
     <string name="received_txt2">受信しました</string>
     <string name="yituihuan_txt1">返品されました</string>
     <string name="yiguoqi_txt1">期限切れ</string>
-    <string name="hongbao_des_txt">桃蒙溝Cashの赤い封筒</string>
+    <string name="hongbao_des_txt">MM Cashの赤い封筒</string>
-    <string name="hongbao_des_txt1">桃蒙溝銀貨赤パケット</string>
+    <string name="hongbao_des_txt1">MMギフトポイントの赤い封筒</string>
     <string name="hongbao_chat_txt">[红包]</string>
     <string name="dailinqu_txt1">収集対象</string>
     <string name="look_get_info_red_txt">コレクションの詳細を表示</string>
@@ -266,7 +266,7 @@
     <string name="redexpired_txt">赤い封筒は24時間以上経過したものは回収できません</string>
     <string name="s_font_color_fc605c_font_txt"><![CDATA[%s が<font color = \'#FC605C\'>Cash赤い封筒</font>を受け取りました]]></string>
     <string name="s_font_color_fc605c_font_txt1"><![CDATA[あなたは %s の<font color = \'#FC605C\'>Cash赤い封筒</font>を受け取りました]]></string>
-    <string name="s_font_color_629cff_font_txt"><![CDATA[%s が<font color = \'#629CFF\'>銀貨の赤い封筒</font>を受け取りました]]></string>
+    <string name="s_font_color_629cff_font_txt"><![CDATA[%s が<font color = \'#629CFF\'>ギフトポイントの赤い封筒</font>を受け取りました]]></string>
     <string name="s_font_color_629cff_font_txt1"><![CDATA[あなたは %s の<font color = \'#629CFF\'>銀貨の赤い封筒</font>を受け取りました]]></string>
     <string name="s_font_color_gift_font_txt"><![CDATA[%s が<font color = \'#FC605C\'>お祝いのお金入り封筒</font>]]></string>
     <string name="s_font_color_gift_font_txt1"><![CDATA[あなたは %s の<font color = \'#FC605C\'>お祝いのお金入り封筒</font>]]></string>

chatkit-ui/src/main/res/values-zh/strings.xml

@@ -215,7 +215,7 @@
     <string name="chat_input_more_album_title">相册</string>
     <string name="chat_input_audio_record_title">按住 说话</string>
     <string name="zidingyi_txt">自定义</string>
-    <string name="hongbao_txt">红包</string>
+    <string name="hongbao_txt">积分红包</string>
     <string name="zhuanzhang_txtq">积分赠送</string>
     <string name="zhuanzhang_cash_txtq">Cash 赠送</string>
     <string name="mingpian_txt">名片</string>
@@ -256,7 +256,7 @@
     <string name="yituihuan_txt1">已退还</string>
     <string name="yiguoqi_txt1">已过期</string>
     <string name="hongbao_des_txt">MM Cash红包</string>
-    <string name="hongbao_des_txt1">MM 银币红包</string>
+    <string name="hongbao_des_txt1">MM 礼品积分红包</string>
     <string name="hongbao_chat_txt">[红包]</string>
     <string name="dailinqu_txt1">待领取</string>
     <string name="look_get_info_red_txt">查看领取详情</string>
@@ -265,8 +265,8 @@
     <string name="redexpired_txt">红包超过24小时，无法领取</string>
     <string name="s_font_color_fc605c_font_txt"><![CDATA[%s领取了你的<font color = \'#FC605C\'>Cash红包</font>]]></string>
     <string name="s_font_color_fc605c_font_txt1"><![CDATA[你领取了%s的<font color = \'#FC605C\'>Cash红包</font>]]></string>
-    <string name="s_font_color_629cff_font_txt"><![CDATA[%s领取了你的<font color = \'#629CFF\'>银币红包</font>]]></string>
+    <string name="s_font_color_629cff_font_txt"><![CDATA[%s领取了你的<font color = \'#629CFF\'>礼品积分红包</font>]]></string>
-    <string name="s_font_color_629cff_font_txt1"><![CDATA[你领取了%s的<font color = \'#629CFF\'>银币红包</font>]]></string>
+    <string name="s_font_color_629cff_font_txt1"><![CDATA[你领取了%s的<font color = \'#629CFF\'>礼品积分红包</font>]]></string>
     <string name="s_font_color_gift_font_txt"><![CDATA[%s领取了你的<font color = \'#FC605C\'>礼金红包</font>]]></string>
     <string name="s_font_color_gift_font_txt1"><![CDATA[你领取了%s的<font color = \'#FC605C\'>礼金红包</font>]]></string>
     <string name="ni_txt">你</string>

chatkit-ui/src/main/res/values/strings.xml

@@ -215,7 +215,7 @@
     <string name="chat_input_more_album_title">相簿</string>
     <string name="chat_input_audio_record_title">按住 說話</string>
     <string name="zidingyi_txt">自訂</string>
-    <string name="hongbao_txt">紅包</string>
+    <string name="hongbao_txt">積分紅包</string>
     <string name="zhuanzhang_txtq">積分贈送</string>
     <string name="zhuanzhang_cash_txtq">Cash贈送</string>
     <string name="mingpian_txt">名片</string>
@@ -256,7 +256,7 @@
     <string name="yituihuan_txt1">已退還</string>
     <string name="yiguoqi_txt1">已過期</string>
     <string name="hongbao_des_txt">MM Cash紅包</string>
-    <string name="hongbao_des_txt1">MM 銀幣紅包</string>
+    <string name="hongbao_des_txt1">MM 禮品積分紅包</string>
     <string name="hongbao_chat_txt">[紅包]</string>
     <string name="dailinqu_txt1">待領取</string>
     <string name="look_get_info_red_txt">查看領取詳情</string>
@@ -265,8 +265,8 @@
     <string name="redexpired_txt">紅包超過24小時，無法領取</string>
     <string name="s_font_color_fc605c_font_txt"><![CDATA[%s領取了你的<font color = \'#FC605C\'>Cash紅包</font>]]></string>
     <string name="s_font_color_fc605c_font_txt1"><![CDATA[你領取%s的<font color = \'#FC605C\'>Cash紅包</font>]]></string>
-    <string name="s_font_color_629cff_font_txt"><![CDATA[%s領取了你的<font color = \'#629CFF\'>銀幣紅包</font>]]></string>
+    <string name="s_font_color_629cff_font_txt"><![CDATA[%s領取了你的<font color = \'#629CFF\'>禮品積分紅包</font>]]></string>
-    <string name="s_font_color_629cff_font_txt1"><![CDATA[你領取了%s的<font color = \'#629CFF\'>銀幣紅包</font>]]></string>
+    <string name="s_font_color_629cff_font_txt1"><![CDATA[你領取了%s的<font color = \'#629CFF\'>禮品積分紅包</font>]]></string>
     <string name="s_font_color_gift_font_txt"><![CDATA[%s領取了你的<font color = \'#FC605C\'>禮金紅包</font>]]></string>
     <string name="s_font_color_gift_font_txt1"><![CDATA[你領取%s的<font color = \'#FC605C\'>禮金紅包</font>]]></string>
     <string name="ni_txt">你</string>