第一次提交

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

@@ -42,7 +42,7 @@ public class ChatKitUIConstant {
     /**
      * 订单详情
      */
-    public static String ORDERDETAILS_URL = ApiService.URL.equals("https://api.letschat2023.com/") ? "https://shop.letschat2023.com/#/pages/payother/order?" : "https://shop-test.bijr3t.com/#/pages/payother/order?";
+    public static String ORDERDETAILS_URL = ApiService.URL.equals("https://api.letschat2023.com/") ? "https://shop.letschat2023.com/#/pages/payother/order?" : "https://shop-test.yuliao666.top/#/pages/payother/order?";
 
 
     // 合并转发消息数量限制

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

@@ -68,14 +68,14 @@ public class ChatBusinessViewHolder extends FunChatBaseMessageViewHolder {
         Log.i("名片", "名片获取到的数据0：" + GsonUtils.beanToJSONString(circleShareBean));
         if (message.getMessageData().getMessage().getFromAccount().equals(IMKitClient.account())) {
             binding.bigLy.setBackgroundResource(R.drawable.fun_message_send_bg);
-            binding.userNameTv.setTextColor(binding.bigLy.getResources().getColor(R.color.color_white));
-            binding.mingpianTv.setTextColor(binding.bigLy.getResources().getColor(R.color.color_white));
-            binding.lineV.setBackgroundColor(binding.bigLy.getResources().getColor(R.color.color_a278b9));
+//            binding.userNameTv.setTextColor(binding.bigLy.getResources().getColor(R.color.color_white));
+//            binding.mingpianTv.setTextColor(binding.bigLy.getResources().getColor(R.color.color_white));
+//            binding.lineV.setBackgroundColor(binding.bigLy.getResources().getColor(R.color.color_a278b9));
         } else {
             binding.bigLy.setBackgroundResource(R.drawable.fun_message_receive_bg);
-            binding.userNameTv.setTextColor(binding.bigLy.getResources().getColor(R.color.color_333333));
-            binding.mingpianTv.setTextColor(binding.bigLy.getResources().getColor(R.color.color_333333));
-            binding.lineV.setBackgroundColor(binding.bigLy.getResources().getColor(R.color.color_d8d8d8));
+//            binding.userNameTv.setTextColor(binding.bigLy.getResources().getColor(R.color.color_333333));
+//            binding.mingpianTv.setTextColor(binding.bigLy.getResources().getColor(R.color.color_333333));
+//            binding.lineV.setBackgroundColor(binding.bigLy.getResources().getColor(R.color.color_d8d8d8));
         }
         if (circleShareBean != null) {
             try {

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

@@ -87,7 +87,7 @@ public class HelpPayViewHolder extends FunChatBaseMessageViewHolder {
         Intent intent = new Intent();
         intent.putExtra("url", ChatKitUIConstant.ORDERDETAILS_URL+"payUid="+IMKitClient.account()+"&orderid="+orderId+"&payHeadImg="+IMKitClient.getUserInfo().getAvatar());
         intent.putExtra("isGame", true);
-        intent.setClassName(context, "com.hbl.lewan.game.JsBridgeActivity");
+        intent.setClassName(context, "com.hbl.yuliao.game.JsBridgeActivity");
         context.startActivity(intent);
     }
 

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

@@ -72,7 +72,7 @@ public class InviteGroupViewHolder extends FunChatBaseMessageViewHolder {
     private void startDetails(String teamId, Context context) {
         Intent intent = new Intent();
         intent.putExtra("teamId", teamId);
-        intent.setClassName(context, "com.hbl.lewan.imkit.team.TeamInvitedJoinActivity");
+        intent.setClassName(context, "com.hbl.yuliao.imkit.team.TeamInvitedJoinActivity");
         context.startActivity(intent);
     }
 

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

@@ -97,6 +97,8 @@ public class RedPacketViewHolder extends ChatBaseMessageViewHolder {
             } else {
                 binding.itemTitleTv.setText(circleShareBean.data.getRemark());
             }
+            binding.tvLijinstatus.setText(""+circleShareBean.data.getSendTime());
+//            sendTime
 
             if (Integer.parseInt(circleShareBean.data.getStatus()) > 0) {
                 ChatDataUtils.set(binding.bigLy.getContext(), "redpack_" + circleShareBean.data.getId(), Integer.parseInt(circleShareBean.data.getStatus()));
@@ -184,7 +186,7 @@ public class RedPacketViewHolder extends ChatBaseMessageViewHolder {
             @Override
             public void toSumbit() {
                 Intent intent = new Intent();
-                intent.setClassName(context, "com.hbl.lewan.main.mine.ChangeAccoutActionActivity");
+                intent.setClassName(context, "com.hbl.yuliao.main.mine.ChangeAccoutActionActivity");
                 intent.putExtra("type", 1);
                 context.startActivity(intent);
             }
@@ -321,7 +323,7 @@ public class RedPacketViewHolder extends ChatBaseMessageViewHolder {
         }
         if (groupBean.getStatus() > 0) {
             Intent intent = new Intent();
-            intent.setClassName(binding.bigLy.getContext(), "com.hbl.lewan.redpack.ReceiveRedPacketActivity");
+            intent.setClassName(binding.bigLy.getContext(), "com.hbl.yuliao.redpack.ReceiveRedPacketActivity");
             intent.putExtra("bean", groupBean);
             intent.putExtra("isGroup", true);
             intent.putExtra("name", groupBean.getSenderNickname() + "");
@@ -335,7 +337,7 @@ public class RedPacketViewHolder extends ChatBaseMessageViewHolder {
                     if ((groupBean.getGrabbers().get(i).getGrabberUid() + "").equals(IMKitClient.account())) {
                         isAt = true;
                         Intent intent = new Intent();
-                        intent.setClassName(binding.bigLy.getContext(), "com.hbl.lewan.redpack.ReceiveRedPacketActivity");
+                        intent.setClassName(binding.bigLy.getContext(), "com.hbl.yuliao.redpack.ReceiveRedPacketActivity");
                         intent.putExtra("bean", groupBean);
                         intent.putExtra("isGroup", true);
                         intent.putExtra("name", groupBean.getSenderNickname() + "");
@@ -359,13 +361,16 @@ public class RedPacketViewHolder extends ChatBaseMessageViewHolder {
     private void toTiaozhuan(RedpacketBean data, ChatMessageBean message) {
         isTiaoZhuan = false;
         if (data.getStatus() == 2 && !(String.valueOf(data.getSenderUid()).equals(IMKitClient.account()))) {  //不是自己发的已过期红包
-            RedPacketDialog redPacketDialog = new RedPacketDialog(binding.bigLy.getContext(), message, data, false, null, true);
+            if(redPacketDialog!=null&&redPacketDialog.isShowing()){
+                return;
+            }
+            redPacketDialog = new RedPacketDialog(binding.bigLy.getContext(), message, data, false, null, true);
             redPacketDialog.show();
             return;
         }
         if (data.getStatus() > 0 || ((data.getSenderUid() + "").equals(IMKitClient.account()))) {
             Intent intent = new Intent();
-            intent.setClassName(binding.bigLy.getContext(), "com.hbl.lewan.redpack.ReceiveRedPacketActivity");
+            intent.setClassName(binding.bigLy.getContext(), "com.hbl.yuliao.redpack.ReceiveRedPacketActivity");
             intent.putExtra("bean", data);
             intent.putExtra("isGroup", false);
             intent.putExtra("name", message.getMessageData().getMessage().getFromNick());
@@ -373,11 +378,14 @@ public class RedPacketViewHolder extends ChatBaseMessageViewHolder {
             intent.putExtra("fileName", getUpHeadIconForGetView(message.getMessageData().getMessage().getFromAccount()));
             binding.bigLy.getContext().startActivity(intent);
         } else {
-            RedPacketDialog redPacketDialog = new RedPacketDialog(binding.bigLy.getContext(), message, data, false, null);
+            if(redPacketDialog!=null&&redPacketDialog.isShowing()){
+                return;
+            }
+            redPacketDialog = new RedPacketDialog(binding.bigLy.getContext(), message, data, false, null);
             redPacketDialog.show();
         }
     }
-
+    RedPacketDialog redPacketDialog;
 
     private void changeInfo(RedpacketBean1 data, RedpacketViewheadBinding binding, ChatMessageBean message, RedpacketBean redpacketBean, RedpacketGroupBean redpacketGroupBean) {
         LogUtils.i("红包类型", "名片获取到的数据红包类型：" + data.getCoinType());
@@ -545,22 +553,22 @@ public class RedPacketViewHolder extends ChatBaseMessageViewHolder {
             numberString = "0";
         }
         long number = Long.valueOf(numberString);
-        if (number % 100 == 0) {
-            long numbers = number/100;
-            DecimalFormat decimalFormat = new DecimalFormat("#,###,###");
-            String formattedNumber = decimalFormat.format(numbers);
-            return String.format("%s", formattedNumber);
-        } else if (number % 10 == 0) {
-            float numbers = number/100f;
-            DecimalFormat decimalFormat = new DecimalFormat("#,###,##0.0");
-            String formattedNumber = decimalFormat.format(numbers);
-            return String.format("%s", formattedNumber);
-        } else {
+//        if (number % 100 == 0) {
+//            long numbers = number/100;
+//            DecimalFormat decimalFormat = new DecimalFormat("#,###,###");
+//            String formattedNumber = decimalFormat.format(numbers);
+//            return String.format("%s", formattedNumber);
+//        } else if (number % 10 == 0) {
+//            float numbers = number/100f;
+//            DecimalFormat decimalFormat = new DecimalFormat("#,###,##0.0");
+//            String formattedNumber = decimalFormat.format(numbers);
+//            return String.format("%s", formattedNumber);
+//        } else {
             float numbers = number/100f;
             DecimalFormat decimalFormat = new DecimalFormat("#,###,##0.00");
             String formattedNumber = decimalFormat.format(numbers);
             return String.format("%s", formattedNumber);
-        }
+//        }
     }
 
     /**

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

@@ -141,7 +141,7 @@ public class TransferViewHolder extends ChatBaseMessageViewHolder {
                 }
             }
             Intent intent = new Intent();
-            intent.setClassName(binding.bigLy.getContext(), "com.hbl.lewan.redpack.TransferInfoActivity");
+            intent.setClassName(binding.bigLy.getContext(), "com.hbl.yuliao.redpack.TransferInfoActivity");
             //Long id, Integer status, Integer amount, Integer senderUid, Integer receiverUid, String sendTime, String receiveTime, String remark, Integer coinType
             TransferBean transferBean = new TransferBean(Long.parseLong(circleShareBean.data.getId()), Integer.parseInt(circleShareBean.data.getStatus()), Integer.parseInt(circleShareBean.data.getAmount()),
                     Integer.parseInt(circleShareBean.data.getSenderUid()), Integer.parseInt(circleShareBean.data.getReceiverUid()), circleShareBean.data.getSendTime(), circleShareBean.data.getReceiveTime(), circleShareBean.data.getRemark(),
@@ -256,7 +256,7 @@ public class TransferViewHolder extends ChatBaseMessageViewHolder {
             @Override
             public void toSumbit() {
                 Intent intent = new Intent();
-                intent.setClassName(context, "com.hbl.lewan.main.mine.ChangeAccoutActionActivity");
+                intent.setClassName(context, "com.hbl.yuliao.main.mine.ChangeAccoutActionActivity");
                 intent.putExtra("type", 1);
                 context.startActivity(intent);
             }

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

@@ -84,7 +84,7 @@ public class UserAlbumsViewHolder extends FunChatBaseMessageViewHolder {
 
     private void startDetails(int id, String password, String userId, Context context) {
         Intent intent = new Intent();
-        intent.setClassName(context, "com.hbl.lewan.main.mine.photo.UserPhotoDetailsActivity");
+        intent.setClassName(context, "com.hbl.yuliao.main.mine.photo.UserPhotoDetailsActivity");
         intent.putExtra("albumId", id);
 //        intent.putExtra("password", password);
         intent.putExtra("userId", userId);

chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/dialog/RedPacketDialog.java

@@ -44,8 +44,10 @@ import com.netease.yunxin.kit.chatkit.ui.network.Api;
 import com.netease.yunxin.kit.chatkit.ui.network.ApiService;
 import com.netease.yunxin.kit.chatkit.ui.network.BaseObserver;
 import com.netease.yunxin.kit.chatkit.ui.network.Result;
+import com.netease.yunxin.kit.common.ui.utils.ToastX;
 import com.netease.yunxin.kit.common.ui.widgets.ContactAvatarView;
 import com.netease.yunxin.kit.corekit.im.IMKitClient;
+import com.netease.yunxin.kit.corekit.im.model.UserInfo;
 import com.netease.yunxin.kit.corekit.im.provider.FetchCallback;
 
 import java.util.ArrayList;
@@ -88,6 +90,8 @@ public class RedPacketDialog extends Dialog {
     String endString = "";
     boolean isExp = false;
     ChatMessageBean message;
+    UserInfo messageUserInfo;
+
     private RelativeLayout bigRedBg;
     AnimationDrawable lAnimationDrawable;
 
@@ -116,6 +120,14 @@ public class RedPacketDialog extends Dialog {
         this.message = message;
     }
 
+    public RedPacketDialog(Context context, UserInfo message, RedpacketGroupBean tipsMessageBean, boolean isGroup, String groupId) {
+        super(context, R.style.MaterialDesignDialog1);
+        this.redpacketGroupBean = tipsMessageBean;
+        this.isGroup = isGroup;
+        this.groupId = groupId;
+        this.messageUserInfo = message;
+    }
+
     public RedPacketDialog(Context context, ChatMessageBean message, RedpacketGroupBean tipsMessageBean, boolean isGroup, String groupId, boolean isexp) {
         super(context, R.style.MaterialDesignDialog1);
         this.redpacketGroupBean = tipsMessageBean;
@@ -176,11 +188,20 @@ public class RedPacketDialog extends Dialog {
         changeTextColor();
 //        if(!isGroup){
         boolean isBigRedVisible = bigRedBg.getVisibility() == View.VISIBLE;
-        setupHeadIconForGetView(message, isBigRedVisible ? titleIv : titleIvGift);
+        if(messageUserInfo!=null) {
+            setupHeadIconForGetView(messageUserInfo, isBigRedVisible ? titleIv : titleIvGift);
+        }else{
+            setupHeadIconForGetView(message, isBigRedVisible ? titleIv : titleIvGift);
+
+        }
 
 //            titleTv.setText(message.getSenderDisplayName()+.getString(R.string.fachudehongbao_txt));
         if (isBigRedVisible) {
-            titleTv.setText(String.format(getContext().getString(R.string.fachudehongbao_txt), message.getMessageData().getMessage().getFromNick()));
+            if(messageUserInfo!=null){
+                titleTv.setText(String.format(getContext().getString(R.string.fachudehongbao_txt), messageUserInfo.getName()));
+            }else{
+                titleTv.setText(String.format(getContext().getString(R.string.fachudehongbao_txt), message.getMessageData().getMessage().getFromNick()));
+            }
         } else {
             titleTvGift.setText(String.format(getContext().getString(R.string.fachudehongbao_txt), message.getMessageData().getMessage().getFromNick()));
         }
@@ -284,7 +305,7 @@ public class RedPacketDialog extends Dialog {
             dismiss();
 
             Intent intent = new Intent();
-            intent.setClassName(getContext(), "com.hbl.lewan.redpack.ReceiveRedPacketActivity");
+            intent.setClassName(getContext(), "com.hbl.yuliao.redpack.ReceiveRedPacketActivity");
             intent.putExtra("bean", tuiMessageBean);
             intent.putExtra("isGroup", false);
             intent.putExtra("name", message.getMessageData().getMessage().getFromNick());
@@ -298,12 +319,19 @@ public class RedPacketDialog extends Dialog {
 
 //                ARouter.getInstance().build("/chat/receive_red_packet").withSerializable("bean", bean).withBoolean("isGroup", tuiMessageBean.isGroup()).withString("groupId", groupId).navigation();
             Intent intent = new Intent();
-            intent.setClassName(getContext(), "com.hbl.lewan.redpack.ReceiveRedPacketActivity");
+            intent.setClassName(getContext(), "com.hbl.yuliao.redpack.ReceiveRedPacketActivity");
             intent.putExtra("bean", redpacketGroupBean);
             intent.putExtra("isGroup", true);
-            intent.putExtra("name", message.getMessageData().getMessage().getFromNick());
-            intent.putExtra("uid", message.getMessageData().getMessage().getFromAccount());
-            intent.putExtra("fileName", getUpHeadIconForGetView(message.getMessageData().getMessage().getFromAccount()));
+            if(messageUserInfo!=null){
+                intent.putExtra("name", messageUserInfo.getName());
+                intent.putExtra("uid", messageUserInfo .getAccount());
+                intent.putExtra("fileName", getUpHeadIconForGetView(messageUserInfo .getAccount()));
+            }else{
+                intent.putExtra("name", message.getMessageData().getMessage().getFromNick());
+                intent.putExtra("uid", message.getMessageData().getMessage().getFromAccount());
+                intent.putExtra("fileName", getUpHeadIconForGetView(message.getMessageData().getMessage().getFromAccount()));
+            }
+
             getContext().startActivity(intent);
 
         }
@@ -440,13 +468,20 @@ public class RedPacketDialog extends Dialog {
                     @Override
                     public void onSuccess(Result<RedpacketGroupBean> feedbackResp) {
                         onGrabRedPacketSuccess(feedbackResp);
-
+                        if(messageUserInfo!=null&&onNextCallListener!=null){
+                            onNextCallListener.openRedPacketGroup(redpacketGroupBean);
+                        }
                     }
 
                     @Override
                     public void onError(int code, String msg) {
-                        onGrabRedPacketFaile(id, msg);
 
+                        if(code == 40102){
+                            showToShiMing(msg);
+                        }else {
+                            onGrabRedPacketFaile(id, msg);
+
+                        }
                     }
                 });
     }
@@ -530,6 +565,27 @@ public class RedPacketDialog extends Dialog {
 
     }
 
+    /**
+     * 设置消息头像的显示.
+     *
+     * @param entity
+     * @param viewHead
+     */
+    protected void setupHeadIconForGetView(UserInfo entity, ContactAvatarView viewHead) {
+        if (viewHead == null)
+            return;
+        NimUserInfo user = NIMClient.getService(UserService.class).getUserInfo(entity.getAccount());
+        if (user != null) {
+            if (TextUtils.isEmpty(user.getAvatar())) {
+                viewHead.setData(R.drawable.default_head_img, user.getName());
+                return;
+            }
+            viewHead.setData(
+                    user.getAvatar(), user.getName());
+        }
+
+    }
+
     /**
      * 设置消息头像的显示.
      *
@@ -579,17 +635,42 @@ public class RedPacketDialog extends Dialog {
 
                     @Override
                     public void onError(int code, String msg) {
-                        isSuccess = false;
-                        endString = msg;
 
-                        bonus_info(bonus_uuid);
-                        toNext();
+                        if(code == 40102){
+                            showToShiMing(msg);
+                        }else {
+                            isSuccess = false;
+                            endString = msg;
+                            bonus_info(bonus_uuid);
+                            toNext();
+                        }
+
+
 
                     }
                 });
     }
 
 
+    private void showToShiMing(String  message) {
+        ActionConfirmDialog actionDialog = new ActionConfirmDialog(getContext(),
+                message,"取消","去绑定",true);
+        actionDialog.setOnToActionListener(new ActionConfirmDialog.OnToActionListener() {
+            @Override
+            public void toSumbit() {
+                Intent intent = new Intent();
+                intent.setClassName(getContext(), "com.hbl.yuliao.wallet.ShiMingActivity");
+                getContext().startActivity(intent);
+            }
+
+            @Override
+            public void toCancel() {
+                dismiss();
+            }
+        });
+        actionDialog.show();
+    }
+
     private void toShareMessage(RedPacketGetAttachment customerAttachment) {
         IMMessage customMessage = MessageBuilder.createCustomMessage(customerAttachment.getSenderUid() + "", SessionTypeEnum.P2P,
                 getContext().getString(com.netease.yunxin.kit.chatkit.ui.R.string.hongbao_chat_txt), customerAttachment);

chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/fun/factory/FunChatViewHolderFactory.java

@@ -64,7 +64,7 @@ public class FunChatViewHolderFactory extends ChatMessageViewHolderFactory
   @Override
   public int getCustomViewType(ChatMessageBean messageBean) {
     if (messageBean != null) {
-//      LogUtils.i("BIKAOVIDEO","BIKAOVIDEO结果是啥类型1："+ GsonUtils.beanToJSONString(messageBean));
+      LogUtils.i("BIKAOVIDEO","BIKAOVIDEO结果是啥类型1："+ GsonUtils.beanToJSONString(messageBean));
 
       if (messageBean.getMessageData().getMessage().getMsgType() == MsgTypeEnum.custom) {
         CustomAttachment attachment =

chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/fun/page/fragment/FunChatP2PFragment.java

@@ -111,7 +111,7 @@ public class FunChatP2PFragment extends FunChatFragment {
                         viewBinding.chattopview.ivChatcall.setVisibility(View.GONE);
                         getMessageBottomLayout().setShowBlackView();
                     } else {
-                        viewBinding.chattopview.ivChatcall.setVisibility(View.GONE);
+                        viewBinding.chattopview.ivChatcall.setVisibility(View.VISIBLE);
                         getMessageBottomLayout().setHideBlackView();
                     }
 
@@ -199,7 +199,7 @@ public class FunChatP2PFragment extends FunChatFragment {
         }
         chatView.getTitleBar().setVisibility(View.GONE);
         viewBinding.chattopview.tvChattitle.setText(name);
-        viewBinding.chattopview.ivChatcall.setVisibility(View.GONE);
+        viewBinding.chattopview.ivChatcall.setVisibility(View.VISIBLE);
         viewBinding.chattopview.ivChatannouncement.setVisibility(View.GONE);
         viewBinding.chattopview.ivChatsetting.setVisibility(View.VISIBLE);
         getMessageBottomLayout().setShowInit();

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

@@ -38,16 +38,16 @@ public class FunBottomActionFactory {
 //        if ((sessionType == SessionTypeEnum.Team || sessionType == SessionTypeEnum.SUPER_TEAM) && ChatKitUIConstant.isSendGiftRedPacket) { //群聊加礼金红包入口
 //            actions.add(new ActionItem(ActionConstants.ACTION_TYPE_GIFT_REDPACKET, R.drawable.ic_action_red_packet, R.string.hongbao_txt));
 //        }
-//    actions.add(
-//        new ActionItem(
-//            ActionConstants.ACTION_TYPE_ALBUM,
-//            R.drawable.ic_shoot1,
-//            R.string.chat_input_more_album_title));
-//    actions.add(
-//        new ActionItem(
-//            ActionConstants.ACTION_TYPE_CAMERA,
-//            R.drawable.ic_shoot1,
-//            R.string.chat_message_more_shoot));
+    actions.add(
+        new ActionItem(
+            ActionConstants.ACTION_TYPE_ALBUM,
+            R.drawable.ic_shoot1,
+            R.string.chat_input_more_album_title));
+    actions.add(
+        new ActionItem(
+            ActionConstants.ACTION_TYPE_CAMERA,
+            R.drawable.ic_shoot2,
+            R.string.chat_message_more_shoot));
 
 
 //        if (sessionType == SessionTypeEnum.P2P) {

chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/fun/view/message/viewholder/ChatCallMessageViewHolder.java

@@ -67,9 +67,9 @@ public class ChatCallMessageViewHolder extends FunChatBaseMessageViewHolder {
       int status = attachment.getStatus();
       int callTypeIconRes;
       if (type == 1) {
-        callTypeIconRes = R.drawable.ic_message_call_audio;
+        callTypeIconRes = R.drawable.ic_chatp2p_call;
       } else {
-        callTypeIconRes = R.drawable.ic_message_call_video;
+        callTypeIconRes = R.drawable.ic_chatp2p_video;
       }
       if (direction == MsgDirectionEnum.In) {
         callBinding.chatMessageCallIconIn.setImageResource(callTypeIconRes);
@@ -148,7 +148,7 @@ public class ChatCallMessageViewHolder extends FunChatBaseMessageViewHolder {
         callBinding.chatMessageCallText.setTextColor( callBinding.chatMessageCallText.getResources().getColor(R.color.color_333333));
 
       } else {
-        callBinding.chatMessageCallText.setTextColor( callBinding.chatMessageCallText.getResources().getColor(R.color.color_white));
+        callBinding.chatMessageCallText.setTextColor( callBinding.chatMessageCallText.getResources().getColor(R.color.color_333333));
       }
     }
   }

chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/model/LoginBean.java

@@ -0,0 +1,391 @@
+package com.netease.yunxin.kit.chatkit.ui.model;
+
+
+public class LoginBean extends RosterElementEntity {
+
+    private String accessToken;
+    private String refreshToken;
+    private String headimgurl;
+    private String userUid;
+    private String birthday;
+    private String userRegieon;
+    private Integer addFriendNeedVerify;
+    private Integer allowStrangerChat;
+    private Integer allowSearchByPhone;
+    private Integer allowSearchById;
+    private Integer allowAddFriendByGroup;
+    private String online;
+    private Integer userSex;
+    private Integer isOnline;
+    private Boolean isStaffService;
+    private String inviteCode;
+    private String invitedBy;
+    private String postHomepageBackground;
+    private String nwId;
+    private String nwIdSetTime;
+    private Integer forbidQCoinTransferEnvelope;
+    private Integer forbidQCoin;
+    private SubstationDTO substation;
+    private String chatToken;
+    private LoginBean user;
+    private Integer isFollow;
+    private Integer allowGiftCoin;
+    private Integer isBiz = 0;
+    private double cashFeeRate; //cash费率
+    private double silverFeeRate;//积分费率
+    private double mmSilverFeeRate; //mm 积分费率
+
+    private String realName;
+
+    private String idCard;
+
+    public String getRealName() {
+        return realName;
+    }
+
+    public void setRealName(String realName) {
+        this.realName = realName;
+    }
+
+    public String getIdCard() {
+        return idCard;
+    }
+
+    public void setIdCard(String idCard) {
+        this.idCard = idCard;
+    }
+
+    public double getMmSilverFeeRate() {
+        return mmSilverFeeRate;
+    }
+
+    public void setMmSilverFeeRate(double mmSilverFeeRate) {
+        this.mmSilverFeeRate = mmSilverFeeRate;
+    }
+
+    public double getCashFeeRate() {
+        return cashFeeRate;
+    }
+
+    public void setCashFeeRate(double cashFeeRate) {
+        this.cashFeeRate = cashFeeRate;
+    }
+
+    public double getSilverFeeRate() {
+        return silverFeeRate;
+    }
+
+    public void setSilverFeeRate(double silverFeeRate) {
+        this.silverFeeRate = silverFeeRate;
+    }
+
+    public Integer getAllowGiftCoin() {
+        return allowGiftCoin;
+    }
+
+    public void setAllowGiftCoin(Integer allowGiftCoin) {
+        this.allowGiftCoin = allowGiftCoin;
+    }
+
+    public Integer getIsBiz() {
+        return isBiz;
+    }
+
+    public void setIsBiz(Integer isBiz) {
+        this.isBiz = isBiz;
+    }
+
+    public Integer getIsFollow() {
+        if(isFollow == null){
+            return 0;
+        }
+        return isFollow;
+    }
+
+    public void setIsFollow(Integer isFollow) {
+        this.isFollow = isFollow;
+    }
+
+    public LoginBean getUser() {
+        return user;
+    }
+
+    public void setUser(LoginBean user) {
+        this.user = user;
+    }
+
+    public String getChatToken() {
+        return chatToken;
+    }
+
+    public void setChatToken(String chatToken) {
+        this.chatToken = chatToken;
+    }
+
+    public Integer getForbidQCoinTransferEnvelope() {
+        return forbidQCoinTransferEnvelope;
+    }
+
+    public void setForbidQCoinTransferEnvelope(Integer forbidQCoinTransferEnvelope) {
+        this.forbidQCoinTransferEnvelope = forbidQCoinTransferEnvelope;
+    }
+
+    public Integer getForbidQCoin() {
+        return forbidQCoin;
+    }
+
+    public void setForbidQCoin(Integer forbidQCoin) {
+        this.forbidQCoin = forbidQCoin;
+    }
+
+    public String getNwId() {
+        return nwId;
+    }
+
+    public void setNwId(String nwId) {
+        this.nwId = nwId;
+    }
+
+    public String getNwIdSetTime() {
+        return nwIdSetTime;
+    }
+
+    public void setNwIdSetTime(String nwIdSetTime) {
+        this.nwIdSetTime = nwIdSetTime;
+    }
+
+    public String getPostHomepageBackground() {
+        return postHomepageBackground;
+    }
+
+    public void setPostHomepageBackground(String postHomepageBackground) {
+        this.postHomepageBackground = postHomepageBackground;
+    }
+
+    public String getInviteCode() {
+        return inviteCode;
+    }
+
+    public void setInviteCode(String inviteCode) {
+        this.inviteCode = inviteCode;
+    }
+
+    public String getInvitedBy() {
+        return invitedBy;
+    }
+
+    public void setInvitedBy(String invitedBy) {
+        this.invitedBy = invitedBy;
+    }
+
+    public Boolean getStaffService() {
+        return isStaffService;
+    }
+
+    public void setStaffService(Boolean staffService) {
+        isStaffService = staffService;
+    }
+
+    public Integer getIsOnline() {
+        return isOnline;
+    }
+
+    public void setIsOnline(Integer isOnline) {
+        this.isOnline = isOnline;
+    }
+
+    public Integer getUserSex() {
+        return userSex;
+    }
+
+    public void setUserSex(Integer userSex) {
+        this.userSex = userSex;
+    }
+
+    public String getUserUid() {
+        return userUid;
+    }
+
+    public void setUserUid(String userUid) {
+        this.userUid = userUid;
+    }
+
+    public String getOnline() {
+        return online;
+    }
+
+    public void setOnline(String online) {
+        this.online = online;
+    }
+
+    public Integer getAddFriendNeedVerify() {
+        if(addFriendNeedVerify == null){
+            return 1;
+        }
+        return addFriendNeedVerify;
+    }
+
+    public void setAddFriendNeedVerify(Integer addFriendNeedVerify) {
+
+        this.addFriendNeedVerify = addFriendNeedVerify;
+    }
+
+    public Integer getAllowStrangerChat() {
+        if(allowStrangerChat == null){
+            return 0;
+        }
+        return allowStrangerChat;
+    }
+
+    public void setAllowStrangerChat(Integer allowStrangerChat) {
+        this.allowStrangerChat = allowStrangerChat;
+    }
+
+    public Integer getAllowSearchByPhone() {
+        if(allowSearchByPhone == null){
+            return 1;
+        }
+        return allowSearchByPhone;
+    }
+
+    public void setAllowSearchByPhone(Integer allowSearchByPhone) {
+        this.allowSearchByPhone = allowSearchByPhone;
+    }
+
+    public Integer getAllowSearchById() {
+        if(allowSearchById == null){
+            return 1;
+        }
+        return allowSearchById;
+    }
+
+    public void setAllowSearchById(Integer allowSearchById) {
+        this.allowSearchById = allowSearchById;
+    }
+
+    public Integer getAllowAddFriendByGroup() {
+        if(allowSearchById == null){
+            return 1;
+        }
+        return allowAddFriendByGroup;
+    }
+
+    public void setAllowAddFriendByGroup(Integer allowAddFriendByGroup) {
+
+        this.allowAddFriendByGroup = allowAddFriendByGroup;
+    }
+
+    public String getBirthday() {
+        return birthday;
+    }
+
+    public void setBirthday(String birthday) {
+        this.birthday = birthday;
+    }
+
+    public String getUserRegieon() {
+        return userRegieon;
+    }
+
+    public void setUserRegieon(String userRegieon) {
+        this.userRegieon = userRegieon;
+    }
+
+    public String getAccessToken() {
+        return accessToken;
+    }
+
+    public String getHeadimgurl() {
+        return headimgurl;
+    }
+
+    public void setHeadimgurl(String headimgurl) {
+        this.headimgurl = headimgurl;
+    }
+
+    public void setAccessToken(String accessToken) {
+        this.accessToken = accessToken;
+    }
+
+    public String getRefreshToken() {
+        return refreshToken;
+    }
+
+    public void setRefreshToken(String refreshToken) {
+        this.refreshToken = refreshToken;
+    }
+
+    public SubstationDTO getSubstation() {
+        return substation;
+    }
+
+    public void setSubstation(SubstationDTO substation) {
+        this.substation = substation;
+    }
+
+    public static class SubstationDTO {
+        private String substationId;
+        private String substationName;
+        private String createTime;
+        private Integer isValid;
+        private Integer adminId;
+        private String worldChatGroupId;
+        private String niuniuGroupId;
+
+        public String getSubstationId() {
+            return substationId;
+        }
+
+        public void setSubstationId(String substationId) {
+            this.substationId = substationId;
+        }
+
+        public String getSubstationName() {
+            return substationName;
+        }
+
+        public void setSubstationName(String substationName) {
+            this.substationName = substationName;
+        }
+
+        public String getCreateTime() {
+            return createTime;
+        }
+
+        public void setCreateTime(String createTime) {
+            this.createTime = createTime;
+        }
+
+        public Integer getIsValid() {
+            return isValid;
+        }
+
+        public void setIsValid(Integer isValid) {
+            this.isValid = isValid;
+        }
+
+        public Integer getAdminId() {
+            return adminId;
+        }
+
+        public void setAdminId(Integer adminId) {
+            this.adminId = adminId;
+        }
+
+        public String getWorldChatGroupId() {
+            return worldChatGroupId;
+        }
+
+        public void setWorldChatGroupId(String worldChatGroupId) {
+            this.worldChatGroupId = worldChatGroupId;
+        }
+
+        public String getNiuniuGroupId() {
+            return niuniuGroupId;
+        }
+
+        public void setNiuniuGroupId(String niuniuGroupId) {
+            this.niuniuGroupId = niuniuGroupId;
+        }
+    }
+}

chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/model/RosterElementEntity.java

@@ -0,0 +1,363 @@
+package com.netease.yunxin.kit.chatkit.ui.model;
+
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by FernFlower decompiler)
+//
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Observable;
+import java.util.Observer;
+
+public class RosterElementEntity implements Serializable {
+    public static final String DEFAULT_INVALID_UID_VALUE = "-1";
+    public static final int LIVE_STATUS_ONLINE = 1;
+    public static final int LIVE_STATUS_OFFLINE = 0;
+    public static final String SEX_MAN = "1";
+    public static final String SEX_WOMAN = "0";
+    protected String ex1;
+    protected String ex10;
+    protected String ex11;
+    protected String ex12;
+    protected String ex13;
+    protected String ex14;
+    protected String ex15;
+    protected String mustVersion4A;
+    protected String mustVersionDesc4A;
+    protected String userAvatarFileName;
+    protected String whatsUp;
+    protected String maxFriend;
+    protected String userDesc;
+    protected String userType;
+    protected String user_uid;
+    protected String user_mail;
+    protected String nickname;
+    protected String user_sex;
+    protected String register_time;
+    protected String latest_login_time;
+    protected String latest_login_ip;
+    protected String liveStatus;
+    protected String token = null;
+    protected String friendRemark;
+    protected String friendMobileNum;
+    protected String friendMoreDesc;
+    protected String friendPicFileName;
+    protected static transient List<Observer> liveStatusChangeObss = new ArrayList();
+
+    public RosterElementEntity() {
+    }
+
+    public String getUser_uid() {
+        return this.user_uid;
+    }
+
+    public RosterElementEntity setUser_uid(String user_uid) {
+        this.user_uid = user_uid;
+        return this;
+    }
+
+    public String getUser_mail() {
+        return this.user_mail;
+    }
+
+    public RosterElementEntity setUser_mail(String user_mail) {
+        this.user_mail = user_mail;
+        return this;
+    }
+
+    public String getNickname() {
+        return this.nickname;
+    }
+
+    public RosterElementEntity setNickname(String nickname) {
+        this.nickname = nickname;
+        return this;
+    }
+
+    public String getUser_sex() {
+        return this.user_sex;
+    }
+
+    public RosterElementEntity setUser_sex(String user_sex) {
+        this.user_sex = user_sex;
+        return this;
+    }
+
+    public String getRegister_time() {
+        return this.register_time;
+    }
+
+    public void setRegister_time(String register_time) {
+        this.register_time = register_time;
+    }
+
+    public String getLatest_login_time() {
+        return this.latest_login_time;
+    }
+
+    public void setLatest_login_time(String latest_login_time) {
+        this.latest_login_time = latest_login_time;
+    }
+
+    public String getLiveStatus() {
+        return this.liveStatus;
+    }
+
+    public RosterElementEntity setLiveStatus(String liveStatus) {
+        this.liveStatus = liveStatus;
+        if (getLiveStatusChangeObss().size() > 0) {
+            Iterator var2 = getLiveStatusChangeObss().iterator();
+
+            while(var2.hasNext()) {
+                Observer o = (Observer)var2.next();
+                o.update((Observable)null, new String[]{this.nickname, "" + liveStatus, this.user_uid});
+            }
+        }
+
+        return this;
+    }
+
+    public String getToken() {
+        return this.token;
+    }
+
+    public void setToken(String tokenforIM) {
+        this.token = tokenforIM;
+    }
+
+    public boolean isOnline() {
+        return this.liveStatus .equals("1");
+    }
+
+    public void online() {
+        this.setLiveStatus("1");
+    }
+
+    public void offline() {
+        this.setLiveStatus("0");
+    }
+
+    public boolean isMan() {
+        return "1".equals(this.user_sex);
+    }
+
+    public String toString() {
+        return this.nickname;
+    }
+
+    public String getEx1() {
+        return this.ex1;
+    }
+
+    public void setEx1(String ex1) {
+        this.ex1 = ex1;
+    }
+
+    public String getMustVersion4A() {
+        return this.mustVersion4A;
+    }
+
+    public void setMustVersion4A(String mustVersion4A) {
+        this.mustVersion4A = mustVersion4A;
+    }
+
+    public String getMustVersionDesc4A() {
+        return this.mustVersionDesc4A;
+    }
+
+    public void setMustVersionDesc4A(String mustVersionDesc4A) {
+        this.mustVersionDesc4A = mustVersionDesc4A;
+    }
+
+    public String getUserAvatarFileName() {
+        return this.userAvatarFileName;
+    }
+
+    public void setUserAvatarFileName(String userAvatarFileName) {
+        this.userAvatarFileName = userAvatarFileName;
+    }
+
+    public String getWhatsUp() {
+        return this.whatsUp;
+    }
+
+    public void setWhatsUp(String whatsUp) {
+        this.whatsUp = whatsUp;
+    }
+
+    public String getMaxFriend() {
+        if(this.maxFriend.equals("null")){
+            return "500";
+        }
+        return this.maxFriend;
+    }
+
+    public void setMaxFriend(String maxFriend) {
+
+        this.maxFriend = maxFriend;
+    }
+
+    public String getUserDesc() {
+        return this.userDesc;
+    }
+
+    public void setUserDesc(String userDesc) {
+        this.userDesc = userDesc;
+    }
+
+    public String getUserType() {
+        return this.userType;
+    }
+
+    public void setUserType(String userType) {
+        this.userType = userType;
+    }
+
+    public String getLatest_login_ip() {
+        return this.latest_login_ip;
+    }
+
+    public void setLatest_login_ip(String latest_login_ip) {
+        this.latest_login_ip = latest_login_ip;
+    }
+
+    public String getEx10() {
+        return this.ex10;
+    }
+
+    public void setEx10(String ex10) {
+        this.ex10 = ex10;
+    }
+
+    public Object getEx11() {
+        return this.ex11;
+    }
+
+    public void setEx11(String ex11) {
+        this.ex11 = ex11;
+    }
+
+    public String getEx12() {
+        return this.ex12;
+    }
+
+    public void setEx12(String ex12) {
+        this.ex12 = ex12;
+    }
+
+    public String getEx13() {
+        return this.ex13;
+    }
+
+    public void setEx13(String ex13) {
+        this.ex13 = ex13;
+    }
+
+    public String getEx14() {
+        return this.ex14;
+    }
+
+    public void setEx14(String ex14) {
+        this.ex14 = ex14;
+    }
+
+    public String getEx15() {
+        return this.ex15;
+    }
+
+    public void setEx15(String ex15) {
+        this.ex15 = ex15;
+    }
+
+    public String getFriendRemark() {
+        return this.friendRemark;
+    }
+
+    public void setFriendRemark(String friendRemark) {
+        this.friendRemark = friendRemark;
+    }
+
+    public String getFriendMobileNum() {
+        return this.friendMobileNum;
+    }
+
+    public void setFriendMobileNum(String friendMobileNum) {
+        this.friendMobileNum = friendMobileNum;
+    }
+
+    public String getFriendMoreDesc() {
+        return this.friendMoreDesc;
+    }
+
+    public void setFriendMoreDesc(String friendMoreDesc) {
+        this.friendMoreDesc = friendMoreDesc;
+    }
+
+    public String getFriendPicFileName() {
+        return this.friendPicFileName;
+    }
+
+    public void setFriendPicFileName(String friendPicFileName) {
+        this.friendPicFileName = friendPicFileName;
+    }
+
+    protected RosterElementEntity doClone(RosterElementEntity newObj) {
+        if (newObj != null) {
+            newObj.setEx1(this.ex1);
+            newObj.setEx10(this.ex10);
+            newObj.setEx11(this.ex11);
+            newObj.setEx12(this.ex12);
+            newObj.setEx13(this.ex13);
+            newObj.setEx14(this.ex14);
+            newObj.setEx15(this.ex15);
+            newObj.setMustVersion4A(this.mustVersion4A);
+            newObj.setMustVersionDesc4A(this.mustVersionDesc4A);
+            newObj.setUserAvatarFileName(this.userAvatarFileName);
+            newObj.setWhatsUp(this.whatsUp);
+            newObj.setMaxFriend(this.maxFriend);
+            newObj.setUserDesc(this.userDesc);
+            newObj.setUserType(this.userType);
+            newObj.setUser_uid(this.user_uid);
+            newObj.setUser_mail(this.user_mail);
+            newObj.setNickname(this.nickname);
+            newObj.setUser_sex(this.user_sex);
+            newObj.setRegister_time(this.register_time);
+            newObj.setLatest_login_time(this.latest_login_time);
+            newObj.setLiveStatus(this.liveStatus);
+            newObj.setToken(this.token);
+            newObj.setFriendRemark(this.friendRemark);
+            newObj.setFriendMobileNum(this.friendMobileNum);
+            newObj.setFriendMoreDesc(this.friendMoreDesc);
+            newObj.setFriendPicFileName(this.friendPicFileName);
+        }
+
+        return newObj;
+    }
+
+    public Object clone() {
+        RosterElementEntity cloneRee = new RosterElementEntity();
+        return this.doClone(cloneRee);
+    }
+
+    public static void addLiveStatusChangeObs(Observer liveStatusChangeObs) {
+        if (liveStatusChangeObs != null) {
+            liveStatusChangeObss.add(liveStatusChangeObs);
+        }
+
+    }
+
+    public static void removeLiveStatusChangeObs(Observer liveStatusChangeObs) {
+        if (liveStatusChangeObs != null) {
+            liveStatusChangeObss.remove(liveStatusChangeObs);
+        }
+
+    }
+
+    public static List<Observer> getLiveStatusChangeObss() {
+        return liveStatusChangeObss;
+    }
+}
+

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

@@ -2,6 +2,7 @@ package com.netease.yunxin.kit.chatkit.ui.network;
 
 
 import com.netease.yunxin.kit.chatkit.ui.model.BindBean;
+import com.netease.yunxin.kit.chatkit.ui.model.LoginBean;
 import com.netease.yunxin.kit.chatkit.ui.model.RedpacketBean;
 import com.netease.yunxin.kit.chatkit.ui.model.RedpacketGroupBean;
 import com.netease.yunxin.kit.chatkit.ui.model.SwitchGroupBean;
@@ -50,14 +51,13 @@ public interface ApiService {
     /**
      * 正式环境
      */
-     String URL = "http://api.bijr3t.com/";
+//     String URL = "http://api.bijr3t.com/";
+
 
     /**
      * 测试环境
      */
-//    String URL = "https://api-test.letschat2023.com/";
-//      String URL = "https://api-test.bijr3t.com/";
-
+    String URL = "http://8.217.182.79:8003/";
 
     String SUBSTATIONID = "1703655363476242434";
 //    String SUBSTATIONID = "";
@@ -149,6 +149,14 @@ public interface ApiService {
      */
     @GET("/group/{groupId}/switches")
     Observable<Result<List<SwitchGroupBean>>> groupSwitches(@Path("groupId") String page);
+
+
+
+    /**
+     * 用户信息
+     */
+    @GET("/auth/user/{userId}")
+    Observable<Result<LoginBean>> userInfo(@Path("userId") String userId);
 }
 
 

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

@@ -1,5 +1,7 @@
 package com.netease.yunxin.kit.chatkit.ui.network;
 
+import android.os.Build;
+
 import com.netease.nimlib.sdk.uinfo.UserService;
 import com.netease.yunxin.kit.chatkit.ui.common.ChatDataUtils;
 import com.netease.yunxin.kit.corekit.im.IMKitClient;
@@ -39,6 +41,9 @@ public class HeaderInterceptor implements Interceptor {
         Request request = chain.request().newBuilder()
                 .addHeader("Authorization", ChatDataUtils.get(IMKitClient.getApplicationContext(),"getAccessToken",""))
                 .addHeader("Accept-Language","zh-CN")
+                .addHeader("X-System","Android")
+                .addHeader("X-Phone-Type", Build.MANUFACTURER+"_"+ android.os.Build.BRAND+"_"+Build.MODEL)
+                .addHeader("X-System-Version",Build.VERSION.RELEASE)
 //                .addHeader("Channel", channel)
                 .build();
 

chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/normal/view/message/viewholder/ChatCallMessageViewHolder.java

@@ -68,9 +68,9 @@ public class ChatCallMessageViewHolder extends NormalChatBaseMessageViewHolder {
       int status = attachment.getStatus();
       int callTypeIconRes;
       if (type == 1) {
-        callTypeIconRes = R.drawable.ic_message_call_audio;
+        callTypeIconRes = R.drawable.ic_chatp2p_call;
       } else {
-        callTypeIconRes = R.drawable.ic_message_call_video;
+        callTypeIconRes = R.drawable.ic_chatp2p_video;
       }
       if (direction == MsgDirectionEnum.In) {
         callBinding.chatMessageCallIconIn.setImageResource(callTypeIconRes);
@@ -151,7 +151,7 @@ public class ChatCallMessageViewHolder extends NormalChatBaseMessageViewHolder {
         callBinding.chatMessageCallText.setTextColor( callBinding.chatMessageCallText.getResources().getColor(R.color.color_333333));
 
       } else {
-        callBinding.chatMessageCallText.setTextColor( callBinding.chatMessageCallText.getResources().getColor(R.color.color_white));
+        callBinding.chatMessageCallText.setTextColor( callBinding.chatMessageCallText.getResources().getColor(R.color.color_333333));
       }
     }
   }

chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/page/fragment/ChatBaseFragment.java

@@ -878,7 +878,7 @@ public abstract class ChatBaseFragment extends BaseFragment {
                                 showDialogPay();
                             } else {
                                 Intent intent = new Intent();
-                                intent.setClassName(getContext(), "com.hbl.lewan.redpack.SendGiftRedPacketActivity");
+                                intent.setClassName(getContext(), "com.hbl.yuliao.redpack.SendGiftRedPacketActivity");
                                 intent.putExtra("receiverUid", sessionID);
                                 intent.putExtra("isGroup", sessionType != SessionTypeEnum.P2P);
                                 startActivityForResult(intent, 456);
@@ -912,7 +912,7 @@ public abstract class ChatBaseFragment extends BaseFragment {
                                 }
 
                                 Intent intent = new Intent();
-                                intent.setClassName(getContext(), "com.hbl.lewan.redpack.TransferAccountsActivity");
+                                intent.setClassName(getContext(), "com.hbl.yuliao.redpack.TransferAccountsActivity");
                                 intent.putExtra("receiverUid", sessionID);
                                 startActivityForResult(intent, 457);
                             }
@@ -939,7 +939,7 @@ public abstract class ChatBaseFragment extends BaseFragment {
                                 }
 
                                 Intent intent = new Intent();
-                                intent.setClassName(getContext(), "com.hbl.lewan.redpack.TransferAccountsActivity");
+                                intent.setClassName(getContext(), "com.hbl.yuliao.redpack.TransferAccountsActivity");
                                 intent.putExtra("type", true);
                                 intent.putExtra("receiverUid", sessionID);
                                 startActivityForResult(intent, 457);
@@ -1031,7 +1031,7 @@ public abstract class ChatBaseFragment extends BaseFragment {
     private void toNextSendGroup(boolean isZhuanShu, UserInfo userInfo) {
         if(isZhuanShu){
             Intent intent = new Intent();
-            intent.setClassName(getContext(), "com.hbl.lewan.redpack.SendRedPacketActivity");
+            intent.setClassName(getContext(), "com.hbl.yuliao.redpack.SendRedPacketActivity");
             intent.putExtra("receiverUid", sessionID);
             intent.putExtra("isGroup", sessionType != SessionTypeEnum.P2P);
             intent.putExtra("user_Bean",userInfo);
@@ -1039,7 +1039,7 @@ public abstract class ChatBaseFragment extends BaseFragment {
             startActivityForResult(intent, 456);
         }else{
             Intent intent = new Intent();
-            intent.setClassName(getContext(), "com.hbl.lewan.redpack.SendRedPacketActivity");
+            intent.setClassName(getContext(), "com.hbl.yuliao.redpack.SendRedPacketActivity");
             intent.putExtra("receiverUid", sessionID);
             intent.putExtra("isGroup", sessionType != SessionTypeEnum.P2P);
             startActivityForResult(intent, 456);
@@ -1465,7 +1465,7 @@ public abstract class ChatBaseFragment extends BaseFragment {
             @Override
             public void toSumbit() {
                 Intent intent = new Intent();
-                intent.setClassName(getContext(), "com.hbl.lewan.main.mine.ChangeAccoutActionActivity");
+                intent.setClassName(getContext(), "com.hbl.yuliao.main.mine.ChangeAccoutActionActivity");
                 intent.putExtra("type", 1);
                 startActivity(intent);
             }
@@ -1506,7 +1506,7 @@ public abstract class ChatBaseFragment extends BaseFragment {
             @Override
             public void toSumbit() {
                 Intent intent = new Intent();
-                intent.setClassName(getContext(), "com.hbl.lewan.wallet.SetPayPasswordActivity");
+                intent.setClassName(getContext(), "com.hbl.yuliao.wallet.SetPayPasswordActivity");
                 startActivity(intent);
 
             }
@@ -2086,7 +2086,7 @@ public abstract class ChatBaseFragment extends BaseFragment {
                         TransferShareBean transferShareBean = GsonUtils.getObjFromJSON(name, TransferShareBean.class);
                         if (transferShareBean != null) {
                             Intent intent = new Intent();
-                            intent.setClassName(getActivity(), "com.hbl.lewan.redpack.TransferInfoActivity");
+                            intent.setClassName(getActivity(), "com.hbl.yuliao.redpack.TransferInfoActivity");
                             //Long id, Integer status, Integer amount, Integer senderUid, Integer receiverUid, String sendTime, String receiveTime, String remark, Integer coinType
                             TransferBean transferBean = new TransferBean(Long.parseLong(transferShareBean.data.getId()),
                                     Integer.parseInt(transferShareBean.data.getStatus()),
@@ -2128,7 +2128,7 @@ public abstract class ChatBaseFragment extends BaseFragment {
                         UserAlbumsShareBean albumsShareBean = GsonUtils.getObjFromJSON(name, UserAlbumsShareBean.class);
                         if (albumsShareBean.data != null) {
                             Intent intent = new Intent();
-                            intent.setClassName(getActivity(), "com.hbl.lewan.main.mine.photo.UserPhotoDetailsActivity");
+                            intent.setClassName(getActivity(), "com.hbl.yuliao.main.mine.photo.UserPhotoDetailsActivity");
                             intent.putExtra("albumId", albumsShareBean.data.getAlbumId());
                             intent.putExtra("userId", albumsShareBean.data.getUserId());
                             startActivity(intent);
@@ -2142,7 +2142,7 @@ public abstract class ChatBaseFragment extends BaseFragment {
                                     + helpPayShareBean.data.getPayUid() + "&orderid=" + helpPayShareBean.data.getOrderId()
                                     + "&payHeadImg=" + ContactRepo.getUserInfo(helpPayShareBean.data.getPayUid()).getAvatar());
                             intent.putExtra("isGame", true);
-                            intent.setClassName(getActivity(), "com.hbl.lewan.game.JsBridgeActivity");
+                            intent.setClassName(getActivity(), "com.hbl.yuliao.game.JsBridgeActivity");
                             startActivity(intent);
                         }
                         break;
@@ -2151,7 +2151,7 @@ public abstract class ChatBaseFragment extends BaseFragment {
                         if (inviteGroupBean.data != null) {
                             Intent intent = new Intent();
                             intent.putExtra("teamId", inviteGroupBean.data.getTeamId());
-                            intent.setClassName(getActivity(), "com.hbl.lewan.imkit.team.TeamInvitedJoinActivity");
+                            intent.setClassName(getActivity(), "com.hbl.yuliao.imkit.team.TeamInvitedJoinActivity");
                             startActivity(intent);
                         }
                         break;
@@ -2207,7 +2207,7 @@ public abstract class ChatBaseFragment extends BaseFragment {
     private void toTiaozhuan(RedpacketBean data, ChatMessageBean message) {
         if (data.getStatus() > 0 || ((data.getSenderUid() + "").equals(IMKitClient.account()))) {
             Intent intent = new Intent();
-            intent.setClassName(getActivity(), "com.hbl.lewan.redpack.ReceiveRedPacketActivity");
+            intent.setClassName(getActivity(), "com.hbl.yuliao.redpack.ReceiveRedPacketActivity");
             intent.putExtra("bean", data);
             intent.putExtra("isGroup", false);
             intent.putExtra("name", message.getMessageData().getMessage().getFromNick());
@@ -2240,7 +2240,7 @@ public abstract class ChatBaseFragment extends BaseFragment {
     private void toTiaozhuanGroup(RedpacketGroupBean groupBean, ChatMessageBean message) {
         if (groupBean.getStatus() > 0) {
             Intent intent = new Intent();
-            intent.setClassName(getActivity(), "com.hbl.lewan.redpack.ReceiveRedPacketActivity");
+            intent.setClassName(getActivity(), "com.hbl.yuliao.redpack.ReceiveRedPacketActivity");
             intent.putExtra("bean", groupBean);
             intent.putExtra("isGroup", true);
             intent.putExtra("name", groupBean.getSenderNickname() + "");
@@ -2254,7 +2254,7 @@ public abstract class ChatBaseFragment extends BaseFragment {
                     if ((groupBean.getGrabbers().get(i).getGrabberUid() + "").equals(IMKitClient.account())) {
                         isAt = true;
                         Intent intent = new Intent();
-                        intent.setClassName(getActivity(), "com.hbl.lewan.redpack.ReceiveRedPacketActivity");
+                        intent.setClassName(getActivity(), "com.hbl.yuliao.redpack.ReceiveRedPacketActivity");
                         intent.putExtra("bean", groupBean);
                         intent.putExtra("isGroup", true);
                         intent.putExtra("name", groupBean.getSenderNickname() + "");

chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/view/media/SimpleVideoPlayer.java

@@ -146,7 +146,7 @@ public class SimpleVideoPlayer extends ConstraintLayout {
             return;
         }
         VideoAttachment videoAttachment = (VideoAttachment) message.getAttachment();
-        videoFilePath = videoAttachment.getPath(); ///storage/emulated/0/Android/data/com.hbl.lewan/cache/video/e31b3802d23e3cb191875303f48ee576
+        videoFilePath = videoAttachment.getPath(); ///storage/emulated/0/Android/data/com.hbl.yuliao/cache/video/e31b3802d23e3cb191875303f48ee576
         if (TextUtils.isEmpty(videoFilePath)) {
             videoFilePath = videoAttachment.getThumbPath();
         }

chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/view/message/viewholder/ChatBaseMessageViewHolder.java

@@ -201,41 +201,41 @@ public abstract class ChatBaseMessageViewHolder extends CommonBaseMessageViewHol
         onLayoutConfig(message);
         message.setVisibleOtherVater(true);
         //控制连续消息 不显示头像
-        if (lastMessage != null) {
-            int lastmessageViewType = lastMessage.getViewType();
-            if (lastmessageViewType == ChatMessageType.NOTICE_MESSAGE_VIEW_TYPE || lastmessageViewType == ChatMessageType.TIP_MESSAGE_VIEW_TYPE) {
-                return;
-            }
-
-            MsgAttachment msgAttachment = lastMessage.getMessageData().getMessage().getAttachment();
-            if (msgAttachment instanceof RedPacketAttachment || msgAttachment instanceof RedPacketGetAttachment || msgAttachment instanceof TransferAttachment) {
-                return;
-            }
-
-            if (MessageHelper.isReceivedMessage(message)) {
-                if (lastMessage.getMessageData().getMessage().getFromAccount()
-                        .equals(message.getMessageData().getMessage().getFromAccount())) {
-                    {
-
-                        if (lastMessage.isRevoked() && message.isVisibleOtherVater() && !message.isRevoked()) {
-                            baseViewBinding.otherUserAvatar.setVisibility(View.VISIBLE);
-                            baseViewBinding.otherUsername.setVisibility(View.VISIBLE);
-                            return;
-                        }
-
-                        if (!(lastMessage.getViewType() == ChatMessageType.NOTICE_MESSAGE_VIEW_TYPE)
-                                || !(lastMessage.getViewType() == ChatMessageType.TIP_MESSAGE_VIEW_TYPE)) {
-                            baseViewBinding.otherUserAvatar.setVisibility(View.INVISIBLE);
-                            baseViewBinding.otherUsername.setVisibility(View.GONE);
-                            message.setVisibleOtherVater(false);
-
-                        }
-
-
-                    }
-                }
-            }
-        }
+//        if (lastMessage != null) {
+//            int lastmessageViewType = lastMessage.getViewType();
+//            if (lastmessageViewType == ChatMessageType.NOTICE_MESSAGE_VIEW_TYPE || lastmessageViewType == ChatMessageType.TIP_MESSAGE_VIEW_TYPE) {
+//                return;
+//            }
+//
+//            MsgAttachment msgAttachment = lastMessage.getMessageData().getMessage().getAttachment();
+//            if (msgAttachment instanceof RedPacketAttachment || msgAttachment instanceof RedPacketGetAttachment || msgAttachment instanceof TransferAttachment) {
+//                return;
+//            }
+//
+//            if (MessageHelper.isReceivedMessage(message)) {
+//                if (lastMessage.getMessageData().getMessage().getFromAccount()
+//                        .equals(message.getMessageData().getMessage().getFromAccount())) {
+//                    {
+//
+//                        if (lastMessage.isRevoked() && message.isVisibleOtherVater() && !message.isRevoked()) {
+//                            baseViewBinding.otherUserAvatar.setVisibility(View.VISIBLE);
+//                            baseViewBinding.otherUsername.setVisibility(View.VISIBLE);
+//                            return;
+//                        }
+//
+//                        if (!(lastMessage.getViewType() == ChatMessageType.NOTICE_MESSAGE_VIEW_TYPE)
+//                                || !(lastMessage.getViewType() == ChatMessageType.TIP_MESSAGE_VIEW_TYPE)) {
+//                            baseViewBinding.otherUserAvatar.setVisibility(View.INVISIBLE);
+//                            baseViewBinding.otherUsername.setVisibility(View.GONE);
+//                            message.setVisibleOtherVater(false);
+//
+//                        }
+//
+//
+//                    }
+//                }
+//            }
+//        }
 
 //        if (lastMessage != null&&MessageHelper.isReceivedMessage(messageBean)) {
 //            UserInfo userInfolast = lastMessage.getMessageData().getFromUser();

chatkit-ui/src/main/res-fun/drawable/fun_message_send_bg11.xml

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2022 NetEase, Inc. All rights reserved.
+  ~ Use of this source code is governed by a MIT license that can be
+  ~ found in the LICENSE file.
+  -->
+
+<!--<layer-list xmlns:android="http://schemas.android.com/apk/res/android">-->
+<!--    <?xml version="1.0" encoding="utf-8"?>&lt;!&ndash;-->
+<!--  ~ Copyright (c) 2022 NetEase, Inc. All rights reserved.-->
+<!--  ~ Use of this source code is governed by a MIT license that can be-->
+<!--  ~ found in the LICENSE file.-->
+<!--  &ndash;&gt;-->
+<!--        <item-->
+<!--            android:width="10.45dp"-->
+<!--            android:height="10.45dp"-->
+<!--            android:gravity="center"-->
+<!--            android:right="2dp"-->
+<!--            android:top="15dp">-->
+<!--            <rotate android:fromDegrees="45">-->
+<!--                <shape android:shape="rectangle">-->
+<!--                    <solid android:color="#ff6b3689" />-->
+<!--                    <size-->
+<!--                        android:width="1dp"-->
+<!--                        android:height="1dp" />-->
+<!--                </shape>-->
+<!--            </rotate>-->
+<!--        </item>-->
+
+
+<!--        <item android:right="7dp">-->
+<!--            <shape android:shape="rectangle">-->
+<!--                <corners android:radius="4dp" />-->
+<!--                <solid android:color="#ff6b3689" />-->
+<!--            </shape>-->
+<!--        </item>-->
+<!--    </layer-list>-->
+
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners
+        android:radius="@dimen/dimen_6_dp" />
+
+
+
+    <solid android:color="@color/color_white" />
+
+</shape>

chatkit-ui/src/main/res-fun/layout/business_viewhead.xml

@@ -1,56 +1,64 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    >
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <LinearLayout
-        android:layout_width="218dp"
-        android:layout_height="86dp"
         android:id="@+id/big_ly"
+        android:layout_width="218dp"
+        android:layout_height="110dp"
         android:background="@drawable/fun_message_send_bg"
         android:orientation="vertical">
+
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_height="match_parent"
+            android:layout_margin="@dimen/dimen_10_dp"
+            android:background="@drawable/fun_message_send_bg11"
+            android:orientation="vertical">
 
-            android:orientation="horizontal">
-            <com.netease.yunxin.kit.common.ui.widgets.ContactAvatarView
-                android:id="@+id/cavIcon"
-                android:layout_width="@dimen/dimen_32_dp"
-                android:layout_height="@dimen/dimen_32_dp"
-                android:layout_marginStart="10dp"
-                />
-            <TextView
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_marginRight="@dimen/dimen_10_dp"
-                android:layout_height="@dimen/dimen_32_dp"
-                android:id="@+id/user_name_tv"
-                android:lines="1"
-                android:ellipsize="end"
-                android:textStyle="bold"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <com.netease.yunxin.kit.common.ui.widgets.ContactAvatarView
+                    android:id="@+id/cavIcon"
+                    android:layout_width="@dimen/dimen_32_dp"
+                    android:layout_height="@dimen/dimen_32_dp"
+                    android:layout_marginStart="10dp" />
+
+                <TextView
+                    android:id="@+id/user_name_tv"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dimen_32_dp"
+                    android:layout_marginLeft="@dimen/dimen_10_dp"
+                    android:layout_marginRight="@dimen/dimen_10_dp"
+                    android:ellipsize="end"
+                    android:gravity="center_vertical"
+                    android:lines="1"
+                    android:textColor="#383838"
+                    android:textSize="16sp"
+                    android:textStyle="bold" />
+            </LinearLayout>
+
+            <View
+                android:id="@+id/line_v"
+                android:layout_width="match_parent"
+                android:layout_height="1px"
+                android:background="#EEF0F4" />
+
+            <TextView
+                android:id="@+id/mingpian_tv"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dimen_38_dp"
                 android:layout_marginLeft="@dimen/dimen_10_dp"
                 android:gravity="center_vertical"
-                android:textColor="@color/color_white"
-                android:textSize="14sp"
-                />
+                android:text="@string/gerenmp_txt"
+                android:textColor="#2C2C2C"
+                android:textSize="12sp" />
         </LinearLayout>
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1px"
-            android:id="@+id/line_v"
-            android:layout_marginTop="@dimen/dimen_10_dp"
-            android:background="#A278B9"/>
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:text="@string/gerenmp_txt"
-            android:id="@+id/mingpian_tv"
-            android:layout_marginLeft="@dimen/dimen_10_dp"
-            android:gravity="center_vertical"
-            android:textColor="#ffffffff"
-            android:textSize="10sp"
-            />
     </LinearLayout>
 
 </merge>

chatkit-ui/src/main/res-fun/layout/dialog_share_business.xml

@@ -8,7 +8,7 @@
     android:orientation="vertical">
 
     <androidx.appcompat.widget.LinearLayoutCompat
-        android:layout_width="285dp"
+        android:layout_width="305dp"
         android:layout_height="wrap_content"
         android:background="@drawable/shape_dialog_bg_new"
         android:minHeight="282dp"
@@ -26,7 +26,7 @@
                 android:layout_marginLeft="@dimen/dimen_15_dp"
                 android:layout_marginTop="20dp"
                 android:text="@string/fasonggei_txt"
-                android:textColor="#ff333333"
+                android:textColor="@color/color_333333"
                 android:textSize="14sp" />
 
             <LinearLayout
@@ -38,21 +38,21 @@
 
                 <com.netease.yunxin.kit.common.ui.widgets.ContactAvatarView
                     android:id="@+id/cavIcon"
-                    android:layout_width="@dimen/dimen_40_dp"
-                    android:layout_height="@dimen/dimen_40_dp"
+                    android:layout_width="@dimen/dimen_56_dp"
+                    android:layout_height="@dimen/dimen_56_dp"
                     android:layout_marginStart="15dp"
                     app:avatarCorner="@dimen/dimen_40_dp" />
 
                 <TextView
                     android:id="@+id/user_name_tv"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/dimen_40_dp"
+                    android:layout_height="@dimen/dimen_56_dp"
                     android:singleLine="true"
                     android:ellipsize="end"
                     android:layout_marginLeft="@dimen/dimen_15_dp"
                     android:layout_marginRight="@dimen/dimen_15_dp"
                     android:gravity="center_vertical"
-                    android:textColor="#ff333333"
+                    android:textColor="@color/color_333333"
                     android:textSize="16sp"
                     android:textStyle="bold" />
             </LinearLayout>
@@ -83,8 +83,8 @@
 
                 <com.netease.yunxin.kit.common.ui.widgets.ContactAvatarView
                     android:id="@+id/cavIcon1"
-                    android:layout_width="@dimen/dimen_40_dp"
-                    android:layout_height="@dimen/dimen_40_dp"
+                    android:layout_width="@dimen/dimen_56_dp"
+                    android:layout_height="@dimen/dimen_56_dp"
                     android:layout_marginStart="15dp"
                     app:avatarCorner="@dimen/dimen_40_dp" />
 
@@ -95,49 +95,45 @@
                     android:layout_marginLeft="@dimen/dimen_15_dp"
                     android:layout_marginRight="@dimen/dimen_15_dp"
                     android:gravity="center_vertical"
-                    android:textColor="#ff333333"
+                    android:textColor="@color/color_333333"
                     android:textSize="16sp"
                     android:textStyle="bold" />
             </LinearLayout>
         </LinearLayout>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1px"
-            android:background="@color/color_d8d8d8" />
-
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="@dimen/dimen_62_dp"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/dimen_20_dp"
             android:layout_alignParentBottom="true"
             android:layout_gravity="center_horizontal"
+            android:layout_marginTop="@dimen/dimen_20_dp"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
             <TextView
                 android:id="@+id/cancel_tv"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="@dimen/dimen_52_dp"
                 android:layout_weight="1"
+                android:background="@drawable/bg_cancel_stroke"
                 android:gravity="center"
+                android:layout_marginEnd="@dimen/dimen_7_dp"
                 android:text="@string/cancel_txt"
                 android:textColor="@color/color_fe6881"
                 android:textSize="16sp" />
 
-            <View
-                android:id="@+id/line_v"
-                android:layout_width="1dp"
-                android:layout_height="42dp"
-                android:background="@color/color_d8d8d8" />
 
             <TextView
                 android:id="@+id/sumbit_tv"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="@dimen/dimen_52_dp"
                 android:layout_weight="1"
+                android:layout_marginStart="@dimen/dimen_7_dp"
                 android:gravity="center"
+                android:background="@drawable/bg_sure_solide"
                 android:text="@string/sure_txt"
-                android:textColor="@color/color_6d80ff"
+                android:textColor="@color/color_white"
                 android:textSize="16sp" />
         </LinearLayout>
 

chatkit-ui/src/main/res-fun/layout/fun_chat_fragment.xml

@@ -42,7 +42,7 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/dimen_92_dp"
+                android:layout_height="86dp"
                 android:background="@android:color/white"
                 android:orientation="horizontal"
                 app:layout_constraintTop_toBottomOf="@+id/line">
@@ -54,6 +54,10 @@
                     android:layout_gravity="center"
                     android:layout_weight="1"
                     android:gravity="center"
+                    android:textColor="#2C2C2C"
+                    android:textSize="16sp"
+                    android:drawablePadding="10dp"
+
                     android:text="@string/chat_p2pcall_txt"
                     app:drawableTopCompat="@drawable/ic_chatp2p_call" />
 
@@ -63,6 +67,9 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
                     android:layout_weight="1"
+                    android:textColor="#2C2C2C"
+                    android:drawablePadding="10dp"
+                    android:textSize="16sp"
                     android:gravity="center"
                     android:text="@string/chat_p2pvideo_txt"
                     app:drawableTopCompat="@drawable/ic_chatp2p_video" />

chatkit-ui/src/main/res-fun/layout/fun_chat_message_bottom_view.xml

@@ -33,8 +33,8 @@
 
             <RadioButton
                 android:id="@+id/inputAudioRb"
-                android:layout_width="@dimen/dimen_32_dp"
-                android:layout_height="@dimen/dimen_32_dp"
+                android:layout_width="@dimen/dimen_28_dp"
+                android:layout_height="@dimen/dimen_28_dp"
                 android:layout_gravity="bottom"
                 android:background="@drawable/fun_ic_chat_input_audio_selector"
                 android:button="@null"
@@ -46,9 +46,10 @@
 
             <RadioButton
                 android:id="@+id/inputMoreRb"
-                android:layout_width="@dimen/dimen_20_dp"
-                android:layout_height="@dimen/dimen_20_dp"
+                android:layout_width="@dimen/dimen_28_dp"
+                android:layout_height="@dimen/dimen_28_dp"
                 android:layout_gravity="center_vertical"
+                android:layout_marginTop="@dimen/dimen_6_dp"
                 android:background="@drawable/fun_ic_chat_input_more_selector"
                 android:button="@null"
                 android:checked="false"
@@ -65,6 +66,7 @@
                 android:background="@drawable/fun_ic_chat_input_camera"
                 android:button="@null"
                 android:checked="false"
+                android:visibility="gone"
                 android:clickable="false"
                 app:layout_constraintStart_toEndOf="@+id/inputMoreRb"
                 app:layout_constraintTop_toTopOf="parent"
@@ -79,6 +81,7 @@
                 android:background="@drawable/fun_ic_chat_input_photo"
                 android:button="@null"
                 android:checked="false"
+                android:visibility="gone"
                 android:clickable="false"
                 app:layout_constraintStart_toEndOf="@+id/inputCameraRb"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -121,6 +124,7 @@
                     android:maxLines="9"
                     android:paddingStart="@dimen/dimen_12_dp"
                     android:textColorHint="@color/color_b3b7bc"
+                    android:textColor="#2c2c2c"
                     android:textCursorDrawable="@null"
                     android:textSize="@dimen/text_size_16"
                     tools:ignore="LabelFor" />
@@ -152,12 +156,12 @@
 
             <RadioButton
                 android:id="@+id/inputEmojiRb"
-                android:layout_width="@dimen/dimen_20_dp"
-                android:layout_height="@dimen/dimen_20_dp"
+                android:layout_width="@dimen/dimen_28_dp"
+                android:layout_height="@dimen/dimen_28_dp"
                 android:layout_gravity="bottom"
                 android:layout_marginStart="@dimen/dimen_10_dp"
                 android:layout_marginRight="@dimen/dimen_10_dp"
-                android:layout_marginBottom="@dimen/dimen_5_dp"
+                android:layout_marginBottom="@dimen/dimen_2_dp"
                 android:background="@drawable/fun_ic_chat_input_emoji_selector"
                 android:button="@null"
                 android:checked="false"
@@ -168,16 +172,16 @@
             android:id="@+id/inputRightLayout"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingStart="@dimen/dimen_10_dp"
+            android:paddingStart="@dimen/dimen_5_dp"
             android:paddingEnd="@dimen/dimen_15_dp"
-            android:paddingBottom="@dimen/dimen_11_dp"
+            android:paddingBottom="@dimen/dimen_3_dp"
             app:layout_constraintBottom_toBottomOf="@+id/layout_input"
             app:layout_constraintEnd_toEndOf="parent">
 
             <RadioButton
                 android:id="@+id/inputAudio2Rb"
-                android:layout_width="@dimen/dimen_20_dp"
-                android:layout_height="@dimen/dimen_20_dp"
+                android:layout_width="@dimen/dimen_28_dp"
+                android:layout_height="@dimen/dimen_28_dp"
                 android:background="@drawable/fun_ic_chat_input_audiotype_selector"
                 android:button="@null"
                 android:checked="false"
@@ -185,8 +189,8 @@
 
             <RadioButton
                 android:id="@+id/emoji_fsong_tv"
-                android:layout_width="@dimen/dimen_20_dp"
-                android:layout_height="@dimen/dimen_18_dp"
+                android:layout_width="@dimen/dimen_28_dp"
+                android:layout_height="@dimen/dimen_28_dp"
                 android:layout_gravity="center_vertical"
                 android:background="@drawable/fsong_img"
                 android:button="@null"

chatkit-ui/src/main/res-fun/layout/fun_chat_message_call_view_holder.xml

@@ -17,7 +17,7 @@
     <ImageView android:id="@+id/chat_message_call_icon_in"
         android:layout_width="@dimen/dimen_24_dp"
         android:layout_height="@dimen/dimen_24_dp"
-        android:src="@drawable/ic_message_call_audio"
+        android:src="@drawable/ic_chatp2p_call"
         android:layout_gravity="center_vertical"
         android:visibility="visible"
         android:layout_marginEnd="@dimen/dimen_8_dp"
@@ -39,8 +39,7 @@
         android:layout_width="@dimen/dimen_24_dp"
         android:layout_height="@dimen/dimen_24_dp"
         android:visibility="gone"
-        android:tint="@color/color_white"
-        android:src="@drawable/ic_message_call_audio"
+        android:src="@drawable/ic_chatp2p_call"
         android:layout_gravity="center_vertical"
         android:layout_marginStart="@dimen/dimen_8_dp"
         />

chatkit-ui/src/main/res-fun/layout/fun_chat_topview.xml

@@ -48,15 +48,6 @@
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
-            <androidx.appcompat.widget.AppCompatImageView
-                android:id="@+id/iv_chatsearch"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:paddingStart="@dimen/dimen_15_dp"
-                android:paddingEnd="@dimen/dimen_15_dp"
-                android:visibility="visible"
-                app:srcCompat="@drawable/ic_chat_titlesearch" />
-
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/iv_chatcall"
                 android:layout_width="wrap_content"
@@ -66,21 +57,33 @@
                 android:visibility="gone"
                 app:srcCompat="@drawable/ic_chat_titlecall" />
 
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/iv_chatsearch"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:paddingStart="@dimen/dimen_7_dp"
+                android:paddingEnd="@dimen/dimen_15_dp"
+                android:visibility="visible"
+                app:srcCompat="@drawable/ic_chat_titlesearch" />
+
+
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/iv_chatannouncement"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:paddingStart="@dimen/dimen_15_dp"
-                android:paddingEnd="@dimen/dimen_15_dp"
+                android:paddingStart="@dimen/dimen_7_dp"
+                android:paddingEnd="@dimen/dimen_7_dp"
                 android:visibility="gone"
+                app:tint="#2c2c2c"
                 app:srcCompat="@drawable/ic_chat_titleannouncement" />
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/iv_chatsetting"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:paddingStart="@dimen/dimen_15_dp"
-                android:paddingEnd="@dimen/dimen_15_dp"
+                android:paddingStart="@dimen/dimen_7_dp"
+                android:paddingEnd="@dimen/dimen_7_dp"
+                android:layout_marginEnd="@dimen/dimen_7_dp"
                 app:srcCompat="@drawable/ic_chat_titlesetting" />
 
         </LinearLayout>

chatkit-ui/src/main/res-fun/values/colors.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="fun_chat_page_bg_color">#f7f7f7</color>
-    <color name="fun_chat_secondary_page_bg_color">#ededed</color>
+    <color name="fun_chat_page_bg_color">#EEF0F7</color>
+    <color name="fun_chat_secondary_page_bg_color">#EEF0F7</color>
 
     <!-- 会话页面 -->
     <color name="fun_chat_input_bg_color">#ffffff</color>

chatkit-ui/src/main/res/drawable/bg_cancel_stroke.xml

@@ -5,7 +5,7 @@
   ~ found in the LICENSE file.
   -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:radius="@dimen/dimen_20_dp" />
+    <corners android:radius="@dimen/dimen_30_dp" />
 
     <stroke
         android:width="@dimen/dimen_1_dp"

chatkit-ui/src/main/res/drawable/bg_chat_pop_menu.xml

@@ -10,6 +10,6 @@
         android:color="@color/color_0c000050"
         android:width="@dimen/dimen_1_dp" />
 
-    <solid android:color="@color/color_white" />
+    <solid android:color="#AA333333" />
     <corners android:radius="@dimen/dimen_12_dp" />
 </shape>

chatkit-ui/src/main/res/drawable/bg_forward_confirm_input1.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2022 NetEase, Inc. All rights reserved.
+  ~ Use of this source code is governed by a MIT license that can be
+  ~ found in the LICENSE file.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="@dimen/dimen_10_dp" />
+
+    <solid android:color="#EEF0F7"/>
+    <stroke
+        android:width="@dimen/dimen_1_dp"
+        android:color="#EEF0F7" />
+</shape>

chatkit-ui/src/main/res/drawable/bg_message_input.xml

@@ -9,9 +9,9 @@
     android:shape="rectangle">
 
     <corners android:radius="6dp" />
-    <solid android:color="@color/color_white"/>
+    <solid android:color="#F5F4F7"/>
     <stroke
         android:width="1px"
-        android:color="#1e000000" />
+        android:color="#F5F4F7" />
 
 </shape>

chatkit-ui/src/main/res/drawable/bg_sure_solide.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:radius="@dimen/dimen_20_dp" />
+    <corners android:radius="@dimen/dimen_30_dp" />
 
-    <solid android:color="@color/color_fe6881" />
+    <solid android:color="#498AFA" />
 
 
 </shape>

chatkit-ui/src/main/res/drawable/ic_message_collection.xml

@@ -5,26 +5,26 @@
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="18dp"
-    android:viewportWidth="16"
-    android:viewportHeight="18">
+    android:width="17dp"
+    android:height="20dp"
+    android:viewportWidth="17"
+    android:viewportHeight="20">
     <path
         android:pathData="M1.5185,5.1482L7.2076,8.9409C7.5325,9.1575 7.9538,9.1652 8.2864,8.9605L14.4815,5.1482"
         android:strokeWidth="1.29"
         android:fillColor="#00000000"
-        android:strokeColor="#656A72"
+        android:strokeColor="#FFFFFF"
         android:strokeLineCap="round" />
     <path
         android:pathData="M7.7407,9.2963V17.074"
         android:strokeWidth="1.29"
         android:fillColor="#00000000"
-        android:strokeColor="#656A72"
+        android:strokeColor="#FFFFFF"
         android:strokeLineCap="round" />
     <path
         android:pathData="M1.478,4.8325L7.2376,1.3079C7.548,1.1179 7.9372,1.1116 8.2536,1.2914L14.494,4.8375C14.8068,5.0152 15,5.3472 15,5.7069V12.7931C15,13.1528 14.8068,13.4848 14.494,13.6625L8.2536,17.2086C7.9372,17.3884 7.548,17.3821 7.2376,17.1921L1.478,13.6675C1.1811,13.4858 1,13.1627 1,12.8146V5.6854C1,5.3373 1.1811,5.0142 1.478,4.8325Z"
         android:strokeWidth="1.29"
         android:fillColor="#00000000"
-        android:strokeColor="#656A72"
+        android:strokeColor="#FFFFFF"
         android:strokeLineCap="round" />
 </vector>

chatkit-ui/src/main/res/drawable/ic_message_copy.xml

@@ -1,15 +0,0 @@
-<!--
-  ~ Copyright (c) 2022 NetEase, Inc. All rights reserved.
-  ~ Use of this source code is governed by a MIT license that can be
-  ~ found in the LICENSE file.
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="18dp"
-    android:height="18dp"
-    android:viewportWidth="18"
-    android:viewportHeight="18">
-    <path
-        android:pathData="M6.3947,0.0007H16.3421C16.7818,0.0007 17.2035,0.1754 17.5144,0.4863C17.8253,0.7972 18,1.2189 18,1.6586V11.606C18,12.0457 17.8253,12.4674 17.5144,12.7783C17.2035,13.0892 16.7818,13.2639 16.3421,13.2639H6.3947C5.955,13.2639 5.5333,13.0892 5.2224,12.7783C4.9115,12.4674 4.7368,12.0457 4.7368,11.606V1.6586C4.7368,1.2189 4.9115,0.7972 5.2224,0.4863C5.5333,0.1754 5.955,0.0007 6.3947,0.0007ZM6.3947,1.4218C6.3319,1.4218 6.2717,1.4467 6.2273,1.4912C6.1828,1.5356 6.1579,1.5958 6.1579,1.6586V11.606C6.1579,11.6371 6.164,11.6679 6.1759,11.6966C6.1878,11.7254 6.2053,11.7515 6.2273,11.7735C6.2493,11.7955 6.2754,11.8129 6.3041,11.8248C6.3328,11.8367 6.3636,11.8428 6.3947,11.8428H16.3421C16.4049,11.8428 16.4652,11.8179 16.5096,11.7735C16.554,11.7291 16.5789,11.6688 16.5789,11.606V1.6586C16.5789,1.5958 16.554,1.5356 16.5096,1.4912C16.4652,1.4467 16.4049,1.4218 16.3421,1.4218H6.3947ZM11.8421,14.6849C11.8421,14.4965 11.917,14.3158 12.0502,14.1825C12.1835,14.0493 12.3642,13.9744 12.5526,13.9744C12.7411,13.9744 12.9218,14.0493 13.055,14.1825C13.1883,14.3158 13.2632,14.4965 13.2632,14.6849V16.3428C13.2632,16.7825 13.0885,17.2042 12.7776,17.5151C12.4667,17.8261 12.045,18.0007 11.6053,18.0007H1.6579C1.2182,18.0007 0.7965,17.8261 0.4856,17.5151C0.1747,17.2042 0,16.7825 0,16.3428V6.3955C0,5.9558 0.1747,5.5341 0.4856,5.2232C0.7965,4.9123 1.2182,4.7376 1.6579,4.7376H3.3158C3.5042,4.7376 3.685,4.8124 3.8182,4.9457C3.9515,5.0789 4.0263,5.2597 4.0263,5.4481C4.0263,5.6365 3.9515,5.8173 3.8182,5.9505C3.685,6.0838 3.5042,6.1586 3.3158,6.1586H1.6579C1.5951,6.1586 1.5348,6.1836 1.4904,6.228C1.446,6.2724 1.421,6.3327 1.421,6.3955V16.3428C1.421,16.4057 1.446,16.4659 1.4904,16.5103C1.5348,16.5547 1.5951,16.5797 1.6579,16.5797H11.6053C11.6681,16.5797 11.7283,16.5547 11.7727,16.5103C11.8172,16.4659 11.8421,16.4057 11.8421,16.3428V14.6849Z"
-        android:fillColor="#656A72" />
-</vector>

chatkit-ui/src/main/res/drawable/ic_message_delete.xml

@@ -5,37 +5,37 @@
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="18dp"
-    android:height="18dp"
-    android:viewportWidth="18"
-    android:viewportHeight="18">
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
     <path
         android:pathData="M0,0h18v18h-18z"
-        android:fillColor="#ffffff" />
+        android:fillColor="#00ffffff" />
     <path
         android:pathData="M13.5,4.5001V2.5715C13.5,1.8614 12.9244,1.2858 12.2143,1.2858H5.7857C5.0756,1.2858 4.5,1.8614 4.5,2.5715V4.5001"
         android:strokeWidth="1.28571"
         android:fillColor="#00000000"
-        android:strokeColor="#656A72" />
+        android:strokeColor="#FFFFFF" />
     <path
         android:pathData="M1.9286,4.5H16.0714"
         android:strokeWidth="1.28571"
         android:fillColor="#00000000"
-        android:strokeColor="#656A72"
+        android:strokeColor="#FFFFFF"
         android:strokeLineCap="round" />
     <path
         android:pathData="M15.4286,7.0714C15.4286,6.7164 15.1408,6.4285 14.7857,6.4285C14.4307,6.4285 14.1429,6.7164 14.1429,7.0714H15.4286ZM3.8572,7.0714C3.8572,6.7164 3.5693,6.4285 3.2143,6.4285C2.8593,6.4285 2.5714,6.7164 2.5714,7.0714H3.8572ZM14.1429,7.0714V16.0714H15.4286V7.0714H14.1429ZM13.5,16.7143H4.5V18H13.5V16.7143ZM3.8572,16.0714V7.0714H2.5714V16.0714H3.8572ZM4.5,16.7143C4.145,16.7143 3.8572,16.4265 3.8572,16.0714H2.5714C2.5714,17.1365 3.4349,18 4.5,18V16.7143ZM14.1429,16.0714C14.1429,16.4265 13.855,16.7143 13.5,16.7143V18C14.5651,18 15.4286,17.1365 15.4286,16.0714H14.1429Z"
-        android:fillColor="#656A72" />
+        android:fillColor="#FFFFFF" />
     <path
         android:pathData="M7.0714,7.0714V14.7857"
         android:strokeWidth="1.28571"
         android:fillColor="#00000000"
-        android:strokeColor="#656A72"
+        android:strokeColor="#FFFFFF"
         android:strokeLineCap="round" />
     <path
         android:pathData="M10.9286,7.0714V14.7857"
         android:strokeWidth="1.28571"
         android:fillColor="#00000000"
-        android:strokeColor="#656A72"
+        android:strokeColor="#FFFFFF"
         android:strokeLineCap="round" />
 </vector>

chatkit-ui/src/main/res/drawable/ic_message_multi_select.xml

@@ -1,27 +0,0 @@
-<!--
-  ~ Copyright (c) 2022 NetEase, Inc. All rights reserved.
-  ~ Use of this source code is governed by a MIT license that can be
-  ~ found in the LICENSE file.
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="18dp"
-    android:height="18dp"
-    android:viewportWidth="18"
-    android:viewportHeight="18">
-    <group>
-        <clip-path android:pathData="M0,0h18v18h-18z" />
-        <path
-            android:pathData="M6.2884,1.8483H17.2032C17.7401,1.8483 18.0085,2.1167 18.0085,2.6535V2.6513C18.0085,3.1881 17.7401,3.4566 17.2032,3.4566H6.2884C5.7515,3.4566 5.4831,3.1881 5.4831,2.6513V2.6535C5.4831,2.1167 5.7515,1.8483 6.2884,1.8483Z"
-            android:fillColor="#656A72" />
-        <path
-            android:pathData="M6.2884,8.4023H17.2032C17.7401,8.4023 18.0085,8.6708 18.0085,9.2076V9.2054C18.0085,9.7422 17.7401,10.0106 17.2032,10.0106H6.2884C5.7515,10.0106 5.4831,9.7422 5.4831,9.2054V9.2076C5.4831,8.6708 5.7515,8.4023 6.2884,8.4023Z"
-            android:fillColor="#656A72" />
-        <path
-            android:pathData="M6.2884,14.9564H17.2032C17.7401,14.9564 18.0085,15.2248 18.0085,15.7617V15.7595C18.0085,16.2963 17.7401,16.5647 17.2032,16.5647H6.2884C5.7515,16.5647 5.4831,16.2963 5.4831,15.7595V15.7617C5.4831,15.2248 5.7515,14.9564 6.2884,14.9564Z"
-            android:fillColor="#656A72" />
-        <path
-            android:pathData="M4.854,0.9199C4.8001,0.8656 4.736,0.8225 4.6654,0.7931C4.5948,0.7636 4.5191,0.7484 4.4426,0.7483C4.3661,0.7483 4.2903,0.7634 4.2197,0.7929C4.1491,0.8223 4.085,0.8655 4.0312,0.9199L1.9828,2.9726L0.995,1.976C0.9411,1.9217 0.877,1.8786 0.8064,1.8491C0.7358,1.8197 0.6601,1.8045 0.5836,1.8044C0.4685,1.8047 0.3561,1.8391 0.2605,1.9031C0.1649,1.9672 0.0905,2.0582 0.0465,2.1645C0.0025,2.2708 -0.009,2.3878 0.0133,2.5007C0.0357,2.6135 0.0909,2.7173 0.1721,2.7988L1.5758,4.2091C1.6837,4.3173 1.8301,4.3782 1.9828,4.3785C2.0591,4.3789 2.1346,4.3638 2.2049,4.3344C2.2752,4.3049 2.3389,4.2615 2.3921,4.2069L4.854,1.7406C4.9616,1.6311 5.022,1.4837 5.022,1.3302C5.022,1.1767 4.9616,1.0294 4.854,0.9199ZM4.854,7.5687C4.8,7.5147 4.7358,7.472 4.6652,7.4429C4.5946,7.4138 4.519,7.399 4.4426,7.3993C4.3662,7.3989 4.2905,7.4136 4.2199,7.4427C4.1493,7.4718 4.0851,7.5146 4.0312,7.5687L1.9828,9.6192L0.995,8.6226C0.9413,8.5679 0.8773,8.5244 0.8066,8.4945C0.736,8.4647 0.6602,8.4492 0.5836,8.4488C0.468,8.4487 0.3551,8.4829 0.259,8.5471C0.163,8.6113 0.0882,8.7025 0.0441,8.8093C0,8.9161 -0.0113,9.0336 0.0115,9.1468C0.0343,9.2601 0.0902,9.364 0.1721,9.4454L1.5758,10.8535C1.6294,10.9079 1.6933,10.951 1.7638,10.9805C1.8342,11.0099 1.9098,11.0251 1.9861,11.0251C2.0625,11.0251 2.1381,11.0099 2.2085,10.9805C2.279,10.951 2.3428,10.9079 2.3965,10.8535L4.854,8.3872C4.9605,8.2775 5.02,8.1307 5.02,7.9779C5.02,7.8251 4.9605,7.6783 4.854,7.5687ZM4.854,13.7907C4.8001,13.7364 4.736,13.6933 4.6654,13.6638C4.5948,13.6344 4.5191,13.6192 4.4426,13.6191C4.3661,13.6191 4.2903,13.6342 4.2197,13.6637C4.1491,13.6931 4.085,13.7363 4.0312,13.7907L1.9828,15.8434L0.995,14.8468C0.941,14.7928 0.8768,14.75 0.8062,14.7209C0.7356,14.6919 0.6599,14.677 0.5836,14.6774C0.5072,14.6769 0.4315,14.6917 0.3608,14.7208C0.2902,14.7498 0.2261,14.7927 0.1721,14.8468C0.0633,14.956 0.0022,15.104 0.0022,15.2582C0.0022,15.4124 0.0633,15.5603 0.1721,15.6696L1.5758,17.0799C1.6847,17.1886 1.8323,17.2496 1.9861,17.2496C2.14,17.2496 2.2876,17.1886 2.3965,17.0799L4.854,14.6091C4.9605,14.4995 5.02,14.3527 5.02,14.1999C5.02,14.0471 4.9605,13.9003 4.854,13.7907Z"
-            android:fillColor="#656A72" />
-    </group>
-</vector>

chatkit-ui/src/main/res/drawable/ic_message_recall.xml

@@ -5,11 +5,11 @@
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="18dp"
-    android:height="18dp"
-    android:viewportWidth="18"
-    android:viewportHeight="18">
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
     <path
         android:pathData="M10.425,4.3396H3.1728L5.4302,2.2102C5.7542,1.8822 5.8355,1.5622 5.5168,1.2475C5.1822,0.9168 4.8382,0.9182 4.5035,1.2475L1.4634,4.2636C1.2807,4.4476 0.974,4.6929 1.0034,4.9396L1.0167,5.0396L1.0034,5.141C0.9754,5.3863 1.1367,5.521 1.3127,5.6996L4.3888,8.7251C4.7235,9.0544 5.1822,9.1624 5.5168,8.8317C5.8355,8.5171 5.5968,8.0357 5.2808,7.717L3.1768,5.6996L10.425,5.6663C13.0597,5.6663 15.6532,7.989 15.6532,10.5865C15.6532,13.1839 13.0597,15.6666 10.425,15.6666H3.4528C2.9821,15.6666 2.8341,15.8666 2.8341,16.3386C2.8341,16.8107 2.9808,17 3.4528,17H10.4263C14.0518,17 16.9865,14.1186 16.9865,10.5865C16.9865,7.057 14.0531,4.3396 10.425,4.3396Z"
-        android:fillColor="#656A72" />
+        android:fillColor="#FFFFFF" />
 </vector>

chatkit-ui/src/main/res/drawable/ic_message_reply.xml

@@ -1,15 +0,0 @@
-<!--
-  ~ Copyright (c) 2022 NetEase, Inc. All rights reserved.
-  ~ Use of this source code is governed by a MIT license that can be
-  ~ found in the LICENSE file.
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="17dp"
-    android:height="17dp"
-    android:viewportWidth="17"
-    android:viewportHeight="17">
-    <path
-        android:pathData="M15.7857,14.5714H4.389L0,16.9927V7.2839V7.2845V1.2143C0,0.5434 0.5434,0 1.2143,0H15.7857C16.456,0 17,0.5434 17,1.2143V13.3571C17,14.0274 16.456,14.5714 15.7857,14.5714ZM15.7857,1.8214C15.7857,1.4863 15.5137,1.2143 15.1786,1.2143H1.8214C1.4863,1.2143 1.2143,1.4863 1.2143,1.8214V9.7137V12.75V14.5757L3.7345,13.3571H15.1786C15.5137,13.3571 15.7857,13.0851 15.7857,12.75V1.8214ZM11.5357,6.0714H3.0357C2.7006,6.0714 2.4286,5.7994 2.4286,5.4643C2.4286,5.1291 2.7006,4.8571 3.0357,4.8571H11.5357C11.8709,4.8571 12.1429,5.1291 12.1429,5.4643C12.1429,5.7994 11.8709,6.0714 11.5357,6.0714ZM3.0357,8.5H6.6786C7.0137,8.5 7.2857,8.772 7.2857,9.1071C7.2857,9.4423 7.0137,9.7143 6.6786,9.7143H3.0357C2.7006,9.7143 2.4286,9.4423 2.4286,9.1071C2.4286,8.772 2.7006,8.5 3.0357,8.5Z"
-        android:fillColor="#656A72" />
-</vector>

chatkit-ui/src/main/res/drawable/ic_message_sign.xml

@@ -13,12 +13,12 @@
         android:pathData="M14.9978,17.1021L14.9978,17.1026C14.9978,17.1465 14.9865,17.1897 14.9649,17.2279C14.9433,17.2661 14.9122,17.2981 14.8746,17.3207L15.206,17.8715L14.8746,17.3207C14.837,17.3434 14.7941,17.3559 14.7503,17.3571C14.7064,17.3582 14.6629,17.348 14.6242,17.3274L14.6241,17.3274L9.1846,14.4403C9.1845,14.4403 9.1845,14.4403 9.1844,14.4402C8.962,14.3222 8.7141,14.2604 8.4623,14.2604C8.2104,14.2604 7.9624,14.3222 7.74,14.4403L2.3031,17.3265L2.3024,17.3269C2.2637,17.3475 2.2202,17.3578 2.1763,17.3566C2.1324,17.3555 2.0896,17.343 2.0519,17.3204L1.7209,17.8715L2.0519,17.3204C2.0143,17.2978 1.9831,17.2658 1.9615,17.2276C1.9399,17.1894 1.9286,17.1462 1.9286,17.1023V17.1021V1.7944C1.9286,1.6431 1.9583,1.4934 2.0162,1.3537C2.0741,1.214 2.1589,1.087 2.2658,0.9801C2.3728,0.8732 2.4997,0.7884 2.6394,0.7305C2.7791,0.6726 2.9288,0.6429 3.0801,0.6429H13.8463C13.9975,0.6429 14.1472,0.6726 14.2869,0.7305L14.5316,0.1399L14.2869,0.7305C14.4266,0.7884 14.5536,0.8732 14.6605,0.9801C14.7674,1.087 14.8522,1.214 14.9101,1.3537C14.968,1.4934 14.9978,1.6431 14.9978,1.7944V17.1021Z"
         android:strokeWidth="1.28571"
         android:fillColor="#00000000"
-        android:strokeColor="#656A72" />
+        android:strokeColor="#FFFFFF" />
     <path
         android:pathData="M5.1428,8.3571L8.25,10.8758L12.2143,4.5"
         android:strokeLineJoin="round"
         android:strokeWidth="1.28571"
         android:fillColor="#00000000"
-        android:strokeColor="#656A72"
+        android:strokeColor="#FFFFFF"
         android:strokeLineCap="round" />
 </vector>

chatkit-ui/src/main/res/drawable/ic_message_transmit.xml

@@ -1,37 +0,0 @@
-<!--
-  ~ Copyright (c) 2022 NetEase, Inc. All rights reserved.
-  ~ Use of this source code is governed by a MIT license that can be
-  ~ found in the LICENSE file.
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="18dp"
-    android:height="18dp"
-    android:viewportWidth="18"
-    android:viewportHeight="18">
-    <path
-        android:pathData="M5.5,1H2C1.4477,1 1,1.4477 1,2V16C1,16.5523 1.4477,17 2,17H16C16.5523,17 17,16.5523 17,16V10"
-        android:strokeWidth="1.29"
-        android:fillColor="#00000000"
-        android:strokeColor="#656A72"
-        android:strokeLineCap="round" />
-    <path
-        android:pathData="M17,4H9C7.8954,4 7,4.8954 7,6V12"
-        android:strokeLineJoin="round"
-        android:strokeWidth="1.29"
-        android:fillColor="#00000000"
-        android:strokeColor="#656A72"
-        android:strokeLineCap="round" />
-    <path
-        android:pathData="M14,7L17,4"
-        android:strokeWidth="1.29"
-        android:fillColor="#00000000"
-        android:strokeColor="#656A72"
-        android:strokeLineCap="round" />
-    <path
-        android:pathData="M14,1L17,4"
-        android:strokeWidth="1.29"
-        android:fillColor="#00000000"
-        android:strokeColor="#656A72"
-        android:strokeLineCap="round" />
-</vector>

chatkit-ui/src/main/res/drawable/rectangle_white_reduce_bg.xml

@@ -8,8 +8,8 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <corners android:radius="@dimen/dimen_12_dp" />
+    <corners android:radius="@dimen/dimen_20_dp" />
 
-    <solid android:color="#F2F2F2" />
+    <solid android:color="#FFFFFF" />
 
 </shape>

chatkit-ui/src/main/res/drawable/shape_dialog_bg_new.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners android:radius="12dp" />
+    <corners android:radius="20dp" />
     <solid android:color="@color/color_white" />
 </shape>

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

@@ -13,7 +13,7 @@
     android:orientation="vertical">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="285dp"
+        android:layout_width="305dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         android:background="@drawable/rectangle_white_reduce_bg"
@@ -45,8 +45,8 @@
 
         <com.netease.yunxin.kit.common.ui.widgets.ContactAvatarView
             android:id="@+id/avatar"
-            android:layout_width="@dimen/dimen_40_dp"
-            android:layout_height="@dimen/dimen_40_dp"
+            android:layout_width="@dimen/dimen_56_dp"
+            android:layout_height="@dimen/dimen_56_dp"
             android:layout_marginTop="@dimen/dimen_15_dp"
             app:avatarCorner="@dimen/dimen_40_dp"
             app:layout_constraintStart_toStartOf="@+id/tv_title"
@@ -59,8 +59,8 @@
             android:layout_marginStart="@dimen/dimen_10_dp"
             android:layout_marginEnd="@dimen/dimen_20_dp"
             android:maxLines="1"
-            android:textColor="@color/color_383838"
-            android:textSize="@dimen/text_size_16"
+            android:textColor="@color/color_333333"
+            android:textSize="@dimen/text_size_18"
             app:layout_constraintBottom_toBottomOf="@+id/avatar"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/avatar"
@@ -73,7 +73,7 @@
             android:layout_marginStart="@dimen/dimen_20_dp"
             android:layout_marginTop="@dimen/dimen_15_dp"
             android:layout_marginEnd="@dimen/dimen_20_dp"
-            android:background="#EBE8F1"
+            android:background="#EEF0F4"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/avatar" />
@@ -86,18 +86,18 @@
             android:layout_marginTop="@dimen/dimen_15_dp"
             android:layout_marginEnd="@dimen/dimen_20_dp"
             android:textColor="@color/color_333333"
-            android:textSize="@dimen/text_size_14"
+            android:textSize="@dimen/text_size_16"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/baseline" />
 
         <EditText
             android:id="@+id/edit_inputcontent"
             android:layout_width="0dp"
-            android:layout_height="@dimen/dimen_40_dp"
+            android:layout_height="@dimen/dimen_52_dp"
             android:layout_marginStart="@dimen/dimen_20_dp"
             android:layout_marginTop="@dimen/dimen_15_dp"
             android:layout_marginEnd="@dimen/dimen_20_dp"
-            android:background="@drawable/bg_forward_confirm_input"
+            android:background="@drawable/bg_forward_confirm_input1"
             android:hint="@string/msg_forward_error_dialog_hint"
             android:maxLines="1"
             android:paddingStart="@dimen/dimen_15_dp"
@@ -136,7 +136,7 @@
             <TextView
                 android:id="@+id/tv_cancel"
                 android:layout_width="0dp"
-                android:layout_height="@dimen/dimen_40_dp"
+                android:layout_height="@dimen/dimen_52_dp"
                 android:layout_marginEnd="@dimen/dimen_7_dp"
                 android:layout_weight="1"
                 android:background="@drawable/bg_cancel_stroke"
@@ -149,7 +149,7 @@
             <TextView
                 android:id="@+id/tv_send"
                 android:layout_width="0dp"
-                android:layout_height="@dimen/dimen_40_dp"
+                android:layout_height="@dimen/dimen_52_dp"
                 android:layout_marginStart="@dimen/dimen_7_dp"
                 android:layout_weight="1"
                 android:background="@drawable/bg_sure_solide"

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

@@ -29,5 +29,5 @@
             android:layout_marginTop="@dimen/dimen_6_dp"
             android:maxLines="1"
             android:textSize="@dimen/text_size_14"
-            android:textColor="@color/color_333333" />
+            android:textColor="@color/color_white" />
 </LinearLayout>

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

@@ -9,14 +9,14 @@
         android:layout_width="22dp"
         android:layout_height="22dp"
         android:layout_gravity="center"
-        android:layout_marginBottom="30dp"
+        android:layout_marginBottom="20dp"
         android:src="@drawable/dialog_colose_red"
         android:visibility="invisible" />
 
     <RelativeLayout
         android:id="@+id/big_red_bg"
         android:layout_width="248dp"
-        android:layout_height="330dp"
+        android:layout_height="336dp"
         android:background="@drawable/dialog_red_packet_bg"
         android:orientation="vertical"
         android:visibility="visible">
@@ -93,7 +93,7 @@
             android:layout_height="72dp"
             android:layout_alignParentBottom="true"
             android:layout_centerHorizontal="true"
-            android:layout_marginBottom="50dp"
+            android:layout_marginBottom="70dp"
             android:src="@drawable/jinbi_ig" />
 
 
@@ -103,7 +103,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
             android:layout_centerHorizontal="true"
-            android:layout_marginBottom="20dp"
+            android:layout_marginBottom="35dp"
             android:drawableRight="@drawable/red_netx_img"
             android:drawablePadding="5dp"
             android:text="@string/look_get_info_red_txt"
@@ -228,7 +228,7 @@
         android:layout_width="30dp"
         android:layout_height="30dp"
         android:layout_gravity="center"
-        android:layout_marginTop="30dp"
+        android:layout_marginTop="20dp"
         android:src="@drawable/dialog_colose_red" />
 
 </LinearLayout>

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

@@ -73,25 +73,33 @@
 
             </TextView>
         </LinearLayout>
-
-        <TextView
-            android:id="@+id/mingpian_tv"
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dimen_15_dp"
-            android:layout_marginTop="@dimen/dimen_12_dp"
-            android:gravity="center_vertical"
-            android:textColor="#ffffffff"
-            android:textSize="@dimen/text_size_12" />
+            android:layout_height="match_parent"
+            android:orientation="horizontal">
+            <TextView
+                android:id="@+id/mingpian_tv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dimen_15_dp"
+                android:layout_marginTop="@dimen/dimen_12_dp"
+                android:layout_weight="1"
+                android:gravity="center_vertical"
+                android:textColor="#F9AA9A"
+                android:textSize="@dimen/text_size_12" />
+
+            <TextView
+                android:id="@+id/tv_lijinstatus"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dimen_12_dp"
+                android:gravity="center"
+                android:text=""
+                android:layout_marginEnd="@dimen/dimen_10_dp"
+                android:textColor="#ffffffff"
+                android:textSize="@dimen/text_size_10" />
+        </LinearLayout>
 
-        <TextView
-            android:id="@+id/tv_lijinstatus"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dimen_12_dp"
-            android:gravity="center"
-            android:textColor="#ffffffff"
-            android:textSize="@dimen/text_size_12" />
     </LinearLayout>
 
 </merge>

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

@@ -10,9 +10,10 @@
     <color name="photo_crop_highlight_color">#fff</color>
     <color name="title_transfer">#00000000</color>
     <color name="color_white">#FFFFFF</color>
-    <color name="color_333333">#333333</color>
+    <color name="color_333333">#2c2c2c</color>
     <color name="color_383838">#383838</color>
     <color name="color_fc596a">#fffc596a</color>
+    <color name="color_498afa">#498AFA</color>
     <color name="color_fee3e6">#fffee3e6</color>
     <color name="color_e3e4e4">#E3E4E4</color>
     <color name="color_fffbea">#FFFBEA</color>
@@ -87,7 +88,7 @@
     <color name="ps_color_0077F6">#0077F6</color>
     <color name="ps_color_E4E4E4">#E4E4E4</color>
     <color name="color_6b3689">#6B3689</color>
-    <color name="color_ffcad8">#8DE776</color>
+    <color name="color_ffcad8">#B0DBFF</color>
     <color name="color_f4f4f4">#f4f4f4</color>
     <color name="color_fcfcfc">#fcfcfc</color>
     <color name="color_7f7b81">#7F7B81</color>
@@ -103,6 +104,8 @@
     <color name="color_3e7be4">#3E7BE4</color>
     <color name="color_ff4e54">#ff4e54</color>
     <color name="color_2cca29">#2cca29</color>
-    <color name="color_fe6881">#FE6881</color>
+    <color name="color_fe6881">#FF4646</color>
     <color name="color_6d80ff">#6D80FF</color>
+    <color name="color_2c93fa">#2c93fa</color>
+
 </resources>