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

第N+4次提交专属红包

Browse Source
This commit is contained in:
xuhuixiang
2025-04-29 17:28:46 +08:00
parent b07055fe3f
commit 34f39dd489
13 changed files with 232 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/hbl/lewan/main/MainActivity.java
View File

@@ -498,7 +498,7 @@ public class MainActivity extends BaseActivity {
private void getVersion() {
try {
Api.getInstance().version(com.hbl.lewan.network.ApiService.AREA_CODE.equals("+86")?7:0, DataUtils.getVersionCode(MainActivity.this), IMUIKitConfig.SUBSTATIONID)
Api.getInstance().version(com.hbl.lewan.network.ApiService.AREA_CODE.equals("+86")?7:0, DataUtils.getVersionCode(MainActivity.this), com.netease.yunxin.kit.chatkit.ui.network.ApiService.SUBSTATIONID1)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new BaseObserver<>() {

2
app/src/main/java/com/hbl/lewan/main/mine/MineFragment.java
View File

@@ -364,7 +364,7 @@ public class MineFragment extends BaseFragment {
private void getVersion() {
try {
Api.getInstance().version(com.hbl.lewan.network.ApiService.AREA_CODE.equals("+86")?7:0, DataUtils.getVersionCode(getActivity()), IMUIKitConfig.SUBSTATIONID)
Api.getInstance().version(com.hbl.lewan.network.ApiService.AREA_CODE.equals("+86")?7:0, DataUtils.getVersionCode(getActivity()), com.netease.yunxin.kit.chatkit.ui.network.ApiService.SUBSTATIONID1)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new BaseObserver<>() {

25
app/src/main/java/com/hbl/lewan/redpack/ReceiveRedPacketActivity.java
View File

@@ -24,6 +24,7 @@ import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivityReceiveRedPacketBinding;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.AppUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.ImageCacheLoader;
import com.hbl.lewan.utils.LogUtils;
@@ -265,7 +266,7 @@ public class ReceiveRedPacketActivity extends BaseActivity implements View.OnCli
public void onSuccess(Result<RedpacketGroupBean> feedbackResp) {
redpacketGroupBean = feedbackResp.data;
titles = (ArrayList<GrabbersBean>) redpacketGroupBean.getGrabbers();
ChatDataUtils.set(ReceiveRedPacketActivity.this, "redpack_" + redpacketGroupBean.getId(), redpacketGroupBean.getStatus());
ChatDataUtils.set(ReceiveRedPacketActivity.this, "redpack_" + redpacketGroupBean.getId(), redpacketGroupBean.getStatus()+"");
RxBus.getInstance().post(new RxHongBaoBean(redpacketGroupBean.getId() + ""));
setList();
@@ -286,7 +287,7 @@ public class ReceiveRedPacketActivity extends BaseActivity implements View.OnCli
public void onSuccess(Result<RedpacketGroupBean> feedbackResp) {
redpacketGroupBean = feedbackResp.data;
titles = (ArrayList<GrabbersBean>) redpacketGroupBean.getGrabbers();
ChatDataUtils.set(ReceiveRedPacketActivity.this, "redpack_" + redpacketGroupBean.getId(), redpacketGroupBean.getStatus());
ChatDataUtils.set(ReceiveRedPacketActivity.this, "redpack_" + redpacketGroupBean.getId(), redpacketGroupBean.getStatus()+"");
RxBus.getInstance().post(new RxHongBaoBean(redpacketGroupBean.getId() + ""));
setList();
@@ -312,7 +313,7 @@ public class ReceiveRedPacketActivity extends BaseActivity implements View.OnCli
@Override
public void onSuccess(Result<RedpacketBean> feedbackResp) {
redpacketBean = feedbackResp.data;
ChatDataUtils.set(ReceiveRedPacketActivity.this, "redpack_" + redpacketBean.getId(), redpacketBean.getStatus());
ChatDataUtils.set(ReceiveRedPacketActivity.this, "redpack_" + redpacketBean.getId(), redpacketBean.getStatus()+"");
RxBus.getInstance().post(new RxHongBaoBean(redpacketBean.getId() + ""));
chagneBean();
}
@@ -330,9 +331,9 @@ public class ReceiveRedPacketActivity extends BaseActivity implements View.OnCli
viewBinding.toWalletTv.setText(R.string.ddfglq_txt);
// titleTipsTvuser.setText(String.format("1个红包共%s%.2f",getString(R.string.danwei_txt), redpacketBean.getAmount() / 100f));
if (redpacketBean.getCoinType() == 0) {
viewBinding.titleTipsTvuser.setText(getString(R.string.red_envelope_amount_txt) + String.format("%.2f", redpacketBean.getAmount() / 100f) + getTypeName() + "，等待对方领取");
viewBinding.titleTipsTvuser.setText(getString(R.string.red_envelope_amount_txt) + AppUtils.getQian(redpacketGroupBean.getAmount()) + getTypeName() + "，等待对方领取");
} else {
viewBinding.titleTipsTvuser.setText(getString(R.string.red_envelope_amount_txt) + String.format("%.2f", redpacketBean.getAmount() / 100f) + getTypeName() + "，等待对方领取");
viewBinding.titleTipsTvuser.setText(getString(R.string.red_envelope_amount_txt) +AppUtils.getQian(redpacketGroupBean.getAmount()) + getTypeName() + "，等待对方领取");
}
} else if (redpacketBean.getStatus() == 1) {
@@ -358,7 +359,7 @@ public class ReceiveRedPacketActivity extends BaseActivity implements View.OnCli
}
viewBinding.endLy.setVisibility(View.GONE);
viewBinding.priceTv.setText(String.format("%.2f", redpacketBean.getAmount() / 100f) + getTypeName());
viewBinding.priceTv.setText(AppUtils.getQian(redpacketGroupBean.getAmount()) + getTypeName());
viewBinding.timeTv.setText(redpacketBean.getReceiveTime() + "");
if ((redpacketBean.getReceiverUid() + "").equals(IMKitClient.account())) {
@@ -396,14 +397,14 @@ public class ReceiveRedPacketActivity extends BaseActivity implements View.OnCli
viewBinding.numberTv1Ly.setVisibility(View.GONE);
if (redpacketGroupBean.getType().equals("0")) {
// binding.titleTipsTv.setText(bonusBean.getBonus().getNumber() + getString(R.string.red_envelopes_in_total) + String.format("%.2f", Integer.parseInt(bonusBean.getBonus().getMoney().trim()) / 100f) + getString(R.string.danwei_txt));
viewBinding.titleTipsTv.setText(String.format(getString(R.string.red_envelopes_in_total), redpacketGroupBean.getCount() + "", String.format("%.2f", redpacketGroupBean.getAmount() / 100f)));
viewBinding.titleTipsTv.setText(String.format(getString(R.string.red_envelopes_in_total), redpacketGroupBean.getCount() + "", AppUtils.getQian(redpacketGroupBean.getAmount())));
} else {
if (redpacketGroupBean.getGrabbers() == null || redpacketGroupBean.getGrabbers().size() == 0) {
if (redpacketGroupBean.getStatus() == 2) {
viewBinding.titleTipsTv.setText(getString(R.string.hbxq_yiguoqi_txt) + getString(R.string.received_txt1) + "0/" + redpacketGroupBean.getCount() + getString(R.string.ge_gong_txt) + "0.00" + "/" + String.format("%.2f", redpacketGroupBean.getAmount() / 100f));
viewBinding.titleTipsTv.setText(getString(R.string.hbxq_yiguoqi_txt) + getString(R.string.received_txt1) + "0/" + redpacketGroupBean.getCount() + getString(R.string.ge_gong_txt) + "0" + "/" + AppUtils.getQian(redpacketGroupBean.getAmount()));
} else {
viewBinding.titleTipsTv.setText(getString(R.string.received_txt1) + "0/" + redpacketGroupBean.getCount() + getString(R.string.ge_gong_txt) + "0.00" + "/" + String.format("%.2f", redpacketGroupBean.getAmount() / 100f));
viewBinding.titleTipsTv.setText(getString(R.string.received_txt1) + "0/" + redpacketGroupBean.getCount() + getString(R.string.ge_gong_txt) + "0" + "/" + AppUtils.getQian(redpacketGroupBean.getAmount()));
}
} else {
int size = 0;
@@ -425,10 +426,10 @@ public class ReceiveRedPacketActivity extends BaseActivity implements View.OnCli
}
if (redpacketGroupBean.getStatus() == 2) {
viewBinding.titleTipsTv.setText(getString(R.string.hbxq_yiguoqi_txt) + getString(R.string.received_txt1) + redpacketGroupBean.getGrabbers().size() + "/" + redpacketGroupBean.getCount() + getString(R.string.ge_gong_txt)
+ String.format("%.2f", size / 100f) + "/" + String.format("%.2f", redpacketGroupBean.getAmount() / 100f));
+ AppUtils.getQian(size) + "/" +AppUtils.getQian(redpacketGroupBean.getAmount()));
} else {
viewBinding.titleTipsTv.setText(getString(R.string.received_txt1) + redpacketGroupBean.getGrabbers().size() + "/" + redpacketGroupBean.getCount() + getString(R.string.ge_gong_txt)
+ String.format("%.2f", size / 100f) + "/" + String.format("%.2f", redpacketGroupBean.getAmount() / 100f));
+ AppUtils.getQian(size) + "/" +AppUtils.getQian(redpacketGroupBean.getAmount()));
}
@@ -464,7 +465,7 @@ public class ReceiveRedPacketActivity extends BaseActivity implements View.OnCli
tvprice.setTextColor(Color.parseColor("#E4543E"));
} else {
tvprice.setTextColor(getResources().getColor(android.R.color.black));
imageView1.setVisibility(View.VISIBLE);
imageView1.setVisibility(View.GONE);
imageView1.setImageResource(getTypeNameImg());
}
ColorUtils.loadAvator(s.getGrabberAvatar(), imageView);

87
app/src/main/java/com/hbl/lewan/redpack/SendRedPacketActivity.java
View File

@@ -111,6 +111,7 @@ public class SendRedPacketActivity extends BaseActivity {
public List<UserInfo> listmemebers = new ArrayList<>();
private ActivityResultLauncher launcher;
UserInfo userInfo;
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
getWindow().setStatusBarColor(getResources().getColor(R.color.color_fcfcfc));
@@ -135,7 +136,7 @@ public class SendRedPacketActivity extends BaseActivity {
}
private void changeUser() {
if(userInfo!=null){
if (userInfo != null) {
viewBinding.userLy.setVisibility(View.VISIBLE);
String name =
TextUtils.isEmpty(userInfo.getName()) ? userInfo.getAccount() : userInfo.getName();
@@ -149,7 +150,7 @@ public class SendRedPacketActivity extends BaseActivity {
}
viewBinding.userNameTv.setText(name);
}else{
} else {
viewBinding.userLy.setVisibility(View.GONE);
}
}
@@ -219,6 +220,7 @@ public class SendRedPacketActivity extends BaseActivity {
}
return result;
};
private void initGroup() {
teammodel.requestTeamData(getIntent().getStringExtra("receiverUid"));
teammodel.requestTeamMembers(getIntent().getStringExtra("receiverUid"));
@@ -230,7 +232,7 @@ public class SendRedPacketActivity extends BaseActivity {
for (UserInfoWithTeam userinfo : list) {
UserInfo userInfos = userinfo.getUserInfo();
userInfos.setSignature(userinfo.getTeamInfo().isMute()?"1":"");
userInfos.setSignature(userinfo.getTeamInfo().isMute() ? "1" : "");
listmemebers.add(userInfos);
// listmemebers.add(userinfo.getUserInfo());
}
@@ -311,13 +313,13 @@ public class SendRedPacketActivity extends BaseActivity {
walletBean = feedbackResp.data;
if (walletBean != null) {
// if (isJinBi) {
viewBinding.jinbiTv.setText(String.format(getString(R.string.qbyf_txt), AppUtils.getQian(walletBean.getGoldCoin())));
viewBinding.jinbiTv.setText(String.format(getString(R.string.qbyf_txt), AppUtils.getQian(walletBean.getGoldCoin())));
// } else {
// viewBinding.jinbiTv.setText(String.format(getString(R.string.hljfye_txt), AppUtils.getQian(walletBean.getSilverCoin())));
// }
} else {
// if (isJinBi) {
viewBinding.jinbiTv.setText(String.format(getString(R.string.qbyf_txt), "0.00"));
viewBinding.jinbiTv.setText(String.format(getString(R.string.qbyf_txt), "0.00"));
// } else {
// viewBinding.jinbiTv.setText(String.format(getString(R.string.hljfye_txt), "0.00"));
// }
@@ -382,7 +384,7 @@ public class SendRedPacketActivity extends BaseActivity {
protected void initListeners() {
viewBinding.zhuanshuLy.setOnClickListener(v -> {
if(teamInfo!=null) {
if (teamInfo != null) {
int manager = 0;
if (teamMember.getType() == TeamMemberType.Owner) {
manager = 1;
@@ -404,7 +406,7 @@ public class SendRedPacketActivity extends BaseActivity {
// }
if (isGroup) {
if(isPinShouQi) {
if (isPinShouQi) {
if (TextUtils.isEmpty(viewBinding.sizeHintEt.getText().toString().trim())) {
ToastX.showShortToast(R.string.size_not_null_tips_txt);
return;
@@ -415,7 +417,7 @@ public class SendRedPacketActivity extends BaseActivity {
return;
}
}else{
} else {
if (userInfo == null) {
ToastX.showShortToast("请先选择收红包用户");
@@ -440,12 +442,13 @@ public class SendRedPacketActivity extends BaseActivity {
}
if (isGroup) {
float number = Float.parseFloat(viewBinding.numberHintEt.getText().toString().trim()) * 100;
if (number / Integer.parseInt(viewBinding.sizeHintEt.getText().toString().trim()) < 1) {
ToastX.showShortToast(R.string.dghbjebnsy_txt);
if (isPinShouQi) {
float number = Float.parseFloat(viewBinding.numberHintEt.getText().toString().trim()) * 100;
if (number / Integer.parseInt(viewBinding.sizeHintEt.getText().toString().trim()) < 1) {
ToastX.showShortToast(R.string.dghbjebnsy_txt);
return;
}
return;
}
// if (Float.parseFloat(viewBinding.numberHintEt.getText().toString().trim()) > IMUIKitConfig.GROUP_MAX_MONEY) {
@@ -455,13 +458,13 @@ public class SendRedPacketActivity extends BaseActivity {
// return;
// }
if (Integer.parseInt(viewBinding.sizeHintEt.getText().toString().trim()) > maxNumber) {
ToastX.showShortToast(R.string.hbgsbncgdqqlzs_txt);
if (Integer.parseInt(viewBinding.sizeHintEt.getText().toString().trim()) > maxNumber) {
ToastX.showShortToast(R.string.hbgsbncgdqqlzs_txt);
return;
return;
}
}
} else {
// if (Float.parseFloat(viewBinding.numberHintEt.getText().toString().trim()) > IMUIKitConfig.SINGLE_MAX_MONEY) {
//// ToastUtils.showShort(String.format(getString(R.string.max_red_packet_tips_txt),getString(R.string.danwei_txt),Const.SINGLE_MAX_MONEY));
@@ -743,8 +746,14 @@ public class SendRedPacketActivity extends BaseActivity {
if (isJinBi) {
viewBinding.tvLogin.setBackgroundResource(R.drawable.logout_btn_z_88);
if (isGroup) {
if (!TextUtils.isEmpty(viewBinding.numberHintEt.getText().toString().trim()) && !TextUtils.isEmpty(viewBinding.sizeHintEt.getText().toString().trim())) {
viewBinding.tvLogin.setBackgroundResource(R.drawable.logout_btn_red);
if (isPinShouQi) {
if (!TextUtils.isEmpty(viewBinding.numberHintEt.getText().toString().trim()) && !TextUtils.isEmpty(viewBinding.sizeHintEt.getText().toString().trim())) {
viewBinding.tvLogin.setBackgroundResource(R.drawable.logout_btn_red);
}
} else {
if (!TextUtils.isEmpty(viewBinding.numberHintEt.getText().toString().trim())) {
viewBinding.tvLogin.setBackgroundResource(R.drawable.logout_btn_red);
}
}
} else {
if (!TextUtils.isEmpty(viewBinding.numberHintEt.getText().toString().trim())) {
@@ -816,8 +825,7 @@ public class SendRedPacketActivity extends BaseActivity {
private void toChange(String position, float number, int type) {
if (isGroup) {
HashMap<String, Object> maps = new HashMap<>();
maps.put("type", isPinShouQi ? 0 : 1);
maps.put("count", viewBinding.sizeHintEt.getText().toString().trim());
maps.put("type", isPinShouQi ? 0 : 2);
maps.put("amount", (int) (number * 100));
maps.put("senderUid", Integer.parseInt(IMKitClient.account()));
maps.put("groupId", getIntent().getStringExtra("receiverUid"));
@@ -830,6 +838,16 @@ public class SendRedPacketActivity extends BaseActivity {
} else {
maps.put("remark", getString(R.string.remarks_hit_txt));
}
if (!isPinShouQi) {
maps.put("userUid", userInfo.getAccount());
maps.put("count", "1");
} else {
maps.put("count", viewBinding.sizeHintEt.getText().toString().trim());
}
maps.put("coinType", isJinBi ? 0 : 1);
if (!TextUtils.isEmpty(IMUIKitConfig.SUBSTATIONID)) {
maps.put("substationId", IMUIKitConfig.SUBSTATIONID);
@@ -843,32 +861,19 @@ public class SendRedPacketActivity extends BaseActivity {
@Override
public void onSuccess(Result<RedpacketGroupBean> feedbackResp) {
RedpacketGroupBean groupBean = feedbackResp.data;
//Long id, Integer status, Integer amount, Integer senderUid, String groupId,
// Integer count, Integer residualCount, Integer residualAmount, String sendTime,
// String finishTime, String remark, String senderNickname, Integer coinType,
// List<GrabbersBean> grabbers, Integer receiverUid, String receiveTime
List<GrabbersBean1> grabbersBean1List = null;
if (groupBean.getGrabbers() != null && groupBean.getGrabbers().size() > 0) {
//String redEnvelopeId, String grabberUid, String grabAmount, String grabTime, String grabberNickname, String grabberAvatar
grabbersBean1List = new ArrayList<>();
for (GrabbersBean grabbersBean : groupBean.getGrabbers())
grabbersBean1List.add(new GrabbersBean1(grabbersBean.getRedEnvelopeId() + "", grabbersBean.getGrabberUid() + "",
grabbersBean.getGrabAmount() + "", grabbersBean.getGrabTime() + "", grabbersBean.getGrabberNickname(), grabbersBean.getGrabberAvatar()));
}
RedPacketAttachment redPacketAttachment = new RedPacketAttachment(groupBean.getId() + "", groupBean.getStatus() + "", groupBean.getAmount() + "",
groupBean.getSenderUid() + "", groupBean.getGroupId(),
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}
if (!isPinShouQi) {
redPacketAttachment = new RedPacketAttachment(groupBean.getId() + "", groupBean.getStatus() + "", groupBean.getAmount() + "",
groupBean.getSenderUid() + "", groupBean.getGroupId(),
groupBean.getCount() + "", groupBean.getResidualCount() + "", groupBean.getResidualAmount() + "", groupBean.getSendTime(),
groupBean.getFinishTime(), groupBean.getRemark(), groupBean.getSenderNickname(), groupBean.getCoinType() + "",
userInfo.getAccount(), null, userInfo.getAvatar());
}
toShareMessageGroup(redPacketAttachment);
}