From b07055fe3fb2bcb9236ea50b935247fd0222ed44 Mon Sep 17 00:00:00 2001 From: xuhuixiang Date: Tue, 29 Apr 2025 11:30:48 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AC=ACN+3=E6=AC=A1=E6=8F=90=E4=BA=A4=20?= =?UTF-8?q?=E8=BF=98=E7=BC=BA=E4=B8=93=E5=B1=9E=E7=BA=A2=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hbl/lewan/login/RegisterActivity.java | 24 +- .../hbl/lewan/main/chat/ChatTabFragment.java | 18 +- .../com/hbl/lewan/main/mine/MineFragment.java | 2 +- .../lewan/main/mine/UserHeadEditActivity.java | 21 +- .../java/com/hbl/lewan/model/LoginBean.java | 3 + .../java/com/hbl/lewan/model/RedBean.java | 67 +++++ .../java/com/hbl/lewan/model/RedLogBean.java | 12 +- .../lewan/redpack/SendRedPacketActivity.java | 57 ++--- .../wallet/BindWeChatOrAliPayActivity.java | 21 +- .../com/hbl/lewan/wallet/TiXianActivity.java | 4 + .../hbl/lewan/wallet/WalletInfoFragment.java | 242 ++++-------------- .../lewan/wallet/WalletInfoRedFragment.java | 74 ++---- .../lewan/wallet/WalletInfologFragment.java | 6 +- app/src/main/res/layout/fragment_chat.xml | 3 + .../main/res/layout/fragment_wallet_info.xml | 2 + .../res/layout/fragment_wallet_info_new.xml | 4 +- app/src/main/res/layout/item_bill_list1.xml | 69 +++++ .../ui/custom/RedPacketGetViewHolder.java | 5 +- .../view/input/FunBottomActionFactory.java | 17 +- chatkit-ui/src/main/res/values-en/strings.xml | 2 +- chatkit-ui/src/main/res/values-ja/strings.xml | 2 +- chatkit-ui/src/main/res/values-zh/strings.xml | 8 +- chatkit-ui/src/main/res/values/strings.xml | 10 +- 23 files changed, 296 insertions(+), 377 deletions(-) create mode 100644 app/src/main/java/com/hbl/lewan/model/RedBean.java create mode 100644 app/src/main/res/layout/item_bill_list1.xml diff --git a/app/src/main/java/com/hbl/lewan/login/RegisterActivity.java b/app/src/main/java/com/hbl/lewan/login/RegisterActivity.java index 0c92e9a..caa6cfe 100644 --- a/app/src/main/java/com/hbl/lewan/login/RegisterActivity.java +++ b/app/src/main/java/com/hbl/lewan/login/RegisterActivity.java @@ -949,40 +949,22 @@ public class RegisterActivity extends BaseActivity { private void toQIiNiuYunOss(File file) { - String updatePathPic = "postHomepageBackground"; String updatePathPicHead = "userAvatarFileName"; - -// new Handler().post(() -> QiNiuTool.upload(convertFileToBytes(file))); UploadOptions options = new UploadOptions(null, null, true, (key, percent) -> { - LogUtils.i("结果是啥进度：" + percent); }, () -> { - LogUtils.i("结果是啥进度112222222111："); return false; }); -// Zone zone = FixedZone.zoneAs0; Configuration configuration = new Configuration.Builder() -// .connectTimeout(10) // 链接超时。默认10秒 -// .responseTimeout(60) // 服务器响应超时。默认60秒 -// .zone(zone) // 设置区域，不指定会自动选择。指定不同区域的上传域名、备用域名、备用IP。 .build(); UploadManager uploadManager = new UploadManager(configuration); String fileName = UUID.randomUUID().toString() + "_" + file.getName(); - LogUtils.i("结果是啥开始：" + stsCredentialsBean + ";;" + file.getAbsolutePath()); -// Uri uri = FileUtils.getMediaUriFromPath(file.getAbsolutePath(),UserHeadEditActivity.this); -// GPX2hnRdNpAvovOSZGrhMxtaa6JP2mPvJ96-tdmD -// immchat - +// LogUtils.i("结果是啥开始：" + stsCredentialsBean + ";;" + file.getAbsolutePath()); String files = "media/" + updatePathPicHead + "/" + fileName; - - - byte[] sss = convertFileToBytes(file); - LogUtils.i("结果是啥开始：" + sss); - - uploadManager.put(sss, files, stsCredentialsBean, (key, info, response) -> { + uploadManager.put(file, files, stsCredentialsBean, (key, info, response) -> { // LogUtils.i("结果是啥2：" + GsonUtils.beanToJSONString(info)); - LogUtils.i("结果是啥2：" + GsonUtils.beanToJSONString(response)); +// LogUtils.i("结果是啥2：" + GsonUtils.beanToJSONString(response)); dimessLoadingDialog(); if (info != null && info.isOK()) { // 上传成功 diff --git a/app/src/main/java/com/hbl/lewan/main/chat/ChatTabFragment.java b/app/src/main/java/com/hbl/lewan/main/chat/ChatTabFragment.java index 1ebc0c3..154608c 100644 --- a/app/src/main/java/com/hbl/lewan/main/chat/ChatTabFragment.java +++ b/app/src/main/java/com/hbl/lewan/main/chat/ChatTabFragment.java @@ -74,7 +74,7 @@ public class ChatTabFragment extends BaseFragment { ChatConversationFragment allConversationFragment; ChatConversationFragment friendConversationFragment; ChatConversationFragment teamConversationFragment; - FollowListFragment followListFragment; +// FollowListFragment followListFragment; private FragmentAdapter fragmentAdapter; private View mCurrentTab; @@ -115,9 +115,9 @@ public class ChatTabFragment extends BaseFragment { if (type == 2) { deleteMoreConversation(2, conversationEditEvent.getList()); } - if (type == 3) { - followListFragment.updateConversation(conversationEditEvent.getList()); - } +// if (type == 3) { +// followListFragment.updateConversation(conversationEditEvent.getList()); +// } } @NonNull @@ -315,10 +315,10 @@ public class ChatTabFragment extends BaseFragment { public void initView() { tabView = new View[]{viewBinding.layoutChatfmAll, viewBinding.layoutChatfmFriends, viewBinding.layoutChatfmGroup, viewBinding.layoutChatfmFollow}; fragments.add(allConversationFragment = ChatConversationFragment.newInstance(0)); - fragments.add(friendConversationFragment = ChatConversationFragment.newInstance(1)); - fragments.add(teamConversationFragment = ChatConversationFragment.newInstance(2)); - followListFragment = new FollowListFragment(); - fragments.add(followListFragment); +// fragments.add(friendConversationFragment = ChatConversationFragment.newInstance(1)); +// fragments.add(teamConversationFragment = ChatConversationFragment.newInstance(2)); +// followListFragment = new FollowListFragment(); +// fragments.add(followListFragment); fragmentAdapter = new FragmentAdapter(this); @@ -331,7 +331,7 @@ public class ChatTabFragment extends BaseFragment { viewBinding.layoutChatfmAll.setOnClickListener(this::chatClick); viewBinding.layoutChatfmFriends.setOnClickListener(this::chatClick); viewBinding.layoutChatfmGroup.setOnClickListener(this::chatClick); - viewBinding.layoutChatfmFollow.setOnClickListener(this::chatClick); +// viewBinding.layoutChatfmFollow.setOnClickListener(this::chatClick); viewBinding.viewSettingclick.setOnClickListener(view -> { startActivity(new Intent(getActivity(), EditChatRecordlistActivity.class).putExtra("groupIds", groupIds)); diff --git a/app/src/main/java/com/hbl/lewan/main/mine/MineFragment.java b/app/src/main/java/com/hbl/lewan/main/mine/MineFragment.java index 970b9c8..f27182b 100644 --- a/app/src/main/java/com/hbl/lewan/main/mine/MineFragment.java +++ b/app/src/main/java/com/hbl/lewan/main/mine/MineFragment.java @@ -537,7 +537,7 @@ public class MineFragment extends BaseFragment { Api.getInstance().walletInfo(IMKitClient.account()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new BaseObserver>() { + .subscribe(new BaseObserver<>() { @Override public void onSuccess(Result feedbackResp) { diff --git a/app/src/main/java/com/hbl/lewan/main/mine/UserHeadEditActivity.java b/app/src/main/java/com/hbl/lewan/main/mine/UserHeadEditActivity.java index dd8ff72..83c853a 100644 --- a/app/src/main/java/com/hbl/lewan/main/mine/UserHeadEditActivity.java +++ b/app/src/main/java/com/hbl/lewan/main/mine/UserHeadEditActivity.java @@ -308,49 +308,30 @@ public class UserHeadEditActivity extends BaseActivity implements CommonCallback private void toQIiNiuYunOss(File file, boolean isHead) { String updatePathPic = "postHomepageBackground"; String updatePathPicHead = "userAvatarFileName"; - -// new Handler().post(() -> QiNiuTool.upload(convertFileToBytes(file))); UploadOptions options = new UploadOptions(null, null, true, (key, percent) -> { - LogUtils.i("结果是啥进度：" + percent); }, () -> { - LogUtils.i("结果是啥进度112222222111："); return false; }); -// Zone zone = FixedZone.zoneAs0; Configuration configuration = new Configuration.Builder() -// .connectTimeout(10) // 链接超时。默认10秒 -// .responseTimeout(60) // 服务器响应超时。默认60秒 -// .zone(zone) // 设置区域，不指定会自动选择。指定不同区域的上传域名、备用域名、备用IP。 .build(); UploadManager uploadManager = new UploadManager(configuration); String fileName = UUID.randomUUID().toString() + "_" + file.getName(); LogUtils.i("结果是啥开始：" + stsCredentialsBean + ";;" + file.getAbsolutePath()); -// Uri uri = FileUtils.getMediaUriFromPath(file.getAbsolutePath(),UserHeadEditActivity.this); -// GPX2hnRdNpAvovOSZGrhMxtaa6JP2mPvJ96-tdmD -// immchat - String files = "media/" + updatePathPic + "/" + fileName; if (isHead) { files = "media/" + updatePathPicHead + "/" + fileName; } - byte[] sss = convertFileToBytes(file); - LogUtils.i("结果是啥开始：" + sss); - - uploadManager.put(sss, files, stsCredentialsBean, (key, info, response) -> { -// LogUtils.i("结果是啥2：" + GsonUtils.beanToJSONString(info)); - LogUtils.i("结果是啥2：" + GsonUtils.beanToJSONString(response)); + uploadManager.put(file, files, stsCredentialsBean, (key, info, response) -> { dimessLoadingDialog(); if (info != null && info.isOK()) { // 上传成功 try { if (isHead) { - LogUtils.i("地址是啥：" + response.getString("key")); toPush(IMUIKitConfig.OSS_URL + response.getString("key"), isHead); } else { - LogUtils.i("地址是啥：" + response.getString("key")); toPush(response.getString("key"), isHead); } } catch (JSONException e) { diff --git a/app/src/main/java/com/hbl/lewan/model/LoginBean.java b/app/src/main/java/com/hbl/lewan/model/LoginBean.java index f623301..8c38fe8 100644 --- a/app/src/main/java/com/hbl/lewan/model/LoginBean.java +++ b/app/src/main/java/com/hbl/lewan/model/LoginBean.java @@ -96,6 +96,9 @@ public class LoginBean extends RosterElementEntity { } public Integer getIsFollow() { + if(isFollow == null){ + return 0; + } return isFollow; } diff --git a/app/src/main/java/com/hbl/lewan/model/RedBean.java b/app/src/main/java/com/hbl/lewan/model/RedBean.java new file mode 100644 index 0000000..c4397ae --- /dev/null +++ b/app/src/main/java/com/hbl/lewan/model/RedBean.java @@ -0,0 +1,67 @@ +package com.hbl.lewan.model; + + + +public class RedBean { + + private String groupName; + private int amount; + private String createTime; + private int type; + private Integer sendCount; + private Integer grabCount; + + public String getGroupName() { + return groupName; + } + + public void setGroupName(String groupName) { + this.groupName = groupName; + } + + public int getAmount() { + return amount; + } + + public void setAmount(int amount) { + this.amount = amount; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public int getType() { + return type; + } + + public void setType(int type) { + this.type = type; + } + + public Integer getSendCount() { + if(sendCount==null){ + return 1; + } + return sendCount; + } + + public void setSendCount(Integer sendCount) { + this.sendCount = sendCount; + } + + public Integer getGrabCount() { + if(grabCount==null){ + return 0; + } + return grabCount; + } + + public void setGrabCount(Integer grabCount) { + this.grabCount = grabCount; + } +} diff --git a/app/src/main/java/com/hbl/lewan/model/RedLogBean.java b/app/src/main/java/com/hbl/lewan/model/RedLogBean.java index 0af8046..486280f 100644 --- a/app/src/main/java/com/hbl/lewan/model/RedLogBean.java +++ b/app/src/main/java/com/hbl/lewan/model/RedLogBean.java @@ -14,14 +14,14 @@ public class RedLogBean { private Integer redPkgCount; private Integer redPkgAmount; - private List groupGrabRecords; - private List groupSendRecords; + private ListBeanResult groupGrabRecords; + private ListBeanResult groupSendRecords; - public List getGroupSendRecords() { + public ListBeanResult getGroupSendRecords() { return groupSendRecords; } - public void setGroupSendRecords(List groupSendRecords) { + public void setGroupSendRecords(ListBeanResult groupSendRecords) { this.groupSendRecords = groupSendRecords; } @@ -41,11 +41,11 @@ public class RedLogBean { this.redPkgAmount = redPkgAmount; } - public List getGroupGrabRecords() { + public ListBeanResult getGroupGrabRecords() { return groupGrabRecords; } - public void setGroupGrabRecords(List groupGrabRecords) { + public void setGroupGrabRecords(ListBeanResult groupGrabRecords) { this.groupGrabRecords = groupGrabRecords; } } diff --git a/app/src/main/java/com/hbl/lewan/redpack/SendRedPacketActivity.java b/app/src/main/java/com/hbl/lewan/redpack/SendRedPacketActivity.java index 4d855f1..b1bc6ac 100644 --- a/app/src/main/java/com/hbl/lewan/redpack/SendRedPacketActivity.java +++ b/app/src/main/java/com/hbl/lewan/redpack/SendRedPacketActivity.java @@ -104,7 +104,7 @@ public class SendRedPacketActivity extends BaseActivity { int maxNumber = 100; protected Team teamInfo; protected TeamMember teamMember; - private boolean isJinBi = false; + private boolean isJinBi = true; private ActivitySendRedPacketBinding viewBinding; PayCashFingerDialog payCashFingerDialog; PayCashDialog payDialog; @@ -404,15 +404,23 @@ public class SendRedPacketActivity extends BaseActivity { // } if (isGroup) { - if (TextUtils.isEmpty(viewBinding.sizeHintEt.getText().toString().trim())) { - ToastX.showShortToast(R.string.size_not_null_tips_txt); - return; - } + if(isPinShouQi) { + if (TextUtils.isEmpty(viewBinding.sizeHintEt.getText().toString().trim())) { + ToastX.showShortToast(R.string.size_not_null_tips_txt); + return; + } - if (Integer.parseInt(viewBinding.sizeHintEt.getText().toString().trim()) < 1) { - ToastX.showShortToast(R.string.qsrhbgs_txt); + if (Integer.parseInt(viewBinding.sizeHintEt.getText().toString().trim()) < 1) { + ToastX.showShortToast(R.string.qsrhbgs_txt); - return; + return; + } + }else{ + if (userInfo == null) { + ToastX.showShortToast("请先选择收红包用户"); + + return; + } } } @@ -464,33 +472,6 @@ public class SendRedPacketActivity extends BaseActivity { } if (walletBean != null) { if (Float.parseFloat(viewBinding.numberTv.getText().toString().trim()) > (isJinBi ? walletBean.getGoldCoin() / 100f : walletBean.getSilverCoin() / 100f)) { -// new AlertDialog.Builder(SendRedPacketActivity.this) -// .setTitle("余额不足") -// .setMessage("是否去充值金额？") -// .setPositiveButton("去充值", (dialog, which) -> { -// Intent intent = new Intent(SendRedPacketActivity.this, TopActivity.class); -// startActivity(intent); -// }) -// .setNegativeButton($$(R.string.general_cancel), null) -// .show(); - -// ActionConfirmDialog actionDialog = new ActionConfirmDialog(SendRedPacketActivity.this, getString(R.string.sfqcz_txt), getString(R.string.general_cancel), getString(R.string.quchongzhi_txt)); -// actionDialog.setOnToActionListener(new ActionConfirmDialog.OnToActionListener() { -// @Override -// public void toSumbit() { -// Intent intent = new Intent(SendRedPacketActivity.this, WalletInfoActivity.class); -// intent.putExtra("isG", true); -// startActivity(intent); -// } -// -// @Override -// public void toCancel() { -// -// } -// }); -// actionDialog.show(); - - ToastX.showShortToast(R.string.yebz_txt); return; @@ -882,6 +863,12 @@ public class SendRedPacketActivity extends BaseActivity { groupBean.getCount() + "", groupBean.getResidualCount() + "", groupBean.getResidualAmount() + "", groupBean.getSendTime(), groupBean.getFinishTime(), groupBean.getRemark(), groupBean.getSenderNickname(), groupBean.getCoinType() + "", null, null); + + + //{"amount":"1000","coinType":"0","count":"2","groupId":"38605640048","id":"1917033242059538434", + // "isCashGift":"0","remark":"恭喜发财，大吉大利","residualAmount":"1000","residualCount":"2", + // "sendTime":"2025-04-29 09:48:36","senderNickname":"特朗普", + // "senderUid":"61330233","status":"0","type":1005} toShareMessageGroup(redPacketAttachment); } diff --git a/app/src/main/java/com/hbl/lewan/wallet/BindWeChatOrAliPayActivity.java b/app/src/main/java/com/hbl/lewan/wallet/BindWeChatOrAliPayActivity.java index ef04c69..81a3a82 100644 --- a/app/src/main/java/com/hbl/lewan/wallet/BindWeChatOrAliPayActivity.java +++ b/app/src/main/java/com/hbl/lewan/wallet/BindWeChatOrAliPayActivity.java @@ -400,47 +400,28 @@ public class BindWeChatOrAliPayActivity extends BaseActivity { private void toQIiNiuYunOss(File file) { String updatePathPic = isWeChat ? "wechat" : "alipay"; - -// new Handler().post(() -> QiNiuTool.upload(convertFileToBytes(file))); UploadOptions options = new UploadOptions(null, null, true, (key, percent) -> { LogUtils.i("结果是啥进度：" + percent); }, () -> { - LogUtils.i("结果是啥进度112222222111："); return false; }); -// Zone zone = FixedZone.zoneAs0; Configuration configuration = new Configuration.Builder() -// .connectTimeout(10) // 链接超时。默认10秒 -// .responseTimeout(60) // 服务器响应超时。默认60秒 -// .zone(zone) // 设置区域，不指定会自动选择。指定不同区域的上传域名、备用域名、备用IP。 .build(); UploadManager uploadManager = new UploadManager(configuration); String fileName = UUID.randomUUID().toString() + "_" + file.getName(); LogUtils.i("结果是啥开始：" + stsCredentialsBean + ";;" + file.getAbsolutePath()); -// Uri uri = FileUtils.getMediaUriFromPath(file.getAbsolutePath(),UserHeadEditActivity.this); -// GPX2hnRdNpAvovOSZGrhMxtaa6JP2mPvJ96-tdmD -// immchat - String files = "media/" + updatePathPic + "/" + fileName; - byte[] sss = convertFileToBytes(file); - LogUtils.i("结果是啥开始：" + sss); - uploadManager.put(sss, files, stsCredentialsBean, (key, info, response) -> { -// LogUtils.i("结果是啥2：" + GsonUtils.beanToJSONString(info)); - LogUtils.i("结果是啥2：" + GsonUtils.beanToJSONString(response)); + uploadManager.put(file, files, stsCredentialsBean, (key, info, response) -> { dimessLoadingDialog(); if (info != null && info.isOK()) { // 上传成功 try { - - LogUtils.i("地址是啥：" + response.getString("key")); toPush(IMUIKitConfig.OSS_URL + response.getString("key")); - } catch (JSONException e) { LogUtils.i("结果是啥失败：" + e); - } diff --git a/app/src/main/java/com/hbl/lewan/wallet/TiXianActivity.java b/app/src/main/java/com/hbl/lewan/wallet/TiXianActivity.java index f683c2a..5e12636 100644 --- a/app/src/main/java/com/hbl/lewan/wallet/TiXianActivity.java +++ b/app/src/main/java/com/hbl/lewan/wallet/TiXianActivity.java @@ -274,6 +274,8 @@ public class TiXianActivity extends BaseActivity { if(aliPayBeans!=null&&aliPayBeans.size()>0){ viewBinding.shoukuanBt.setText(aliPayBeans.get(0).getCardholderName()+" "+aliPayBeans.get(0).getBankName()+" "+aliPayBeans.get(0).getNumber()); bankBean =aliPayBeans.get(0); + }else{ + viewBinding.shoukuanBt.setText(""); } if(tiXianConfBean!=null) { viewBinding.tipsTv.setText(Html.fromHtml("单笔提现手续费" + tiXianConfBean.getBaseFee() + "元
提现费率" + tiXianConfBean.getFeeRate() + "%
预计到账时间2小时以内")); @@ -287,6 +289,8 @@ public class TiXianActivity extends BaseActivity { if(bankBeans!=null&&bankBeans.size()>0){ viewBinding.shoukuanBt.setText(bankBeans.get(0).getCardholderName()+" "+bankBeans.get(0).getBankName()+" "+bankBeans.get(0).getNumber()); bankBean =bankBeans.get(0); + }else{ + viewBinding.shoukuanBt.setText(""); } if(tiXianConfBean!=null) { viewBinding.tipsTv.setText(Html.fromHtml("单笔提现手续费" + tiXianConfBean.getBaseFee() + "元
提现费率" + tiXianConfBean.getFeeRate() + "%
预计到账时间2小时以内")); diff --git a/app/src/main/java/com/hbl/lewan/wallet/WalletInfoFragment.java b/app/src/main/java/com/hbl/lewan/wallet/WalletInfoFragment.java index 327e6c2..be1eeb1 100644 --- a/app/src/main/java/com/hbl/lewan/wallet/WalletInfoFragment.java +++ b/app/src/main/java/com/hbl/lewan/wallet/WalletInfoFragment.java @@ -141,28 +141,31 @@ public class WalletInfoFragment extends BaseFragment { taskBeans = GsonUtils.getListFromJSON(billBean, TaskBean.class); } Calendar selectedDate = Calendar.getInstance();//系统当前时间 - time = selectedDate.get(Calendar.YEAR) + "-" + ((selectedDate.get(Calendar.MONTH) + 1) < 10 ? "0" + (selectedDate.get(Calendar.MONTH) + 1) : (selectedDate.get(Calendar.MONTH) + 1)); - +// time = selectedDate.get(Calendar.YEAR) + "-" + ((selectedDate.get(Calendar.MONTH) + 1) < 10 ? "0" + (selectedDate.get(Calendar.MONTH) + 1) : (selectedDate.get(Calendar.MONTH) + 1)); loc = DataUtils.get(IMApplication.getInstance(), "locale", 1); // } - binding.typeTv1.setOnClickListener(v -> { - SelectTypeDialog selectTypeDialog = new SelectTypeDialog(getActivity(), type, this.status == 0); - selectTypeDialog.setOnToVipListener(t -> { - type = t.getType(); - binding.typeTv1.setText(TypeBean.getTypeString1(type, this.status == 0)); - binding.refreshLayout.autoRefresh(); - }); - selectTypeDialog.show(); - }); +// binding.typeTv1.setOnClickListener(v -> { +// SelectTypeDialog selectTypeDialog = new SelectTypeDialog(getActivity(), type, this.status == 0); +// selectTypeDialog.setOnToVipListener(t -> { +// type = t.getType(); +// binding.typeTv1.setText(TypeBean.getTypeString1(type, this.status == 0)); +// binding.refreshLayout.autoRefresh(); +// +// }); +// selectTypeDialog.show(); +// }); initList(); initRefreshLayout(); time = DataUtils.getCurrentTimeMonth(System.currentTimeMillis()); binding.typeTv1.setText(time); + getStatistics(); + binding.typeTv1.setOnClickListener(v -> showTimerPicker()); } + String data = DataUtils.getCurrentTimeType(System.currentTimeMillis()); private void showTimerPicker() { @@ -175,11 +178,11 @@ public class WalletInfoFragment extends BaseFragment { timestamp -> { time = DataUtils.getCurrentTimeMonth(timestamp); binding.typeTv1.setText(time); - data = DataUtils.getCurrentTimeType(timestamp); + data = DataUtils.getCurrentTimeType(timestamp); binding.nodateLy.setVisibility(View.GONE); binding.refreshLayout.setVisibility(View.VISIBLE); binding.refreshLayout.autoRefresh(); -// getStatistics(); + getStatistics(); }, beginTime, endTime, data); @@ -193,22 +196,15 @@ public class WalletInfoFragment extends BaseFragment { mTimerPicker.setCanShowAnim(false); mTimerPicker.show(data); } + private void getStatistics() { Map map = new HashMap<>(); - if (status == 0) { - map.put("coinType", 0); - } else { - map.put("coinType", 1); + map.put("coinType", 0); + String statTime = time + "-01 00:00:01"; + String endTime = time + "-" + getMonth(time) + " 23:59:59"; + map.put("timeGe", statTime); + map.put("timeLe", endTime); - } - if (TextUtils.isEmpty(typeInfo)) { - - } else { - String statTime = time + "-01 00:00:01"; - String endTime = time + "-" + getMonth(time) + " 23:59:59"; - map.put("timeGe", statTime); - map.put("timeLe", endTime); - } if (!TextUtils.isEmpty(IMUIKitConfig.SUBSTATIONID)) { map.put("substationId", IMUIKitConfig.SUBSTATIONID); } @@ -219,8 +215,8 @@ public class WalletInfoFragment extends BaseFragment { @Override public void onSuccess(Result feedbackResp) { if (feedbackResp.data != null) { -// outTv.setText(String.format("%.2f", Math.abs(feedbackResp.data.getOutgoing()) / 100f)); -// incomeTv.setText(String.format("%.2f", feedbackResp.data.getIncoming() / 100f)); + binding.outTv.setText(AppUtils.getQian(feedbackResp.data.getOutgoing())); + binding.incomeTv.setText(AppUtils.getQian(feedbackResp.data.getIncoming())); } } @@ -233,74 +229,6 @@ public class WalletInfoFragment extends BaseFragment { } -// private void initCustomTimePicker() { -// /** -// * @description -// * -// * 注意事项： -// * 1.自定义布局中，id为 optionspicker 或者 timepicker 的布局以及其子控件必须要有，否则会报空指针. -// * 具体可参考demo 里面的两个自定义layout布局。 -// * 2.因为系统Calendar的月份是从0-11的,所以如果是调用Calendar的set方法来设置时间,月份的范围也要是从0-11 -// * setRangDate方法控制起始终止时间(如果不设置范围，则使用默认时间1900-2100年，此段代码可注释) -// */ -// Calendar selectedDate = Calendar.getInstance();//系统当前时间 -// Calendar startDate = Calendar.getInstance(); -// startDate.set(2023, 3, 1); -// Calendar endDate = Calendar.getInstance(); -//// endDate.set(selectedDate.get(Calendar.YEAR), selectedDate.get(Calendar.MONTH) , 28); -// //时间选择器 ，自定义布局 -// pvTime = new TimePickerBuilder(getActivity(), (date, v) -> {//选中事件回调 -// binding.dateTv.setText(getTime(date)); -// time = getTime(date); -// typeInfo = time; -// refreshLayout.autoRefresh(); -// getStatistics(); -// -// }).setBgColor(getResources().getColor(R.color.white)) -// .setContentTextSize(18) -// .setTextColorCenter(getResources().getColor(R.color.black)) -// .setTextColorOut(getResources().getColor(R.color.common_list_hint_text)) -// .setDividerColor(getResources().getColor(R.color.color_f7f7fc)) -// .setRangDate(startDate, endDate) -// .setDate(selectedDate) -// .setLayoutRes(R.layout.pickerview_time, v -> { -// final TextView tvSubmit = (TextView) v.findViewById(R.id.btnSubmit); -// tvSubmit.setTextColor(getResources().getColor(R.color.colorAccent)); -// TextView ivCancel = (TextView) v.findViewById(R.id.btnCancel); -// ivCancel.setTextColor(getResources().getColor(R.color.colorAccent)); -// -// ivCancel.setText(getString(R.string.all_time_txt)); -// tvSubmit.setOnClickListener(v12 -> { -// pvTime.returnData(); -// pvTime.dismiss(); -// }); -// ivCancel.setOnClickListener(v1 -> { -// typeInfo = ""; -// dateTv.setText(getString(R.string.all_time_txt)); -// pvTime.dismiss(); -// refreshLayout.autoRefresh(); -// getStatistics(); -// -// }); -// }) -// .setType(new boolean[]{true, true, false, false, false, false}) -// .setLabel(getString(R.string.time_year_txt), getString(R.string.time_month_txt), getString(R.string.time_day_txt), -// getString(R.string.time_shi_txt), getString(R.string.time_fen_txt), getString(R.string.time_miao_txt)) -// .setLineSpacingMultiplier(1.6f) -// .setTextXOffset(0, 0, 0, 40, 0, -40) -// .isCenterLabel(false) //是否只显示中间选中项的label文字，false则每项item全部都带有label。 -// .setDividerColor(0x00000000) -// .build(); -// } - - - private String getTime(Date date) {//可根据需要自行截取数据显示 - Log.d("getTime()", "choice date millis: " + date.getTime()); - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM"); - return format.format(date); - } - - private void initList() { LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getActivity()); binding.recyclerview.setLayoutManager(linearLayoutManager); @@ -318,7 +246,7 @@ public class WalletInfoFragment extends BaseFragment { } else { textView.setTextColor(getResources().getColor(R.color.black)); } - if (s.getTransferMoneyRecord() != null && s.getTransferMoneyRecord().getFeeAmount() > 0 && s.getAmount()<0) { + if (s.getTransferMoneyRecord() != null && s.getTransferMoneyRecord().getFeeAmount() > 0 && s.getAmount() < 0) { isShowRate = true; textView.setCompoundDrawablesWithIntrinsicBounds(getResources().getDrawable(R.mipmap.ic_transfer_tips), null, null, null); } else { @@ -729,7 +657,7 @@ public class WalletInfoFragment extends BaseFragment { return s.getCoinModifyRemark() + ""; } else if (s.getType() == 32) { return "购买副号"; - }else { + } else { return TextUtils.isEmpty(s.getCoinModifyRemark()) ? getString(R.string.weizhi_txt) : s.getCoinModifyRemark() + ""; } } @@ -936,102 +864,34 @@ public class WalletInfoFragment extends BaseFragment { private void getDateList() { - if (status == 0) { - Map map = new HashMap<>(); - if (type == -1) { - if (TextUtils.isEmpty(typeInfo)) { - map.put("page", pageSize); - } else { - String statTime = time + "-01 00:00:01"; - String endTime = time + "-" + getMonth(time) + " 23:59:59"; - map.put("page", pageSize); - map.put("timeGe", statTime); - map.put("timeLe", endTime); - } - } else { - if (TextUtils.isEmpty(typeInfo)) { - map.put("page", pageSize); - map.put("type", type); + Map map = new HashMap<>(); - } else { - String statTime = time + "-01 00:00:01"; - String endTime = time + "-" + getMonth(time) + " 23:59:59"; + String statTime = time + "-01 00:00:01"; + String endTime = time + "-" + getMonth(time) + " 23:59:59"; + map.put("page", pageSize); + map.put("timeGe", statTime); + map.put("timeLe", endTime); - map.put("page", pageSize); - map.put("timeGe", statTime); - map.put("timeLe", endTime); - map.put("type", type); - } - } - if (!TextUtils.isEmpty(IMUIKitConfig.SUBSTATIONID)) { - map.put("substationId", IMUIKitConfig.SUBSTATIONID); - } - Api.getInstance().goldDetails(IMKitClient.account(), map) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new BaseObserver>>() { - @Override - public void onSuccess(Result> feedbackResp) { - changeDate(feedbackResp.data); - } - - @Override - public void onError(int code, String msg) { - LogUtils.i("获取到的错误:" + code + "" + msg); - binding.refreshLayout.finishRefresh(); - binding.refreshLayout.finishLoadMore(); - changeView(false); - } - }); - - } else { - Map map = new HashMap<>(); - if (type == -1) { - if (TextUtils.isEmpty(typeInfo)) { - map.put("page", pageSize); - } else { - String statTime = time + "-01 00:00:01"; - String endTime = time + "-" + getMonth(time) + " 23:59:59"; - map.put("page", pageSize); - map.put("timeGe", statTime); - map.put("timeLe", endTime); - } - } else { - if (TextUtils.isEmpty(typeInfo)) { - map.put("page", pageSize); - map.put("type", type); - - } else { - String statTime = time + "-01 00:00:01"; - String endTime = time + "-" + getMonth(time) + " 23:59:59"; - - map.put("page", pageSize); - map.put("timeGe", statTime); - map.put("timeLe", endTime); - map.put("type", type); - } - } - if (!TextUtils.isEmpty(IMUIKitConfig.SUBSTATIONID)) { - map.put("substationId", IMUIKitConfig.SUBSTATIONID); - } - Api.getInstance().silverDetails(IMKitClient.account(), map) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new BaseObserver>>() { - @Override - public void onSuccess(Result> feedbackResp) { - changeDate(feedbackResp.data); - } - - @Override - public void onError(int code, String msg) { - LogUtils.i("获取到的错误:" + code + "" + msg); - binding.refreshLayout.finishRefresh(); - binding.refreshLayout.finishLoadMore(); - changeView(false); - } - }); + if (!TextUtils.isEmpty(IMUIKitConfig.SUBSTATIONID)) { + map.put("substationId", IMUIKitConfig.SUBSTATIONID); } + Api.getInstance().goldDetails(IMKitClient.account(), map) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new BaseObserver>>() { + @Override + public void onSuccess(Result> feedbackResp) { + changeDate(feedbackResp.data); + } + + @Override + public void onError(int code, String msg) { + LogUtils.i("获取到的错误:" + code + "" + msg); + binding.refreshLayout.finishRefresh(); + binding.refreshLayout.finishLoadMore(); + changeView(false); + } + }); } diff --git a/app/src/main/java/com/hbl/lewan/wallet/WalletInfoRedFragment.java b/app/src/main/java/com/hbl/lewan/wallet/WalletInfoRedFragment.java index 510eaef..b61b78e 100644 --- a/app/src/main/java/com/hbl/lewan/wallet/WalletInfoRedFragment.java +++ b/app/src/main/java/com/hbl/lewan/wallet/WalletInfoRedFragment.java @@ -30,6 +30,7 @@ import com.hbl.lewan.databinding.FragmentWalletInfoNewBinding; import com.hbl.lewan.dialog.SelectTypeDialog; import com.hbl.lewan.model.BillBean; import com.hbl.lewan.model.ListBeanResult; +import com.hbl.lewan.model.RedBean; import com.hbl.lewan.model.RedLogBean; import com.hbl.lewan.model.StatisticsBean; import com.hbl.lewan.model.TaskBean; @@ -79,7 +80,7 @@ public class WalletInfoRedFragment extends BaseFragment { int type = -1; String typeInfo = ""; CommonAdapter commonAdapter; - private ArrayList titles = new ArrayList<>(); + private ArrayList titles = new ArrayList<>(); List taskBeans = null; int loc = 0; FragmentWalletInfoNewBinding binding; @@ -126,7 +127,6 @@ public class WalletInfoRedFragment extends BaseFragment { public void setTime(String monthStr) { this.time = monthStr; initOne(); - } private void initOne() { @@ -141,53 +141,25 @@ public class WalletInfoRedFragment extends BaseFragment { private void initList() { LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getActivity()); binding.recyclerview.setLayoutManager(linearLayoutManager); - commonAdapter = new CommonAdapter(getContext(), R.layout.item_bill_list, titles) { + commonAdapter = new CommonAdapter(getContext(), R.layout.item_bill_list1, titles) { @Override - public void convert(ViewHolder holder, BillBean s, int index) { - boolean isShowRate; -// holder.setText(R.id.price_tv, AppUtils.getQian(s.getAmount()) + (status == 0 ? getString(R.string.species_txt) : -// getString(R.string.silver_coins_txt))); - TextView textView = holder.getView(R.id.price_tv); - textView.setText(AppUtils.getQian(s.getAmount())); - RelativeLayout layoutroot = holder.getView(R.id.big_bg); - if (s.getAmount() < 0) { - textView.setTextColor(getResources().getColor(R.color.black)); - } else { - textView.setTextColor(getResources().getColor(R.color.black)); - } - if (s.getTransferMoneyRecord() != null && s.getTransferMoneyRecord().getFeeAmount() > 0 && s.getAmount() < 0) { - isShowRate = true; - textView.setCompoundDrawablesWithIntrinsicBounds(getResources().getDrawable(R.mipmap.ic_transfer_tips), null, null, null); - } else { - isShowRate = false; - textView.setCompoundDrawablesWithIntrinsicBounds(null, null, null, null); - } - TextView statusTv = holder.getView(R.id.status_tv); - statusTv.setVisibility(View.GONE); - if (s.getType() == 5) { - if (s.getWithdrawCashRecord() != null) { - statusTv.setVisibility(View.VISIBLE); - statusTv.setText(getStatusTxt(s.getWithdrawCashRecord())); + public void convert(ViewHolder holder, RedBean s, int index) { + if(type == 0){ + holder.setText(R.id.title_tv, "来自"+s.getGroupName()+"的群红包"); + holder.setText(R.id.time_tv, "" + s.getCreateTime()); + holder.setText(R.id.status_tv, "￥"+AppUtils.getQian(s.getAmount())); + holder.getView(R.id.count_tv).setVisibility(View.GONE); + }else{ + holder.setText(R.id.title_tv, "发给"+s.getGroupName()+"的拼手气红包"); + if(s.getType()!=0){ + holder.setText(R.id.title_tv, "发给"+s.getGroupName()+"的专属红包"); } - } - - holder.setText(R.id.balan_tv, getString(R.string.yuee_2f_txt1) + AppUtils.getQian(s.getBalance())); -// holder.setText(R.id.title_tv,getUserInfo(s)+getTypeString(s.getType())); - holder.setText(R.id.title_tv, getTypeNoteString(s)); - - holder.setText(R.id.time_tv, s.getCreateTime()); - if (!TextUtils.isEmpty(s.getCreateTimestamp())) { - holder.setText(R.id.time_tv, TimeFormatUtils.formatMillisecond(getActivity(), Long.parseLong(s.getCreateTimestamp()))); + holder.setText(R.id.time_tv, "" + s.getCreateTime()); + holder.setText(R.id.status_tv, "￥"+AppUtils.getQian(s.getAmount())); + holder.getView(R.id.count_tv).setVisibility(View.VISIBLE); + holder.setText(R.id.count_tv, s.getGrabCount()+"/"+s.getSendCount()+"个"); } - layoutroot.setOnClickListener(v -> { - //弹窗 - if (isShowRate) { - showPopWindow(textView, s.getTransferMoneyRecord().getFeeAmount(), s.getTransferMoneyRecord().getCoinType()); - } - }); - ((ImageView) holder.getView(R.id.logo_iv)).setImageResource(getTypeRes(s)); - } }; binding.recyclerview.setAdapter(commonAdapter); @@ -514,9 +486,10 @@ public class WalletInfoRedFragment extends BaseFragment { .subscribe(new BaseObserver<>() { @Override public void onSuccess(Result feedbackResp) { -// changeDate(feedbackResp.data); if(walletInfoRedActivity!=null) walletInfoRedActivity.setReceive(feedbackResp.data.getRedPkgCount(),feedbackResp.data.getRedPkgAmount()); + changeDate(feedbackResp.data.getGroupGrabRecords()); + } @Override @@ -536,8 +509,7 @@ public class WalletInfoRedFragment extends BaseFragment { public void onSuccess(Result feedbackResp) { if(walletInfoRedActivity!=null) walletInfoRedActivity.setSend(feedbackResp.data.getRedPkgCount(),feedbackResp.data.getRedPkgAmount()); - -// changeDate(feedbackResp.data.getGroupSendRecords()); + changeDate(feedbackResp.data.getGroupSendRecords()); } @Override @@ -553,10 +525,10 @@ public class WalletInfoRedFragment extends BaseFragment { } - private void changeDate(ListBeanResult data) { - if (data.getList() != null) { + private void changeDate(ListBeanResult data) { + if (data!=null&&data.getList() != null) { commonAdapter.addDates(data.getList()); - titles = (ArrayList) commonAdapter.getDates(); + titles = (ArrayList) commonAdapter.getDates(); } binding.refreshLayout.finishRefresh(); binding.refreshLayout.finishLoadMore(); diff --git a/app/src/main/java/com/hbl/lewan/wallet/WalletInfologFragment.java b/app/src/main/java/com/hbl/lewan/wallet/WalletInfologFragment.java index 0aab549..5674f3d 100644 --- a/app/src/main/java/com/hbl/lewan/wallet/WalletInfologFragment.java +++ b/app/src/main/java/com/hbl/lewan/wallet/WalletInfologFragment.java @@ -126,7 +126,7 @@ public class WalletInfologFragment extends BaseFragment { commonAdapter = new CommonAdapter<>(getContext(), R.layout.item_bill_log, titles) { @Override public void convert(ViewHolder holder, ChongZhiLogBean s, int index) { - holder.setText(R.id.title_tv, "充值" + (s.getAmount()/100)); + holder.setText(R.id.title_tv, "充值" + AppUtils.getQian(s.getAmount())); holder.setText(R.id.orderid_tv, "订单号" + s.getId()); holder.setText(R.id.time_tv, "" + s.getCreateTime()); TextView statusTv = holder.getView(R.id.status_tv); @@ -144,9 +144,9 @@ public class WalletInfologFragment extends BaseFragment { commonAdapter = new CommonAdapter<>(getContext(), R.layout.item_bill_log, tiXianLogBeans) { @Override public void convert(ViewHolder holder, TiXianLogBean s, int index) { - holder.setText(R.id.title_tv, "提现" + (s.getAmount() / 100)); + holder.setText(R.id.title_tv, "提现" + AppUtils.getQian(s.getAmount())); holder.setText(R.id.orderid_tv, "" + s.getCreateTime()); - holder.setText(R.id.time_tv, "预计到账:" + (s.getActualAmount() / 100)); + holder.setText(R.id.time_tv, "预计到账:" +AppUtils.getQian(s.getActualAmount())); TextView statusTv = holder.getView(R.id.status_tv); if (s.getStatus() == 1) { holder.setText(R.id.status_tv, "已通过"); diff --git a/app/src/main/res/layout/fragment_chat.xml b/app/src/main/res/layout/fragment_chat.xml index c50a7b1..4ab1223 100644 --- a/app/src/main/res/layout/fragment_chat.xml +++ b/app/src/main/res/layout/fragment_chat.xml @@ -175,6 +175,7 @@ android:layout_height="?actionBarSize" android:background="@android:color/white" android:gravity="bottom" + android:visibility="gone" android:orientation="horizontal"> @@ -335,6 +337,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" + android:visibility="gone" android:onClick="chatClick" app:layout_constraintLeft_toRightOf="@+id/layout_chatfm_group" app:layout_constraintTop_toTopOf="@+id/layout_chatfm_all"> diff --git a/app/src/main/res/layout/fragment_wallet_info.xml b/app/src/main/res/layout/fragment_wallet_info.xml index 686bf24..dafc22b 100644 --- a/app/src/main/res/layout/fragment_wallet_info.xml +++ b/app/src/main/res/layout/fragment_wallet_info.xml @@ -68,6 +68,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="0" + android:id="@+id/out_tv" android:layout_weight="1" android:textColor="#FA6947" android:textSize="14sp" @@ -83,6 +84,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="0" + android:id="@+id/income_tv" android:textColor="#FA6947" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/fragment_wallet_info_new.xml b/app/src/main/res/layout/fragment_wallet_info_new.xml index fef8930..b313a54 100644 --- a/app/src/main/res/layout/fragment_wallet_info_new.xml +++ b/app/src/main/res/layout/fragment_wallet_info_new.xml @@ -14,7 +14,7 @@ @@ -27,7 +27,7 @@ diff --git a/app/src/main/res/layout/item_bill_list1.xml b/app/src/main/res/layout/item_bill_list1.xml new file mode 100644 index 0000000..796b4eb --- /dev/null +++ b/app/src/main/res/layout/item_bill_list1.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/custom/RedPacketGetViewHolder.java b/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/custom/RedPacketGetViewHolder.java index 371a865..d1b0d0c 100644 --- a/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/custom/RedPacketGetViewHolder.java +++ b/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/custom/RedPacketGetViewHolder.java @@ -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); } diff --git a/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/fun/view/input/FunBottomActionFactory.java b/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/fun/view/input/FunBottomActionFactory.java index bbeed73..013b3ad 100644 --- a/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/fun/view/input/FunBottomActionFactory.java +++ b/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/fun/view/input/FunBottomActionFactory.java @@ -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)) { //积分赠送 diff --git a/chatkit-ui/src/main/res/values-en/strings.xml b/chatkit-ui/src/main/res/values-en/strings.xml index 9e9e9b1..6d82f22 100644 --- a/chatkit-ui/src/main/res/values-en/strings.xml +++ b/chatkit-ui/src/main/res/values-en/strings.xml @@ -255,7 +255,7 @@ has been received has been returned expired - MM Cash red envelope + red envelope MM Gift Points Red Envelope [红包] To be collected diff --git a/chatkit-ui/src/main/res/values-ja/strings.xml b/chatkit-ui/src/main/res/values-ja/strings.xml index 5dec917..a4fd222 100644 --- a/chatkit-ui/src/main/res/values-ja/strings.xml +++ b/chatkit-ui/src/main/res/values-ja/strings.xml @@ -256,7 +256,7 @@ 受信しました 返品されました 期限切れ - MM Cashの赤い封筒 + の赤い封筒 MMギフトポイントの赤い封筒 [红包] 収集対象 diff --git a/chatkit-ui/src/main/res/values-zh/strings.xml b/chatkit-ui/src/main/res/values-zh/strings.xml index 87db385..306cac2 100644 --- a/chatkit-ui/src/main/res/values-zh/strings.xml +++ b/chatkit-ui/src/main/res/values-zh/strings.xml @@ -255,7 +255,7 @@ 已领取 已退还 已过期 - MM Cash红包 + 红包 MM 礼品积分红包 [红包] 待领取 @@ -263,9 +263,9 @@ %s 发出的红包 手慢了，红包抢完啦 红包超过24小时，无法领取 - - - + + + diff --git a/chatkit-ui/src/main/res/values/strings.xml b/chatkit-ui/src/main/res/values/strings.xml index d074fe6..da8aaf9 100644 --- a/chatkit-ui/src/main/res/values/strings.xml +++ b/chatkit-ui/src/main/res/values/strings.xml @@ -215,7 +215,7 @@ 相簿 按住 說話 自訂 - 積分紅包 + 紅包 積分贈送 Cash贈送 名片 @@ -255,7 +255,7 @@ 已領取 已退還 已過期 - MM Cash紅包 + 紅包 MM 禮品積分紅包 [紅包] 待領取 @@ -263,9 +263,9 @@ %s 發出的紅包 手慢了，紅包搶完啦 紅包超過24小時，無法領取 - - - + + +