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

MM 礼品积分红包修改

Browse Source
This commit is contained in:
guozhen
2024-12-25 11:11:50 +08:00
committed by xuhuixiang
parent 16e4cc297e
commit f896b16ffd
23 changed files with 391 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

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

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

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

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

2
chatkit-ui/src/main/res/layout/dialog_get_red_packet.xml
View File

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

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

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

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

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

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

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

8
chatkit-ui/src/main/res/values-zh/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>
@@ -256,7 +256,7 @@
<string name="yituihuan_txt1">已退还</string>
<string name="yiguoqi_txt1">已过期</string>
<string name="hongbao_des_txt">MM Cash红包</string>
<string name="hongbao_des_txt1">MM 银币红包</string>
<string name="hongbao_des_txt1">MM 礼品积分红包</string>
<string name="hongbao_chat_txt">[红包]</string>
<string name="dailinqu_txt1">待领取</string>
<string name="look_get_info_red_txt">查看领取详情</string>
@@ -265,8 +265,8 @@
<string name="redexpired_txt">红包超过24小时，无法领取</string>
<string name="s_font_color_fc605c_font_txt"><![CDATA[%s领取了你的<font color = \'#FC605C\'>Cash红包</font>]]></string>
<string name="s_font_color_fc605c_font_txt1"><![CDATA[你领取了%s的<font color = \'#FC605C\'>Cash红包</font>]]></string>
<string name="s_font_color_629cff_font_txt"><![CDATA[%s领取了你的<font color = \'#629CFF\'>银币红包</font>]]></string>
<string name="s_font_color_629cff_font_txt1"><![CDATA[你领取了%s的<font color = \'#629CFF\'>银币红包</font>]]></string>
<string name="s_font_color_629cff_font_txt"><![CDATA[%s领取了你的<font color = \'#629CFF\'>礼品积分红包</font>]]></string>
<string name="s_font_color_629cff_font_txt1"><![CDATA[你领取了%s的<font color = \'#629CFF\'>礼品积分红包</font>]]></string>
<string name="s_font_color_gift_font_txt"><![CDATA[%s领取了你的<font color = \'#FC605C\'>礼金红包</font>]]></string>
<string name="s_font_color_gift_font_txt1"><![CDATA[你领取了%s的<font color = \'#FC605C\'>礼金红包</font>]]></string>
<string name="ni_txt">你</string>

8
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>
@@ -256,7 +256,7 @@
<string name="yituihuan_txt1">已退還</string>
<string name="yiguoqi_txt1">已過期</string>
<string name="hongbao_des_txt">MM Cash紅包</string>
<string name="hongbao_des_txt1">MM 銀幣紅包</string>
<string name="hongbao_des_txt1">MM 禮品積分紅包</string>
<string name="hongbao_chat_txt">[紅包]</string>
<string name="dailinqu_txt1">待領取</string>
<string name="look_get_info_red_txt">查看領取詳情</string>
@@ -265,8 +265,8 @@
<string name="redexpired_txt">紅包超過24小時，無法領取</string>
<string name="s_font_color_fc605c_font_txt"><![CDATA[%s領取了你的<font color = \'#FC605C\'>Cash紅包</font>]]></string>
<string name="s_font_color_fc605c_font_txt1"><![CDATA[你領取%s的<font color = \'#FC605C\'>Cash紅包</font>]]></string>
<string name="s_font_color_629cff_font_txt"><![CDATA[%s領取了你的<font color = \'#629CFF\'>銀幣紅包</font>]]></string>
<string name="s_font_color_629cff_font_txt1"><![CDATA[你領取了%s的<font color = \'#629CFF\'>銀幣紅包</font>]]></string>
<string name="s_font_color_629cff_font_txt"><![CDATA[%s領取了你的<font color = \'#629CFF\'>禮品積分紅包</font>]]></string>
<string name="s_font_color_629cff_font_txt1"><![CDATA[你領取了%s的<font color = \'#629CFF\'>禮品積分紅包</font>]]></string>
<string name="s_font_color_gift_font_txt"><![CDATA[%s領取了你的<font color = \'#FC605C\'>禮金紅包</font>]]></string>
<string name="s_font_color_gift_font_txt1"><![CDATA[你領取%s的<font color = \'#FC605C\'>禮金紅包</font>]]></string>
<string name="ni_txt">你</string>