xuhuixiang/yuliao_and
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

第N+3次提交 还缺专属红包

Browse Source
This commit is contained in:
xuhuixiang
2025-04-29 11:30:48 +08:00
parent 725426ea65
commit b07055fe3f
23 changed files with 296 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/custom/RedPacketGetViewHolder.java
View File

@@ -53,7 +53,7 @@ public class RedPacketGetViewHolder extends ChatBaseMessageViewHolder {
public void addViewToMessageContainer() {
textBinding =
NormalChatMessageTipViewHolder1Binding.inflate(
LayoutInflater.from(parent.getContext()), getMessageTopGroup(), true);
LayoutInflater.from(parent.getContext()), getMessageContainer(), true);
}
@Override
@@ -243,7 +243,8 @@ public class RedPacketGetViewHolder extends ChatBaseMessageViewHolder {
}
}
baseViewBinding.tvTimeOther.setVisibility(View.GONE);
baseViewBinding.tvTimeMy.setVisibility(View.GONE);
}

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

@@ -65,18 +65,25 @@ public class FunBottomActionFactory {
}
if (isAdd) {
actions.add(new ActionItem(ActionConstants.ACTION_TYPE_MINGPIAN, R.drawable.ic_action_mingpian, R.string.mingpian_txt));
}
}
if (sessionType == SessionTypeEnum.Team || sessionType == SessionTypeEnum.SUPER_TEAM) {
actions.add(new ActionItem(ActionConstants.ACTION_TYPE_REP_PACKET, R.drawable.ic_action_red_packet, R.string.hongbao_txt));
}
// actions.add(
// new ActionItem(
// ActionConstants.ACTION_TYPE_LOCATION,
// R.drawable.ic_location1,
// R.string.chat_message_location));
actions.add(new ActionItem(ActionConstants.ACTION_TYPE_ALBUMS, R.drawable.ic_action_share_albums, R.string.sharealbums_txt));
if (getConfig(IMKitClient.getApplicationContext(), "redpkg_score", false)) { //积分赠送
//礼品积分红包
actions.add(new ActionItem(ActionConstants.ACTION_TYPE_REP_PACKET, R.drawable.ic_action_red_packet, R.string.hongbao_txt));
}
// actions.add(new ActionItem(ActionConstants.ACTION_TYPE_ALBUMS, R.drawable.ic_action_share_albums, R.string.sharealbums_txt));
// if (getConfig(IMKitClient.getApplicationContext(), "redpkg_score", false)) { //积分赠送
// //礼品积分红包
// actions.add(new ActionItem(ActionConstants.ACTION_TYPE_REP_PACKET, R.drawable.ic_action_red_packet, R.string.hongbao_txt));
// }
//赠送功能入口
// if (sessionType == SessionTypeEnum.P2P) {
// if (getConfig(IMKitClient.getApplicationContext(), "transfer_score", false)) { //积分赠送

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

@@ -255,7 +255,7 @@
<string name="received_txt2">has been received</string>
<string name="yituihuan_txt1">has been returned</string>
<string name="yiguoqi_txt1">expired</string>
<string name="hongbao_des_txt">MM Cash red envelope</string>
<string name="hongbao_des_txt">red envelope</string>
<string name="hongbao_des_txt1">MM Gift Points Red Envelope</string>
<string name="hongbao_chat_txt">[红包]</string>
<string name="dailinqu_txt1">To be collected</string>

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

@@ -256,7 +256,7 @@
<string name="received_txt2">受信しました</string>
<string name="yituihuan_txt1">返品されました</string>
<string name="yiguoqi_txt1">期限切れ</string>
<string name="hongbao_des_txt">MM Cashの赤い封筒</string>
<string name="hongbao_des_txt">の赤い封筒</string>
<string name="hongbao_des_txt1">MMギフトポイントの赤い封筒</string>
<string name="hongbao_chat_txt">[红包]</string>
<string name="dailinqu_txt1">収集対象</string>

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

