第N+1次提交
This commit is contained in:
@@ -78,14 +78,14 @@ public class FunBottomActionFactory {
|
||||
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)) { //积分赠送
|
||||
actions.add(new ActionItem(ActionConstants.ACTION_TYPE_TRANSFER, R.drawable.ic_action_tur, R.string.zhuanzhang_txtq));
|
||||
}
|
||||
// if (getConfig(IMKitClient.getApplicationContext(), "transfer_cash", false)) { //cash赠送
|
||||
// actions.add(new ActionItem(ActionConstants.ACTION_TYPE_TRANSFER_CASH, R.drawable.ic_action_tur, R.string.zhuanzhang_cash_txtq));
|
||||
// if (sessionType == SessionTypeEnum.P2P) {
|
||||
// if (getConfig(IMKitClient.getApplicationContext(), "transfer_score", 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赠送
|
||||
//// actions.add(new ActionItem(ActionConstants.ACTION_TYPE_TRANSFER_CASH, R.drawable.ic_action_tur, R.string.zhuanzhang_cash_txtq));
|
||||
//// }
|
||||
// }
|
||||
// actions.add(
|
||||
// new ActionItem(
|
||||
// ActionConstants.ACTION_TYPE_FILE, R.drawable.ic_send_file, R.string.chat_message_file));
|
||||
|
||||
@@ -60,9 +60,9 @@ public class BottomActionFactory {
|
||||
// }
|
||||
if(sessionType == SessionTypeEnum.P2P||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));
|
||||
if(sessionType == SessionTypeEnum.P2P) {
|
||||
actions.add(new ActionItem(ActionConstants.ACTION_TYPE_TRANSFER, R.drawable.ic_action_tur, R.string.zhuanzhang_txtq));
|
||||
}
|
||||
// if(sessionType == SessionTypeEnum.P2P) {
|
||||
// actions.add(new ActionItem(ActionConstants.ACTION_TYPE_TRANSFER, R.drawable.ic_action_tur, R.string.zhuanzhang_txtq));
|
||||
// }
|
||||
actions.add(new ActionItem(ActionConstants.ACTION_TYPE_MINGPIAN,R.drawable.ic_action_mingpian,R.string.mingpian_txt));
|
||||
|
||||
}
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 3.3 KiB |
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user