From 5b813aff88a250f4c35138eaa90b310028868c01 Mon Sep 17 00:00:00 2001 From: hch <16607480311@163.com> Date: Wed, 17 Jan 2024 11:12:53 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/layout/dialog_del_sys_msg.xml | 8 +-- common/src/main/res/values-en-rUS/string.xml | 2 + common/src/main/res/values-zh-rHK/strings.xml | 1 + common/src/main/res/values-zh-rTW/strings.xml | 2 + common/src/main/res/values-zh/strings.xml | 2 + common/src/main/res/values/strings.xml | 2 + .../live/activity/CompensateActivity.java | 52 ++++++------------- .../main/res/layout/activity_compensate.xml | 12 ++--- 8 files changed, 36 insertions(+), 45 deletions(-) diff --git a/common/src/main/res/layout/dialog_del_sys_msg.xml b/common/src/main/res/layout/dialog_del_sys_msg.xml index 3ef23ead4..691d65d14 100644 --- a/common/src/main/res/layout/dialog_del_sys_msg.xml +++ b/common/src/main/res/layout/dialog_del_sys_msg.xml @@ -26,26 +26,26 @@ android:orientation="horizontal"> diff --git a/common/src/main/res/values-en-rUS/string.xml b/common/src/main/res/values-en-rUS/string.xml index 52ccbcbbf..1a4af54ee 100644 --- a/common/src/main/res/values-en-rUS/string.xml +++ b/common/src/main/res/values-en-rUS/string.xml @@ -1445,4 +1445,6 @@ Limited ride And limited avatar frame Information Unmute Mute + + Cancel diff --git a/common/src/main/res/values-zh-rHK/strings.xml b/common/src/main/res/values-zh-rHK/strings.xml index 46ff1fc27..d10050f16 100644 --- a/common/src/main/res/values-zh-rHK/strings.xml +++ b/common/src/main/res/values-zh-rHK/strings.xml @@ -1444,4 +1444,5 @@ 直播通行證 + 取消 diff --git a/common/src/main/res/values-zh-rTW/strings.xml b/common/src/main/res/values-zh-rTW/strings.xml index e17bbbf4f..1018b7ee1 100644 --- a/common/src/main/res/values-zh-rTW/strings.xml +++ b/common/src/main/res/values-zh-rTW/strings.xml @@ -1443,4 +1443,6 @@ 直播通行證 + 取消 + diff --git a/common/src/main/res/values-zh/strings.xml b/common/src/main/res/values-zh/strings.xml index 472ac39c6..7649f4799 100644 --- a/common/src/main/res/values-zh/strings.xml +++ b/common/src/main/res/values-zh/strings.xml @@ -1440,4 +1440,6 @@ 直播通行證 + 取消 + diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index 1b5e11e88..e40c4c050 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -1449,4 +1449,6 @@ Limited ride And limited avatar frame BattlePass + Cancel + diff --git a/live/src/main/java/com/yunbao/live/activity/CompensateActivity.java b/live/src/main/java/com/yunbao/live/activity/CompensateActivity.java index d6d8371bb..a3f24c18f 100644 --- a/live/src/main/java/com/yunbao/live/activity/CompensateActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/CompensateActivity.java @@ -6,6 +6,7 @@ import android.text.format.DateUtils; import android.view.View; import android.view.ViewOutlineProvider; import android.widget.Button; +import android.widget.ImageView; import android.widget.TextView; import androidx.recyclerview.widget.LinearLayoutManager; @@ -22,6 +23,7 @@ import com.yunbao.common.CommonAppConfig; import com.yunbao.common.Constants; import com.yunbao.common.activity.AbsActivity; import com.yunbao.common.bean.IMLoginModel; +import com.yunbao.common.glide.ImgLoader; import com.yunbao.common.http.HttpCallback; import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.utils.RouteUtil; @@ -51,7 +53,6 @@ import java.util.Map; @Route(path = RouteUtil.PATH_COMPENSATE_ACTIVITY) public class CompensateActivity extends AbsActivity { - Banner banner_me; TextView content; TextView time; RecyclerView recyclerView; @@ -59,6 +60,8 @@ public class CompensateActivity extends AbsActivity { String msgId, mBanner, mContent, link; Button submit; + ImageView imgContent; + @Override protected int getLayoutId() { return R.layout.activity_compensate; @@ -75,6 +78,7 @@ public class CompensateActivity extends AbsActivity { content = findViewById(R.id.content); submit = findViewById(R.id.submit); time = findViewById(R.id.time); + imgContent = findViewById(R.id.img_content); recyclerView = findViewById(R.id.hor_recycler); recyclerView.setLayoutManager(new LinearLayoutManager(mContext, LinearLayoutManager.HORIZONTAL, false)); @@ -94,13 +98,6 @@ public class CompensateActivity extends AbsActivity { time.setText(sdf.format(currenTimeZone)); content.setText(mContent); - banner_me = findViewById(R.id.banner_me); - banner_me.setOutlineProvider(new ViewOutlineProvider() { - @Override - public void getOutline(View view, Outline outline) { - outline.setRoundRect(0, 0, view.getWidth(), view.getHeight(), 10); - } - }); if (!getIntent().getBooleanExtra("receive", false)) { submit.setBackground(mContext.getDrawable(R.mipmap.icon_sys_received)); submit.setText(getString(R.string.receive2)); @@ -130,13 +127,19 @@ public class CompensateActivity extends AbsActivity { getMessageGiftInfo(); if (!StringUtils.isEmpty(mBanner)) { - List mBannerList = new ArrayList<>(); - SlideBean slideBean = new SlideBean(); - slideBean.setSlide_pic(mBanner); - slideBean.setSlide_url(link); - mBannerList.add(slideBean); - showBanner(mBannerList); + ImgLoader.display(mContext, mBanner, imgContent); + + IMLoginModel userInfo = IMLoginManager.get(mContext).getUserInfo(); + StringBuffer urlBuffer = new StringBuffer(); + urlBuffer.append(link).append("&uid=").append(userInfo.getId()).append("&token=").append(userInfo.getToken()).append("&isZh=").append(WordUtil.isNewZh() ? "1" : 0); + findViewById(R.id.lt_advertisement).setVisibility(View.VISIBLE); + findViewById(R.id.lt_advertisement).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + mContext.startActivity(new Intent(mContext, ZhuangBanActivity.class).putExtra("url", urlBuffer.toString())); + } + }); } } @@ -149,25 +152,4 @@ public class CompensateActivity extends AbsActivity { } }); } - - private void showBanner(List mBannerList) { - banner_me.setAutoPlay(true).setPages(mBannerList, new CustomMyViewHolder()).setDelayTime(3000).setBannerStyle(BannerConfig.NOT_INDICATOR).setOnBannerClickListener(new OnBannerClickListener() { - @Override - public void onBannerClick(List datas, int p) { - if (mBannerList != null) { - if (p >= 0 && p < mBannerList.size()) { - SlideBean bean = mBannerList.get(p); - if (!bean.getSlide_url().equals("")) { - - IMLoginModel userInfo = IMLoginManager.get(mContext).getUserInfo(); - StringBuffer urlBuffer = new StringBuffer(); - urlBuffer.append(bean.getSlide_url()).append("&uid=").append(userInfo.getId()).append("&token=").append(userInfo.getToken()).append("&isZh=").append(WordUtil.isNewZh() ? "1" : 0); - mContext.startActivity(new Intent(mContext, ZhuangBanActivity.class).putExtra("url", urlBuffer.toString())); - - } - } - } - } - }).start(); - } } diff --git a/live/src/main/res/layout/activity_compensate.xml b/live/src/main/res/layout/activity_compensate.xml index a4dafaf6e..890092289 100644 --- a/live/src/main/res/layout/activity_compensate.xml +++ b/live/src/main/res/layout/activity_compensate.xml @@ -80,13 +80,13 @@ app:cardCornerRadius="10dp" app:cardElevation="0dp"> - + android:layout_height="87dp" + android:layout_centerHorizontal="true" + android:scaleType="centerCrop" /> + From 3a1268aac76ddea74bbc2fbe8b0a8c4436730d9c Mon Sep 17 00:00:00 2001 From: hch <16607480311@163.com> Date: Wed, 17 Jan 2024 11:26:15 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../live/activity/CompensateActivity.java | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/live/src/main/java/com/yunbao/live/activity/CompensateActivity.java b/live/src/main/java/com/yunbao/live/activity/CompensateActivity.java index a3f24c18f..b49b023bd 100644 --- a/live/src/main/java/com/yunbao/live/activity/CompensateActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/CompensateActivity.java @@ -128,18 +128,20 @@ public class CompensateActivity extends AbsActivity { if (!StringUtils.isEmpty(mBanner)) { ImgLoader.display(mContext, mBanner, imgContent); - - IMLoginModel userInfo = IMLoginManager.get(mContext).getUserInfo(); - StringBuffer urlBuffer = new StringBuffer(); - urlBuffer.append(link).append("&uid=").append(userInfo.getId()).append("&token=").append(userInfo.getToken()).append("&isZh=").append(WordUtil.isNewZh() ? "1" : 0); - findViewById(R.id.lt_advertisement).setVisibility(View.VISIBLE); - findViewById(R.id.lt_advertisement).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - mContext.startActivity(new Intent(mContext, ZhuangBanActivity.class).putExtra("url", urlBuffer.toString())); - } - }); + + if (!StringUtils.isEmpty(link)) { + IMLoginModel userInfo = IMLoginManager.get(mContext).getUserInfo(); + StringBuffer urlBuffer = new StringBuffer(); + urlBuffer.append(link).append("&uid=").append(userInfo.getId()).append("&token=").append(userInfo.getToken()).append("&isZh=").append(WordUtil.isNewZh() ? "1" : 0); + + findViewById(R.id.lt_advertisement).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + mContext.startActivity(new Intent(mContext, ZhuangBanActivity.class).putExtra("url", urlBuffer.toString())); + } + }); + } } } From 28571272858f209afc6683c68b31e09ff807a6fd Mon Sep 17 00:00:00 2001 From: zlzw <583819556@qq.com> Date: Wed, 17 Jan 2024 16:21:25 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=88=98=E4=BB=A4?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=97=B4=E8=B7=9D=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E3=80=90=E6=88=98=E4=BB=A4=E4=BD=99=E9=A2=9D=E4=B8=8D=E8=B6=B3?= =?UTF-8?q?=E6=9C=AA=E8=B7=B3=E8=BD=AC=E5=85=85=E5=80=BC=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E3=80=91=E9=97=AE=E9=A2=98=20=E4=BF=AE=E5=A4=8D=E3=80=90?= =?UTF-8?q?=E6=88=98=E4=BB=A4=E5=BC=80=E9=80=9A=E7=AD=89=E7=BA=A7=E6=97=B6?= =?UTF-8?q?=E5=BC=B9=E6=A1=86=E9=87=91=E9=A2=9D=E5=81=B6=E5=B0=94=E4=B8=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=E3=80=91=20=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E6=88=98=E4=BB=A4=E8=8E=B7=E5=8F=96=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=E8=B0=83=E6=95=B4=E6=88=98=E4=BB=A4item?= =?UTF-8?q?=E5=90=8D=E5=AD=97=E6=98=BE=E7=A4=BA=E6=A8=A1=E5=BC=8F=20?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=88=98=E4=BB=A4=E8=B4=AD=E4=B9=B0=E7=BB=8F?= =?UTF-8?q?=E9=AA=8C=E5=BC=B9=E6=A1=86=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dialog/LiberalBattlePassPopupWindow.java | 1 + .../common/dialog/OrderLevelPopupWindow.java | 11 ++-- .../common/http/live/LiveNetManager.java | 4 +- .../yunbao/common/manager/IMLoginManager.java | 18 ++++++ config.gradle | 8 +-- .../main/activity/BattlePassActivity.java | 16 +++++ .../main/adapter/BattlePassRewardAdapter.java | 61 ++++++++++++++++++- .../fragment/BattlePassMissionFragment.java | 25 +++++++- .../fragment/BattlePassRewardFragment.java | 33 ++++++++++ .../main/res/layout/activity_battlepass.xml | 8 +-- .../item_battlepass_reward_type_top.xml | 17 +++--- 11 files changed, 174 insertions(+), 28 deletions(-) diff --git a/common/src/main/java/com/yunbao/common/dialog/LiberalBattlePassPopupWindow.java b/common/src/main/java/com/yunbao/common/dialog/LiberalBattlePassPopupWindow.java index d01dc42a7..fb0a87a5e 100644 --- a/common/src/main/java/com/yunbao/common/dialog/LiberalBattlePassPopupWindow.java +++ b/common/src/main/java/com/yunbao/common/dialog/LiberalBattlePassPopupWindow.java @@ -77,6 +77,7 @@ public class LiberalBattlePassPopupWindow extends CenterPopupView { mPassCallback.onCallback(data.getData().getCode(), data.getData().getMsg()); } IMLoginManager.get(getContext()).upDataUserInfo(); + IMLoginManager.get(getContext()).updateUserCoin(); } @Override diff --git a/common/src/main/java/com/yunbao/common/dialog/OrderLevelPopupWindow.java b/common/src/main/java/com/yunbao/common/dialog/OrderLevelPopupWindow.java index e9d0ae11c..205ecac5f 100644 --- a/common/src/main/java/com/yunbao/common/dialog/OrderLevelPopupWindow.java +++ b/common/src/main/java/com/yunbao/common/dialog/OrderLevelPopupWindow.java @@ -9,6 +9,7 @@ import androidx.annotation.NonNull; import com.lxj.xpopup.core.CenterPopupView; import com.yunbao.common.R; +import com.yunbao.common.bean.BattlePassUserInfoBean; import com.yunbao.common.http.ResponseModel; import com.yunbao.common.http.base.HttpCallback; import com.yunbao.common.http.live.LiveNetManager; @@ -28,11 +29,12 @@ public class OrderLevelPopupWindow extends CenterPopupView { private ProgressBar progressBar; private OrderLevelCallback orderLevelCallback; private long maxExp; - - public OrderLevelPopupWindow(@NonNull Context context, + private BattlePassUserInfoBean userInfoBean; + public OrderLevelPopupWindow(@NonNull Context context, BattlePassUserInfoBean userInfoBean, int mCurrentExperience, int mTotalExperience, - String mCurrentLevel, String mBalance,long maxExp, OrderLevelCallback mOrderLevelCallback) { + String mCurrentLevel, String mBalance, long maxExp, OrderLevelCallback mOrderLevelCallback) { super(context); + this.userInfoBean = userInfoBean; currentExperience = mCurrentExperience; totalExperience = mTotalExperience; currentLevel = mCurrentLevel; @@ -59,7 +61,7 @@ public class OrderLevelPopupWindow extends CenterPopupView { orderLevel.setText(buyExp); progressBar.setMax(totalExperience); progressBar.setProgress(currentExperience); - expText.setText(String.format("%s/%s", currentExperience, totalExperience)); + expText.setText(String.format("%s/%s", userInfoBean.getBattlePassExp(), userInfoBean.getNextLevelExp())); current.setText(String.format("Lv%s", currentLevel)); balanceDiamond.setText(balance); findViewById(R.id.sub).setOnClickListener(new OnClickListener() { @@ -102,6 +104,7 @@ public class OrderLevelPopupWindow extends CenterPopupView { .buyingExperiencePoint(buyExp, new HttpCallback>() { @Override public void onSuccess(ResponseModel data) { + if (orderLevelCallback != null) { orderLevelCallback.onCallback(data.getData().getCode(), data.getMsg()); }dialog.dismiss(); diff --git a/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java b/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java index 70354f0e5..9b4321c7a 100644 --- a/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java +++ b/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java @@ -2675,9 +2675,7 @@ public class LiveNetManager { .observeOn(AndroidSchedulers.mainThread()) .subscribe(responseModel -> { if (callback != null) { - if (callback != null) { - callback.onSuccess(new HttpCallbackModel(responseModel.getData().getCode(), responseModel.getData().getMsg())); - } + callback.onSuccess(new HttpCallbackModel(responseModel.getData().getCode(), responseModel.getData().getMsg())); } }, new Consumer() { @Override diff --git a/common/src/main/java/com/yunbao/common/manager/IMLoginManager.java b/common/src/main/java/com/yunbao/common/manager/IMLoginManager.java index 7920c8b1c..c0fd33ebb 100644 --- a/common/src/main/java/com/yunbao/common/manager/IMLoginManager.java +++ b/common/src/main/java/com/yunbao/common/manager/IMLoginManager.java @@ -8,6 +8,7 @@ import android.text.TextUtils; import androidx.annotation.NonNull; +import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; import com.lzf.easyfloat.EasyFloat; import com.umeng.analytics.MobclickAgent; @@ -509,5 +510,22 @@ public class IMLoginManager extends BaseCacheManager { } }); } + public void updateUserCoin(){ + HttpClient.getInstance().get("User.getUserBalance", "User.getUserBalance") + .execute(new HttpCallback() { + @Override + public void onSuccess(int code, String msg, String[] info) { + if (code == 0) { + JSONObject obj = JSONObject.parseObject(info[0]); + String golds = obj.getString("gold"); + String coins = obj.getString("coin"); + String yuanbaos = obj.getString("yuanbao"); + userInfo.setCoin(obj.getLong("coin")); + userInfo.setGold(obj.getLong("gold")); + userInfo.setYuanbao(yuanbaos); + } + } + }); + } } diff --git a/config.gradle b/config.gradle index 33a33ff33..26fb307cc 100644 --- a/config.gradle +++ b/config.gradle @@ -5,13 +5,13 @@ ext { minSdkVersion : 21, targetSdkVersion : 33, versionCode : 460, - versionName : "6.6.3" + versionName : "6.6.4" ] manifestPlaceholders = [ //正式、 -// serverHost : "https://napi.yaoulive.com", + serverHost : "https://napi.yaoulive.com", // 测试 - serverHost : " https://ceshi.yaoulive.com", + //serverHost : " https://ceshi.yaoulive.com", //百度语音识别 @@ -21,7 +21,7 @@ ext { baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S", // true表示谷歌支付 false 0 链接包 1 谷歌包 2华为包 3 samsung包 - isGooglePlay : 3, + isGooglePlay : 0, //是否上报异常日志 isUploadLog : true, //是否打包成插件包模式 diff --git a/main/src/main/java/com/yunbao/main/activity/BattlePassActivity.java b/main/src/main/java/com/yunbao/main/activity/BattlePassActivity.java index 8bc19b420..c6c5e3392 100644 --- a/main/src/main/java/com/yunbao/main/activity/BattlePassActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/BattlePassActivity.java @@ -1,5 +1,7 @@ package com.yunbao.main.activity; +import static com.yunbao.common.utils.RouteUtil.PATH_COIN; + import android.annotation.SuppressLint; import android.app.Activity; import android.app.Dialog; @@ -15,6 +17,7 @@ import androidx.viewpager2.adapter.FragmentStateAdapter; import androidx.viewpager2.widget.ViewPager2; import com.alibaba.android.arouter.facade.annotation.Route; +import com.alibaba.android.arouter.launcher.ARouter; import com.lxj.xpopup.XPopup; import com.yunbao.common.activity.AbsActivity; import com.yunbao.common.bean.BattlePassUserInfoBean; @@ -133,6 +136,19 @@ public class BattlePassActivity extends AbsActivity { new LiberalBattlePassPopupWindow.LiberalBattlePassCallback() { @Override public void onCallback(int code, String msg) { + if (code == 1001) { + new DialogUitl.Builder(mContext) + .setView(com.yunbao.live.R.layout.dialog_live_unfollow) + .setConfirmString(getString(com.yunbao.live.R.string.charge)) + .setContent(getString(com.yunbao.live.R.string.insufficient_balance)) + .setClickCallback(new DialogUitl.SimpleCallback() { + @Override + public void onConfirmClick(Dialog dialog, String content) { + ARouter.getInstance().build(PATH_COIN).withInt("p", 0).navigation(); + } + }).build().show(); + return; + } ToastUtil.show(msg); initData(); } diff --git a/main/src/main/java/com/yunbao/main/adapter/BattlePassRewardAdapter.java b/main/src/main/java/com/yunbao/main/adapter/BattlePassRewardAdapter.java index f411b65c6..1db688217 100644 --- a/main/src/main/java/com/yunbao/main/adapter/BattlePassRewardAdapter.java +++ b/main/src/main/java/com/yunbao/main/adapter/BattlePassRewardAdapter.java @@ -1,6 +1,10 @@ package com.yunbao.main.adapter; +import static com.yunbao.common.utils.RouteUtil.PATH_COIN; + import android.annotation.SuppressLint; +import android.app.Activity; +import android.app.Dialog; import android.content.Context; import android.view.LayoutInflater; import android.view.View; @@ -13,18 +17,26 @@ import androidx.annotation.NonNull; import androidx.constraintlayout.widget.ConstraintLayout; import androidx.recyclerview.widget.RecyclerView; +import com.alibaba.android.arouter.launcher.ARouter; +import com.lxj.xpopup.XPopup; import com.yunbao.common.bean.BattlePassUserInfoBean; import com.yunbao.common.bean.HttpCallbackModel; import com.yunbao.common.bean.LiveBattlePassRewardsBean; +import com.yunbao.common.dialog.ActivateEliteBattleOrderPopupWindow; +import com.yunbao.common.dialog.LiberalBattlePassPopupWindow; import com.yunbao.common.glide.ImgLoader; import com.yunbao.common.http.base.HttpCallback; import com.yunbao.common.http.live.LiveNetManager; import com.yunbao.common.interfaces.OnItemClickListener; +import com.yunbao.common.utils.Bus; +import com.yunbao.common.utils.DeviceUtils; +import com.yunbao.common.utils.DialogUitl; import com.yunbao.common.utils.DpUtil; import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.WordUtil; import com.yunbao.common.views.weight.ViewClicksAntiShake; import com.yunbao.main.R; +import com.yunbao.main.event.BattlePassTypeEvent; import java.util.ArrayList; import java.util.List; @@ -36,6 +48,7 @@ public class BattlePassRewardAdapter extends RecyclerView.Adapter> mList = new ArrayList<>(); private int userLevel; private BattlePassUserInfoBean userType; + private String quintessenceSpendMoney,enjoySpendMoney; private OnItemClickListener onItemClickListener; public void setList(List> mList) { @@ -74,6 +87,14 @@ public class BattlePassRewardAdapter extends RecyclerView.Adapter() { @Override public void onSuccess(HttpCallbackModel data) { - ToastUtil.show(WordUtil.getNewString(R.string.battlepass_reward_item_get)); + ToastUtil.show(data.getMsg()); if (onItemClickListener != null) { onItemClickListener.onItemClick(reward, reward.getId()); } @@ -275,7 +301,38 @@ public class BattlePassRewardAdapter extends RecyclerView.Adapter { diff --git a/main/src/main/java/com/yunbao/main/fragment/BattlePassMissionFragment.java b/main/src/main/java/com/yunbao/main/fragment/BattlePassMissionFragment.java index bfa6b0d28..6aea5d641 100644 --- a/main/src/main/java/com/yunbao/main/fragment/BattlePassMissionFragment.java +++ b/main/src/main/java/com/yunbao/main/fragment/BattlePassMissionFragment.java @@ -1,6 +1,9 @@ package com.yunbao.main.fragment; +import static com.yunbao.common.utils.RouteUtil.PATH_COIN; + import android.app.Activity; +import android.app.Dialog; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; @@ -8,6 +11,7 @@ import android.view.ViewGroup; import androidx.recyclerview.widget.RecyclerView; +import com.alibaba.android.arouter.launcher.ARouter; import com.lxj.xpopup.XPopup; import com.yunbao.common.bean.BattlePassTask; import com.yunbao.common.bean.BattlePassUserInfoBean; @@ -20,6 +24,7 @@ import com.yunbao.common.interfaces.OnItemClickListener; import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.utils.Bus; import com.yunbao.common.utils.DeviceUtils; +import com.yunbao.common.utils.DialogUitl; import com.yunbao.common.utils.DpUtil; import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.WordUtil; @@ -83,18 +88,32 @@ public class BattlePassMissionFragment extends BaseFragment { .enableDrag(false) .maxWidth(DeviceUtils.getScreenHeight((Activity) getContext()) - DpUtil.dp2px(34)) .asCustom(new OrderLevelPopupWindow(getContext(), - userInfoBean.getBattlePassExp() - userInfoBean.getLastLevelExp(), - userInfoBean.getNextLevelExp() - userInfoBean.getLastLevelExp(), + userInfoBean, + userInfoBean.getBattlePassExp()-userInfoBean.getLastLevelExp(), + userInfoBean.getNextLevelExp()-userInfoBean.getLastLevelExp(), String.valueOf(userInfoBean.getLevel()), String.valueOf(IMLoginManager.get(getContext()).getUserInfo().getCoin()), maxExp, new OrderLevelPopupWindow.OrderLevelCallback() { @Override public void onCallback(int code, String msg) { + if (code == 1001) { + new DialogUitl.Builder(getContext()) + .setView(com.yunbao.live.R.layout.dialog_live_unfollow) + .setConfirmString(getString(com.yunbao.live.R.string.charge)) + .setContent(getString(com.yunbao.live.R.string.insufficient_balance)) + .setClickCallback(new DialogUitl.SimpleCallback() { + @Override + public void onConfirmClick(Dialog dialog, String content) { + ARouter.getInstance().build(PATH_COIN).withInt("p", 0).navigation(); + } + }).build().show(); + return; + } ToastUtil.show(msg); Bus.get().post(new BattlePassTypeEvent(0)); + IMLoginManager.get(getContext()).updateUserCoin(); updateData(); - IMLoginManager.get(getContext()).upDataUserInfo(); } } ) diff --git a/main/src/main/java/com/yunbao/main/fragment/BattlePassRewardFragment.java b/main/src/main/java/com/yunbao/main/fragment/BattlePassRewardFragment.java index 099f6431f..389c7b1b7 100644 --- a/main/src/main/java/com/yunbao/main/fragment/BattlePassRewardFragment.java +++ b/main/src/main/java/com/yunbao/main/fragment/BattlePassRewardFragment.java @@ -1,6 +1,9 @@ package com.yunbao.main.fragment; +import static com.yunbao.common.utils.RouteUtil.PATH_COIN; + import android.app.Activity; +import android.app.Dialog; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; @@ -10,6 +13,7 @@ import android.widget.ImageView; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; +import com.alibaba.android.arouter.launcher.ARouter; import com.lxj.xpopup.XPopup; import com.yunbao.common.bean.BattlePassUserInfoBean; import com.yunbao.common.bean.LiveBattlePassRewardsBean; @@ -21,6 +25,7 @@ import com.yunbao.common.http.live.LiveNetManager; import com.yunbao.common.interfaces.OnItemClickListener; import com.yunbao.common.utils.Bus; import com.yunbao.common.utils.DeviceUtils; +import com.yunbao.common.utils.DialogUitl; import com.yunbao.common.utils.DpUtil; import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.WordUtil; @@ -104,6 +109,19 @@ public class BattlePassRewardFragment extends BaseFragment { new LiberalBattlePassPopupWindow.LiberalBattlePassCallback() { @Override public void onCallback(int code, String msg) { + if (code == 1001) { + new DialogUitl.Builder(getContext()) + .setView(com.yunbao.live.R.layout.dialog_live_unfollow) + .setConfirmString(getString(com.yunbao.live.R.string.charge)) + .setContent(getString(com.yunbao.live.R.string.insufficient_balance)) + .setClickCallback(new DialogUitl.SimpleCallback() { + @Override + public void onConfirmClick(Dialog dialog, String content) { + ARouter.getInstance().build(PATH_COIN).withInt("p", 0).navigation(); + } + }).build().show(); + return; + } ToastUtil.show(msg); updateData(); Bus.get().post(new BattlePassTypeEvent(0)); @@ -127,6 +145,19 @@ public class BattlePassRewardFragment extends BaseFragment { new LiberalBattlePassPopupWindow.LiberalBattlePassCallback() { @Override public void onCallback(int code, String msg) { + if (code == 1001) { + new DialogUitl.Builder(getContext()) + .setView(com.yunbao.live.R.layout.dialog_live_unfollow) + .setConfirmString(getString(com.yunbao.live.R.string.charge)) + .setContent(getString(com.yunbao.live.R.string.insufficient_balance)) + .setClickCallback(new DialogUitl.SimpleCallback() { + @Override + public void onConfirmClick(Dialog dialog, String content) { + ARouter.getInstance().build(PATH_COIN).withInt("p", 0).navigation(); + } + }).build().show(); + return; + } ToastUtil.show(msg); updateData(); Bus.get().post(new BattlePassTypeEvent(0)); @@ -151,9 +182,11 @@ public class BattlePassRewardFragment extends BaseFragment { for (LiveBattlePassRewardsBean.BattlePassType passType : data.getLive_battle_pass_type()) { if (passType.getId() == 2) { quintessenceSpendMoney = String.valueOf(passType.getDiamond_value()); + adapter.setQuintessenceSpendMoney(quintessenceSpendMoney); } if (passType.getId() == 3) { enjoySpendMoney = String.valueOf(passType.getDiamond_value()); + adapter.setEnjoySpendMoney(enjoySpendMoney); } } diff --git a/main/src/main/res/layout/activity_battlepass.xml b/main/src/main/res/layout/activity_battlepass.xml index 98eb8812c..bf646eb73 100644 --- a/main/src/main/res/layout/activity_battlepass.xml +++ b/main/src/main/res/layout/activity_battlepass.xml @@ -85,13 +85,13 @@ layout="@layout/view_battlepass_user" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="32dp" /> + android:layout_marginTop="16dp" /> + android:layout_height="match_parent" + android:layout_marginTop="10dp" + android:background="@drawable/background_order_dialog" /> \ No newline at end of file diff --git a/main/src/main/res/layout/item_battlepass_reward_type_top.xml b/main/src/main/res/layout/item_battlepass_reward_type_top.xml index 7afc6a5af..10ddef773 100644 --- a/main/src/main/res/layout/item_battlepass_reward_type_top.xml +++ b/main/src/main/res/layout/item_battlepass_reward_type_top.xml @@ -122,13 +122,10 @@ android:layout_marginTop="8dp" android:text="甜蜜氣球\n&積分30" android:textColor="#0D21B2" - android:textSize="14sp" + android:textSize="12sp" android:textStyle="bold" - android:maxLines="2" - app:autoSizeMaxTextSize="14sp" - app:autoSizeMinTextSize="5sp" - app:autoSizeStepGranularity="1sp" - app:autoSizeTextType="uniform" + android:maxLines="1" + android:ellipsize="end" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/tab_1_bg" /> @@ -199,7 +196,9 @@ android:layout_marginTop="8dp" android:text="甜蜜氣球\n&積分30" android:textColor="#0D21B2" - android:textSize="14sp" + android:textSize="12sp" + android:maxLines="1" + android:ellipsize="end" android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -263,12 +262,14 @@ app:layout_constraintTop_toTopOf="parent" /> Date: Thu, 18 Jan 2024 10:57:21 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=88=98=E4=BB=A4?= =?UTF-8?q?=E5=A5=96=E5=8A=B1=E5=88=97=E8=A1=A8=E7=9A=84=E6=B8=B2=E6=9F=93?= =?UTF-8?q?=20=E6=9B=B4=E6=94=B9=E6=88=98=E4=BB=A4=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E9=87=91=E5=B8=81=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/bean/BattlePassUserInfoBean.java | 23 +++++++++++++++ .../bean/LiveBattlePassRewardsBean.java | 13 +++++++++ .../common/dialog/OrderLevelPopupWindow.java | 28 +++++++++++++++---- .../yunbao/common/manager/IMLoginManager.java | 20 ++++++++++++- .../main/adapter/BattlePassRewardAdapter.java | 5 ++++ .../fragment/BattlePassMissionFragment.java | 1 - 6 files changed, 82 insertions(+), 8 deletions(-) diff --git a/common/src/main/java/com/yunbao/common/bean/BattlePassUserInfoBean.java b/common/src/main/java/com/yunbao/common/bean/BattlePassUserInfoBean.java index f6fb0f17c..12ef62d04 100644 --- a/common/src/main/java/com/yunbao/common/bean/BattlePassUserInfoBean.java +++ b/common/src/main/java/com/yunbao/common/bean/BattlePassUserInfoBean.java @@ -173,4 +173,27 @@ public class BattlePassUserInfoBean extends BaseModel{ public void setMaxLevel(int maxLevel) { this.maxLevel = maxLevel; } + + @Override + public String toString() { + return "BattlePassUserInfoBean{" + + "uid='" + uid + '\'' + + ", points=" + points + + ", battlePassExp=" + battlePassExp + + ", battlePassUserRecords1=" + battlePassUserRecords1 + + ", battlePassUserRecords2=" + battlePassUserRecords2 + + ", battlePassUserRecords3=" + battlePassUserRecords3 + + ", level=" + level + + ", lastLevelExp=" + lastLevelExp + + ", nextLevelExp=" + nextLevelExp + + ", id='" + id + '\'' + + ", battlePassName='" + battlePassName + '\'' + + ", startTime='" + startTime + '\'' + + ", endTime='" + endTime + '\'' + + ", battlePassStatus=" + battlePassStatus + + ", maxLevelExp=" + maxLevelExp + + ", maxLevel=" + maxLevel + + ", live_battle_pass_type=" + live_battle_pass_type + + '}'; + } } diff --git a/common/src/main/java/com/yunbao/common/bean/LiveBattlePassRewardsBean.java b/common/src/main/java/com/yunbao/common/bean/LiveBattlePassRewardsBean.java index 942e5d34d..3deed7e93 100644 --- a/common/src/main/java/com/yunbao/common/bean/LiveBattlePassRewardsBean.java +++ b/common/src/main/java/com/yunbao/common/bean/LiveBattlePassRewardsBean.java @@ -158,5 +158,18 @@ public class LiveBattlePassRewardsBean extends BaseModel{ public void setReceived(int received) { this.received = received; } + + @Override + public String toString() { + return "LiveBattlePassReward{" + + "id=" + id + + ", liveBattlePassLevel=" + liveBattlePassLevel + + ", liveBattlePassTypeId=" + liveBattlePassTypeId + + ", rewardName='" + rewardName + '\'' + + ", imageUrl='" + imageUrl + '\'' + + ", lock=" + lock + + ", received=" + received + + '}'; + } } } diff --git a/common/src/main/java/com/yunbao/common/dialog/OrderLevelPopupWindow.java b/common/src/main/java/com/yunbao/common/dialog/OrderLevelPopupWindow.java index 205ecac5f..0d64fa8c4 100644 --- a/common/src/main/java/com/yunbao/common/dialog/OrderLevelPopupWindow.java +++ b/common/src/main/java/com/yunbao/common/dialog/OrderLevelPopupWindow.java @@ -7,12 +7,15 @@ import android.widget.TextView; import androidx.annotation.NonNull; +import com.alibaba.fastjson.JSONObject; import com.lxj.xpopup.core.CenterPopupView; import com.yunbao.common.R; import com.yunbao.common.bean.BattlePassUserInfoBean; import com.yunbao.common.http.ResponseModel; import com.yunbao.common.http.base.HttpCallback; import com.yunbao.common.http.live.LiveNetManager; +import com.yunbao.common.interfaces.OnItemClickListener; +import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.WordUtil; import com.yunbao.common.views.weight.ViewClicksAntiShake; @@ -23,13 +26,14 @@ import java.math.BigDecimal; * 战令等级 经验 */ public class OrderLevelPopupWindow extends CenterPopupView { - private TextView orderLevel, orderLevelDiamond, balanceDiamond, current,expText; + private TextView orderLevel, orderLevelDiamond, balanceDiamond, current, expText; private int currentExperience, totalExperience;//当前经验，全部经验 private String buyExp = "100", currentLevel, balance; private ProgressBar progressBar; private OrderLevelCallback orderLevelCallback; private long maxExp; private BattlePassUserInfoBean userInfoBean; + public OrderLevelPopupWindow(@NonNull Context context, BattlePassUserInfoBean userInfoBean, int mCurrentExperience, int mTotalExperience, String mCurrentLevel, String mBalance, long maxExp, OrderLevelCallback mOrderLevelCallback) { @@ -39,7 +43,7 @@ public class OrderLevelPopupWindow extends CenterPopupView { totalExperience = mTotalExperience; currentLevel = mCurrentLevel; balance = mBalance; - this.maxExp=maxExp; + this.maxExp = maxExp; orderLevelCallback = mOrderLevelCallback; } @@ -85,8 +89,8 @@ public class OrderLevelPopupWindow extends CenterPopupView { buyExp = String.valueOf(buyExpBigDecimal.intValue()); orderLevelDiamond.setText(String.valueOf(buyExpBigDecimal.floatValue())); orderLevel.setText(buyExp); - }else if(exp>=maxExp){ - ToastUtil.show(WordUtil.isNewZh()?"经验已滿":"Experience full"); + } else if (exp >= maxExp) { + ToastUtil.show(WordUtil.isNewZh() ? "经验已滿" : "Experience full"); } } @@ -107,18 +111,30 @@ public class OrderLevelPopupWindow extends CenterPopupView { if (orderLevelCallback != null) { orderLevelCallback.onCallback(data.getData().getCode(), data.getMsg()); - }dialog.dismiss(); + } + dialog.dismiss(); } @Override public void onError(String error) { if (orderLevelCallback != null) { orderLevelCallback.onCallback(102, error); - } dialog.dismiss(); + } + dialog.dismiss(); } }); } }); + IMLoginManager.get(getContext()) + .updateUserCoin(new OnItemClickListener() { + @Override + public void onItemClick(JSONObject bean, int position) { + if (bean != null) { + balance = bean.getString("coin"); + balanceDiamond.setText(balance); + } + } + }); } public interface OrderLevelCallback { diff --git a/common/src/main/java/com/yunbao/common/manager/IMLoginManager.java b/common/src/main/java/com/yunbao/common/manager/IMLoginManager.java index c0fd33ebb..cb7684922 100644 --- a/common/src/main/java/com/yunbao/common/manager/IMLoginManager.java +++ b/common/src/main/java/com/yunbao/common/manager/IMLoginManager.java @@ -17,6 +17,7 @@ import com.yunbao.common.bean.IMLoginModel; import com.yunbao.common.event.DataUserInfoEvent; import com.yunbao.common.http.HttpCallback; import com.yunbao.common.http.HttpClient; +import com.yunbao.common.interfaces.OnItemClickListener; import com.yunbao.common.manager.base.BaseCacheManager; import com.yunbao.common.manager.imrongcloud.MessageIMManager; import com.yunbao.common.manager.imrongcloud.RongcloudIMManager; @@ -527,5 +528,22 @@ public class IMLoginManager extends BaseCacheManager { } }); } - + public void updateUserCoin(OnItemClickListener listener){ + HttpClient.getInstance().get("User.getUserBalance", "User.getUserBalance") + .execute(new HttpCallback() { + @Override + public void onSuccess(int code, String msg, String[] info) { + if (code == 0) { + JSONObject obj = JSONObject.parseObject(info[0]); + listener.onItemClick(obj,0); + String golds = obj.getString("gold"); + String coins = obj.getString("coin"); + String yuanbaos = obj.getString("yuanbao"); + userInfo.setCoin(obj.getLong("coin")); + userInfo.setGold(obj.getLong("gold")); + userInfo.setYuanbao(yuanbaos); + } + } + }); + } } diff --git a/main/src/main/java/com/yunbao/main/adapter/BattlePassRewardAdapter.java b/main/src/main/java/com/yunbao/main/adapter/BattlePassRewardAdapter.java index 1db688217..f862fb108 100644 --- a/main/src/main/java/com/yunbao/main/adapter/BattlePassRewardAdapter.java +++ b/main/src/main/java/com/yunbao/main/adapter/BattlePassRewardAdapter.java @@ -6,6 +6,7 @@ import android.annotation.SuppressLint; import android.app.Activity; import android.app.Dialog; import android.content.Context; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -165,6 +166,9 @@ public class BattlePassRewardAdapter extends RecyclerView.Adapter { lv.setText("V" + reward.getLiveBattlePassLevel()); + lv.setTag(reward); view.setText(reward.getRewardName()); }), tab1Title, tab2Title, tab3Title); getAllView(((reward, view) -> { diff --git a/main/src/main/java/com/yunbao/main/fragment/BattlePassMissionFragment.java b/main/src/main/java/com/yunbao/main/fragment/BattlePassMissionFragment.java index 6aea5d641..dd55d1c92 100644 --- a/main/src/main/java/com/yunbao/main/fragment/BattlePassMissionFragment.java +++ b/main/src/main/java/com/yunbao/main/fragment/BattlePassMissionFragment.java @@ -112,7 +112,6 @@ public class BattlePassMissionFragment extends BaseFragment { } ToastUtil.show(msg); Bus.get().post(new BattlePassTypeEvent(0)); - IMLoginManager.get(getContext()).updateUserCoin(); updateData(); } }