@@ -255,7 +255,7 @@
<string name="received_txt2">已领取</string>
<string name="yituihuan_txt1">已退还</string>
<string name="yiguoqi_txt1">已过期</string>
<string name="hongbao_des_txt">MM Cash红包</string>
<string name="hongbao_des_txt">红包</string>
<string name="hongbao_des_txt1">MM 礼品积分红包</string>
<string name="hongbao_chat_txt">[红包]</string>
<string name="dailinqu_txt1">待领取</string>
@@ -263,9 +263,9 @@
<string name="fachudehongbao_txt">%s 发出的红包</string>
<string name="manle_end_txt">手慢了，红包抢完啦</string>
<string name="redexpired_txt">红包超过24小时，无法领取</string>
<string name="s_font_color_fc605c_font_txt"><![CDATA[%s领取了你的Cash红包]]></string>
<string name="s_font_color_fc605c_font_txt1"><![CDATA[你领取了%s的Cash红包]]></string>
<string name="s_font_color_fc605c_font_txt2"><![CDATA[%s领取了%s的Cash红包]]></string>
<string name="s_font_color_fc605c_font_txt"><![CDATA[%s领取了你的红包]]></string>
<string name="s_font_color_fc605c_font_txt1"><![CDATA[你领取了%s的红包]]></string>
<string name="s_font_color_fc605c_font_txt2"><![CDATA[%s领取了%s的红包]]></string>
<string name="s_font_color_629cff_font_txt"><![CDATA[%s领取了你的礼品积分红包]]></string>
<string name="s_font_color_629cff_font_txt1"><![CDATA[你领取了%s的礼品积分红包]]></string>

10
chatkit-ui/src/main/res/values/strings.xml
View File

@@ -215,7 +215,7 @@
<string name="chat_input_more_album_title">相簿</string>
<string name="chat_input_audio_record_title">按住 說話</string>
<string name="zidingyi_txt">自訂</string>
<string name="hongbao_txt">積分紅包</string>
<string name="hongbao_txt">紅包</string>
<string name="zhuanzhang_txtq">積分贈送</string>
<string name="zhuanzhang_cash_txtq">Cash贈送</string>
<string name="mingpian_txt">名片</string>
@@ -255,7 +255,7 @@
<string name="received_txt2">已領取</string>
<string name="yituihuan_txt1">已退還</string>
<string name="yiguoqi_txt1">已過期</string>
<string name="hongbao_des_txt">MM Cash紅包</string>
<string name="hongbao_des_txt">紅包</string>
<string name="hongbao_des_txt1">MM 禮品積分紅包</string>
<string name="hongbao_chat_txt">[紅包]</string>
<string name="dailinqu_txt1">待領取</string>
@@ -263,9 +263,9 @@
<string name="fachudehongbao_txt">%s 發出的紅包</string>
<string name="manle_end_txt">手慢了，紅包搶完啦</string>
<string name="redexpired_txt">紅包超過24小時，無法領取</string>
<string name="s_font_color_fc605c_font_txt"><![CDATA[%s領取了你的Cash紅包]]></string>
<string name="s_font_color_fc605c_font_txt1"><![CDATA[你領取%s的Cash紅包]]></string>
<string name="s_font_color_fc605c_font_txt2"><![CDATA[%s領取%s的Cash紅包]]></string>
<string name="s_font_color_fc605c_font_txt"><![CDATA[%s領取了你的紅包]]></string>
<string name="s_font_color_fc605c_font_txt1"><![CDATA[你領取%s的紅包]]></string>
<string name="s_font_color_fc605c_font_txt2"><![CDATA[%s領取%s的紅包]]></string>
<string name="s_font_color_629cff_font_txt"><![CDATA[%s領取了你的禮品積分紅包]]></string>
<string name="s_font_color_629cff_font_txt1"><![CDATA[你領取了%s的禮品積分紅包]]></string>