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

修改转账，付款等文案

Browse Source
This commit is contained in:
guozhen
2024-08-15 14:53:00 +08:00
committed by xuhuixiang
parent c929efd05e
commit 9de0a1fb84
42 changed files with 681 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/ChatMessageType.java
View File

@@ -63,7 +63,7 @@ public interface ChatMessageType {
int CUSTOM_STICKER_BUSINESS_CARD = 1003;
/**
* 转账
* 赠送
*/
int CUSTOM_STICKER_TRANSFER_ACCOUNTS = 1004;

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

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

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

@@ -49,7 +49,7 @@ public interface ApiService {
/**
* 正式环境
*/
// String URL = "https://api.letschat2023.com/";
// String URL = "https://api.letschat2023.com/";
/**
* 测试环境
@@ -97,13 +97,13 @@ public interface ApiService {
Observable<Result<RedpacketGroupBean>> redGroupGiftPacketInfo(@Path("recordId") String userId);
/**
* 接收转账
* 接收赠送
*/
@POST("/wallet/transferMoney/receive")
Observable<Result<TransferBean>> receiveTransferMoney(@Body Map<String, Object> requestBody);
/**
* 转账详情
* 赠送详情
*/
@GET("/wallet/transferMoney/{recordId}")
Observable<Result<TransferBean>> receiveTransferMoney(@Path("recordId") String recordId);

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

@@ -202,7 +202,7 @@ public class MessageBottomLayout extends FrameLayout
onToRedPacket();
break;
case ActionConstants.ACTION_TYPE_TRANSFER:
// ToastX.showShortToast("去转账");
// ToastX.showShortToast("去赠送");
onToTransfer();
break;

4
chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/view/input/ActionConstants.java
View File

@@ -70,12 +70,12 @@ public class ActionConstants {
public static final String ACTION_TYPE_GIFT_REDPACKET = "ACTION_TYPE_GIFT_REDPACKET";
/**
* 积分转账
* 积分赠送
*/
public static final String ACTION_TYPE_TRANSFER = "ACTION_TYPE_TRANSFER";
/**
* Cash转账
* Cash赠送
*/
public static final String ACTION_TYPE_TRANSFER_CASH = "ACTION_TYPE_TRANSFER_CASH";

4
chatkit-ui/src/main/res/layout/redpacket_viewhead.xml
View File

@@ -26,7 +26,7 @@
android:ellipsize="end"
android:gravity="center_vertical"
android:lines="1"
android:text="来自 黄黄不是嬛嬛 的转账"
android:text="来自 黄黄不是嬛嬛 的赠送"
android:textColor="#ffffffff"
android:textSize="14sp" />
@@ -39,7 +39,7 @@
android:ellipsize="end"
android:gravity="center_vertical"
android:lines="1"
android:text="待收款"
android:text="待領取"
android:textColor="#ffffffff"
android:textSize="12sp" />
</LinearLayout>

4
chatkit-ui/src/main/res/layout/transfer_viewhead.xml
View File

@@ -18,7 +18,7 @@
android:ellipsize="end"
android:visibility="gone"
android:id="@+id/item_title_tv"
android:text="来自 黄黄不是嬛嬛 的转账"
android:text="来自 黄黄不是嬛嬛 的赠送"
android:textColor="#ffffffff"
android:textSize="14sp"
/>
@@ -44,7 +44,7 @@
android:id="@+id/item_status_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="待收款"
android:text="待領取"
android:lines="1"
android:ellipsize="end"
android:textColor="#ffffffff"

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

@@ -115,7 +115,7 @@
<string name="chat_team_accept_ones_invent">accepted the group invitation from %s</string>
<string name="chat_team_verify_update">permissions updated to</string>
<string name="chat_team_manager_pass_ones_application">Agree the group apply from%s</string>
<string name="chat_team_remove_to_another">Transfer the group to</string>
<string name="chat_team_remove_to_another">Give away the group to</string>
<string name="chat_team_operate_by_manager">Admin by</string>
<string name="chat_team_mute">Mute</string>
<string name="chat_team_un_mute">Unmet</string>
@@ -217,8 +217,8 @@
<string name="chat_input_audio_record_title">Hold to Talk</string>
<string name="zidingyi_txt">Custom</string>
<string name="hongbao_txt">Red envelope</string>
<string name="zhuanzhang_txtq">Points Transfer</string>
<string name="zhuanzhang_cash_txtq">Cash Transfer</string>
<string name="zhuanzhang_txtq">Points Give away</string>
<string name="zhuanzhang_cash_txtq">Cash Give away</string>
<string name="mingpian_txt">Business card</string>
<string name="fasongweizhi_txt">Sending location</string>
<string name="sharealbums_txt">Share Album</string>
@@ -243,11 +243,11 @@
<string name="fun_chat_audio_record_max_time_tips">Recording will stop after %d \"</string>
<string name="fun_chat_input_hint_tips">Please enter the chat content</string>
<string name="fun_chat_audio_record_hint">Click to start recording</string>
<string name="zhuangzhang_chat_txt">[Transfer]</string>
<string name="jinbizhuanzhang_des_txt">Taomenggo chat Cash transfer</string>
<string name="xiangshuizhuanzhang_txt">Transfer to %s</string>
<string name="xiangshuizhuanzhang1_txt">Transfer from %s</string>
<string name="jinbizhuanzhang_des_txt1">Taomenggo Gift Points Transfer</string>
<string name="zhuangzhang_chat_txt">[Give away]</string>
<string name="jinbizhuanzhang_des_txt">Taomenggo chat Cash Give away</string>
<string name="xiangshuizhuanzhang_txt">Give away to %s</string>
<string name="xiangshuizhuanzhang1_txt">Give away from %s</string>
<string name="jinbizhuanzhang_des_txt1">Taomenggo Gift Points Give away</string>
<string name="remarks_hit_txt">Congratulations on getting rich and good luck</string>
<string name="daishoukuan_txt1">Pending payment</string>
<string name="received_txt1">Received</string>
@@ -286,7 +286,7 @@
<string name="jinjinlianxi_txt">Recent Contact</string>
<string name="tebieguanxin_txt">Special concern</string>
<string name="dailinqu_txt2">Click to claim</string>
<string name="no_to_black_zhuanzhang_tv">Cannot transfer funds to blacklisted users</string>
<string name="no_to_black_zhuanzhang_tv">Cannot Give away funds to blacklisted users</string>
<string name="no_to_black_hongbao_tv">Unable to send red packets to blacklisted users</string>
<string name="no_to_black_mingpian_tv">Unable to send business cards to blacklisted users</string>
<string name="no_to_black_chat_tv">Blocked, please unblock to resume the conversation</string>

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

@@ -217,7 +217,7 @@
<string name="chat_input_audio_record_title">長押しして話す</string>
<string name="zidingyi_txt">カスタマイズ済み</string>
<string name="hongbao_txt">赤い封筒</string>
<string name="zhuanzhang_txtq">ポイント振替</string>
<string name="zhuanzhang_txtq">ポイント贈与</string>
<string name="zhuanzhang_cash_txtq">Cash転送</string>
<string name="mingpian_txt">名刺</string>
<string name="fasongweizhi_txt">送信場所</string>
@@ -287,7 +287,7 @@
<string name="jinjinlianxi_txt">最近の連絡先</string>
<string name="tebieguanxin_txt">特別な懸念</string>
<string name="dailinqu_txt2">クリックして受け取る</string>
<string name="no_to_black_zhuanzhang_tv">ブラックリストユーザーへの振替はできません</string>
<string name="no_to_black_zhuanzhang_tv">ブラックリストユーザーへの贈与はできません</string>
<string name="no_to_black_hongbao_tv">ブラックリストユーザーにお年玉を送信できませんでした</string>
<string name="no_to_black_mingpian_tv">ブラックリストユーザーに名刺を送信できませんでした</string>
<string name="no_to_black_chat_tv">ブロックされています。会話を再開するにはブロックを解除してください</string>

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

@@ -216,8 +216,8 @@
<string name="chat_input_audio_record_title">按住 说话</string>
<string name="zidingyi_txt">自定义</string>
<string name="hongbao_txt">红包</string>
<string name="zhuanzhang_txtq">积分转账</string>
<string name="zhuanzhang_cash_txtq">Cash 转账</string>
<string name="zhuanzhang_txtq">积分赠送</string>
<string name="zhuanzhang_cash_txtq">Cash 赠送</string>
<string name="mingpian_txt">名片</string>
<string name="fasongweizhi_txt">发送位置</string>
<string name="sharealbums_txt">分享相册</string>
@@ -243,13 +243,13 @@
<string name="fun_chat_audio_record_max_time_tips">%d \" 后将停止录音</string>
<string name="fun_chat_input_hint_tips">请输入聊天内容</string>
<string name="fun_chat_audio_record_hint">点击开始录音</string>
<string name="zhuangzhang_chat_txt">[转账]</string>
<string name="jinbizhuanzhang_des_txt">淘夢購 Cash转账</string>
<string name="xiangshuizhuanzhang_txt">向 %s 转账</string>
<string name="xiangshuizhuanzhang1_txt">来自 %s 的转账</string>
<string name="jinbizhuanzhang_des_txt1">淘夢購 礼品积分转账</string>
<string name="zhuangzhang_chat_txt">[赠送]</string>
<string name="jinbizhuanzhang_des_txt">淘夢購 Cash赠送</string>
<string name="xiangshuizhuanzhang_txt">向 %s 赠送</string>
<string name="xiangshuizhuanzhang1_txt">来自 %s 的赠送</string>
<string name="jinbizhuanzhang_des_txt1">淘夢購 礼品积分赠送</string>
<string name="remarks_hit_txt">恭喜发财，大吉大利</string>
<string name="daishoukuan_txt1">待收款</string>
<string name="daishoukuan_txt1">待領取</string>
<string name="received_txt1">已领取</string>
<string name="yituihuan_txt">已退还</string>
<string name="received_txt2">已领取</string>
@@ -286,7 +286,7 @@
<string name="jinjinlianxi_txt">最近联系</string>
<string name="tebieguanxin_txt">特别关心</string>
<string name="dailinqu_txt2">点击领取</string>
<string name="no_to_black_zhuanzhang_tv">不能向黑名单用户转账</string>
<string name="no_to_black_zhuanzhang_tv">不能向黑名单用户赠送</string>
<string name="no_to_black_hongbao_tv">无法向黑名单用户发送红包</string>
<string name="no_to_black_mingpian_tv">无法向黑名单用户发送名片</string>
<string name="no_to_black_chat_tv">屏蔽中，恢复对话请取消屏蔽</string>

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

@@ -216,8 +216,8 @@
<string name="chat_input_audio_record_title">按住 說話</string>
<string name="zidingyi_txt">自訂</string>
<string name="hongbao_txt">紅包</string>
<string name="zhuanzhang_txtq">積分轉帳</string>
<string name="zhuanzhang_cash_txtq">Cash轉帳</string>
<string name="zhuanzhang_txtq">積分贈送</string>
<string name="zhuanzhang_cash_txtq">Cash贈送</string>
<string name="mingpian_txt">名片</string>
<string name="fasongweizhi_txt">發送位置</string>
<string name="sharealbums_txt">分享相簿</string>
@@ -243,13 +243,13 @@
<string name="fun_chat_input_hint_tips">請輸入聊天內容</string>
<string name="fun_chat_audio_record_hint">點擊開始錄音</string>
<string name="zhuangzhang_chat_txt">[轉帳]</string>
<string name="jinbizhuanzhang_des_txt">淘夢購 Cash轉帳</string>
<string name="xiangshuizhuanzhang_txt">向 %s 轉帳</string>
<string name="xiangshuizhuanzhang1_txt">來自 %s 的轉帳</string>
<string name="jinbizhuanzhang_des_txt1">淘夢購 禮品積分轉帳</string>
<string name="zhuangzhang_chat_txt">[贈送]</string>
<string name="jinbizhuanzhang_des_txt">淘夢購 Cash贈送</string>
<string name="xiangshuizhuanzhang_txt">向 %s 贈送</string>
<string name="xiangshuizhuanzhang1_txt">來自 %s 的贈送</string>
<string name="jinbizhuanzhang_des_txt1">淘夢購 禮品積分贈送</string>
<string name="remarks_hit_txt">恭喜發財，大吉大利</string>
<string name="daishoukuan_txt1">待收款</string>
<string name="daishoukuan_txt1">待領取</string>
<string name="received_txt1">已領取</string>
<string name="yituihuan_txt">已退還</string>
<string name="received_txt2">已領取</string>
@@ -286,7 +286,7 @@
<string name="jinjinlianxi_txt">最近聯繫</string>
<string name="tebieguanxin_txt">特別關心</string>
<string name="dailinqu_txt2">點擊領取</string>
<string name="no_to_black_zhuanzhang_tv">不能向黑名單用戶轉帳</string>
<string name="no_to_black_zhuanzhang_tv">不能向黑名單用戶贈送</string>
<string name="no_to_black_hongbao_tv">無法向黑名單用戶發送紅包</string>
<string name="no_to_black_mingpian_tv">無法向黑名單用戶發送名片</string>
<string name="no_to_black_chat_tv">屏蔽中，恢復對話請取消屏蔽</string>