yutou/pandorapan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

initHourRankList UI调整

Browse Source
This commit is contained in:
ningwenqiang 2024-10-22 17:10:08 +08:00
parent 3ddcc944c0
commit 5c369f7215
11 changed files with 155 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/tmp/full-r8-config.txt
View File

@ -1,4 +1,4 @@
# The proguard configuration file for the following section is D:\AndroidProject\pandorapan\app\build\intermediates\default_proguard_files\global\proguard-android.txt-8.3.1 # The proguard configuration file for the following section is D:\AndroidProject\pandorapanP\app\build\intermediates\default_proguard_files\global\proguard-android.txt-8.3.1
# This is a configuration file for ProGuard. # This is a configuration file for ProGuard.
# http://proguard.sourceforge.net/index.html#manual/usage.html # http://proguard.sourceforge.net/index.html#manual/usage.html
# #
@ -95,8 +95,8 @@
# These classes are duplicated between android.jar and core-lambda-stubs.jar. # These classes are duplicated between android.jar and core-lambda-stubs.jar.
-dontnote java.lang.invoke.** -dontnote java.lang.invoke.**
# End of content from D:\AndroidProject\pandorapan\app\build\intermediates\default_proguard_files\global\proguard-android.txt-8.3.1 # End of content from D:\AndroidProject\pandorapanP\app\build\intermediates\default_proguard_files\global\proguard-android.txt-8.3.1
# The proguard configuration file for the following section is D:\AndroidProject\pandorapan\app\proguard-rules.pro # The proguard configuration file for the following section is D:\AndroidProject\pandorapanP\app\proguard-rules.pro
# Add project specific ProGuard rules here. # Add project specific ProGuard rules here.
# By default, the flags in this file are appended to flags specified # By default, the flags in this file are appended to flags specified
# in /Users/macpro/Library/Android/sdk/tools/proguard/proguard-android.txt # in /Users/macpro/Library/Android/sdk/tools/proguard/proguard-android.txt
@ -420,8 +420,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
-ignorewarnings -ignorewarnings
# End of content from D:\AndroidProject\pandorapan\app\proguard-rules.pro # End of content from D:\AndroidProject\pandorapanP\app\proguard-rules.pro
# The proguard configuration file for the following section is D:\AndroidProject\pandorapan\app\build\intermediates\aapt_proguard_file\link_onlineRelease\processLink_onlineReleaseResources\aapt_rules.txt # The proguard configuration file for the following section is D:\AndroidProject\pandorapanP\app\build\intermediates\aapt_proguard_file\link_onlineRelease\processLink_onlineReleaseResources\aapt_rules.txt
-keep class androidx.core.app.CoreComponentFactory { <init>(); } -keep class androidx.core.app.CoreComponentFactory { <init>(); }
-keep class androidx.core.content.FileProvider { <init>(); } -keep class androidx.core.content.FileProvider { <init>(); }
-keep class androidx.core.content.FileProvider4Utils { <init>(); } -keep class androidx.core.content.FileProvider4Utils { <init>(); }
@ -1094,10 +1094,10 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
-keepclassmembers class * { *** videoEditClick(android.view.View); } -keepclassmembers class * { *** videoEditClick(android.view.View); }
# End of content from D:\AndroidProject\pandorapan\app\build\intermediates\aapt_proguard_file\link_onlineRelease\processLink_onlineReleaseResources\aapt_rules.txt # End of content from D:\AndroidProject\pandorapanP\app\build\intermediates\aapt_proguard_file\link_onlineRelease\processLink_onlineReleaseResources\aapt_rules.txt
# The proguard configuration file for the following section is D:\AndroidProject\pandorapan\lib_faceunity\build\intermediates\consumer_proguard_dir\link_onlineRelease\exportLink_onlineReleaseConsumerProguardFiles\lib0\proguard.txt # The proguard configuration file for the following section is D:\AndroidProject\pandorapanP\lib_faceunity\build\intermediates\consumer_proguard_dir\link_onlineRelease\exportLink_onlineReleaseConsumerProguardFiles\lib0\proguard.txt
# End of content from D:\AndroidProject\pandorapan\lib_faceunity\build\intermediates\consumer_proguard_dir\link_onlineRelease\exportLink_onlineReleaseConsumerProguardFiles\lib0\proguard.txt # End of content from D:\AndroidProject\pandorapanP\lib_faceunity\build\intermediates\consumer_proguard_dir\link_onlineRelease\exportLink_onlineReleaseConsumerProguardFiles\lib0\proguard.txt
# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\8d3e3177c15403546de73d87508067d6\transformed\jetified-XPopup-2.10.0\proguard.txt # The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\8d3e3177c15403546de73d87508067d6\transformed\jetified-XPopup-2.10.0\proguard.txt
# Generated keep rule for Lifecycle observer adapter. # Generated keep rule for Lifecycle observer adapter.
-if class com.lxj.xpopup.core.BasePopupView { -if class com.lxj.xpopup.core.BasePopupView {
@ -1157,9 +1157,9 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\a1df9a6aa192455030f7c9970b70e0e9\transformed\material-1.4.0\proguard.txt # End of content from C:\Users\CVB88\.gradle\caches\transforms-3\a1df9a6aa192455030f7c9970b70e0e9\transformed\material-1.4.0\proguard.txt
# The proguard configuration file for the following section is D:\AndroidProject\pandorapan\lib_google\build\intermediates\consumer_proguard_dir\link_onlineRelease\exportLink_onlineReleaseConsumerProguardFiles\lib0\proguard.txt # The proguard configuration file for the following section is D:\AndroidProject\pandorapanP\lib_google\build\intermediates\consumer_proguard_dir\link_onlineRelease\exportLink_onlineReleaseConsumerProguardFiles\lib0\proguard.txt
# End of content from D:\AndroidProject\pandorapan\lib_google\build\intermediates\consumer_proguard_dir\link_onlineRelease\exportLink_onlineReleaseConsumerProguardFiles\lib0\proguard.txt # End of content from D:\AndroidProject\pandorapanP\lib_google\build\intermediates\consumer_proguard_dir\link_onlineRelease\exportLink_onlineReleaseConsumerProguardFiles\lib0\proguard.txt
# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\2929985d9627ba3bb45a0ebd18eaf9d3\transformed\jetified-linesdk-5.0.1\proguard.txt # The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\2929985d9627ba3bb45a0ebd18eaf9d3\transformed\jetified-linesdk-5.0.1\proguard.txt
-keepattributes *Annotation* -keepattributes *Annotation*
@ -1510,9 +1510,9 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
public boolean isLayoutSuppressed(); public boolean isLayoutSuppressed();
} }
# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\e9de7db2640f13ae2ab2a585dfd19337\transformed\recyclerview-1.2.1\proguard.txt # End of content from C:\Users\CVB88\.gradle\caches\transforms-3\e9de7db2640f13ae2ab2a585dfd19337\transformed\recyclerview-1.2.1\proguard.txt
# The proguard configuration file for the following section is D:\AndroidProject\pandorapan\TabLayout\build\intermediates\consumer_proguard_dir\release\exportReleaseConsumerProguardFiles\lib0\proguard.txt # The proguard configuration file for the following section is D:\AndroidProject\pandorapanP\TabLayout\build\intermediates\consumer_proguard_dir\release\exportReleaseConsumerProguardFiles\lib0\proguard.txt
# End of content from D:\AndroidProject\pandorapan\TabLayout\build\intermediates\consumer_proguard_dir\release\exportReleaseConsumerProguardFiles\lib0\proguard.txt # End of content from D:\AndroidProject\pandorapanP\TabLayout\build\intermediates\consumer_proguard_dir\release\exportReleaseConsumerProguardFiles\lib0\proguard.txt
# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\bb5ec4ef561b90312eb1ca52da1f144d\transformed\jetified-facebook-applinks-15.2.0\proguard.txt # The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\bb5ec4ef561b90312eb1ca52da1f144d\transformed\jetified-facebook-applinks-15.2.0\proguard.txt
# Copyright (c) Meta Platforms, Inc. and affiliates. # Copyright (c) Meta Platforms, Inc. and affiliates.
# All rights reserved. # All rights reserved.

21
common/src/main/java/com/yunbao/common/bean/NewPeopleTaskModel.java
View File

@ -1,5 +1,7 @@
package com.yunbao.common.bean; package com.yunbao.common.bean;
import android.util.Log;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
public class NewPeopleTaskModel extends BaseModel { public class NewPeopleTaskModel extends BaseModel {
@ -10,9 +12,12 @@ public class NewPeopleTaskModel extends BaseModel {
private GiftModel gift = new GiftModel(); private GiftModel gift = new GiftModel();
@SerializedName("reward_all") @SerializedName("reward_all")
private RewardAllModel rewardAll = new RewardAllModel(); private RewardAllModel rewardAll = new RewardAllModel();
@SerializedName("reward_one")
private RewardAllModel rewardOne = new RewardAllModel(); private RewardAllModel rewardOne = new RewardAllModel();
@SerializedName("is_free_gift")
private String isFreeGift = "1";
public TaskModel getTask() { public TaskModel getTask() {
return task; return task;
} }
@ -22,6 +27,20 @@ public class NewPeopleTaskModel extends BaseModel {
return this; return this;
} }
public String getIsFreeGift() {
return isFreeGift;
}
public void setIsFreeGift(String isFreeGift) {
this.isFreeGift = isFreeGift;
}
public boolean hasFreeGift(){
Log.i("hasFreeGift",isFreeGift);
return isFreeGift.equals("0");
}
public GiftModel getGift() { public GiftModel getGift() {
return gift; return gift;
} }

37
common/src/main/java/com/yunbao/common/bean/SendFreeGiftBean.java Normal file
View File

@ -0,0 +1,37 @@
package com.yunbao.common.bean;
import com.google.gson.annotations.SerializedName;
public class SendFreeGiftBean extends BaseModel{
//"code":0,"msg":"","info":[]},"msg":""
@SerializedName("code")
private int code;
@SerializedName("msg")
private String msg;
@SerializedName("info")
private String info;
public int getCode() {
return code;
}
public void setCode(int code) {
this.code = code;
}
public String getMsg() {
return msg;
}
public void setMsg(String msg) {
this.msg = msg;
}
public String getInfo() {
return info;
}
public void setInfo(String info) {
this.info = info;
}
}

11
common/src/main/java/com/yunbao/common/http/LiveHttpUtil.java
View File

@ -625,6 +625,17 @@ public class LiveHttpUtil {
.execute(callback); .execute(callback);
} }
/**
* 完成新手任務
*/
public static void setFrontTaskNew(String liveuid, HttpCallback callback) {
HttpClient.getInstance().get("tasknew.sendFreeGift", "tasknew.sendFreeGift")
.params("liveuid", liveuid)
.params("token", true)
.params("uid", true)
.execute(callback);
}
/** /**
* 修改心愿单列表 * 修改心愿单列表
*/ */

9
common/src/main/java/com/yunbao/common/http/PDLiveApi.java
View File

@ -215,6 +215,15 @@ public interface PDLiveApi {
@GET("/api/public/?service=Live.getHourChartRank") @GET("/api/public/?service=Live.getHourChartRank")
Observable<ResponseModel<List<HourRank>>> getHourChartRank(@Query("liveuid") String liveuid); Observable<ResponseModel<List<HourRank>>> getHourChartRank(@Query("liveuid") String liveuid);
/**
* 小时榜接口
*
* @param liveuid 直播间id
*/
@GET("/api/public/?service=Tasknew.sendFreeGift")
Observable<ResponseModel<SendFreeGiftBean>> sendFreeGift(@Query("liveuid") String liveuid);
/** /**
* 清除系统消息的未读数 * 清除系统消息的未读数
*/ */

4
config.gradle
View File

@ -4,7 +4,7 @@ ext {
buildToolsVersion: "29.0.2", buildToolsVersion: "29.0.2",
minSdkVersion : 23, minSdkVersion : 23,
targetSdkVersion : 34, targetSdkVersion : 34,
versionCode : 561, versionCode : 607,
versionName : "6.8.3", versionName : "6.8.3",
namespace : "com.pandoralive.shayu" namespace : "com.pandoralive.shayu"
] ]
@ -12,7 +12,7 @@ ext {
//正式、 //正式、
serverHost : "https://napi.yaoulive.com", serverHost : "https://napi.yaoulive.com",
// 测试 // 测试
testServerHost : "https://ceshi.yaoulive.com", testServerHost : "https://ceshi.yaoulive.com", // https://ceshi.yaoulive.com https://ceshi.poyoshow.com
buildTime : new Date().format("MM-dd HH:mm", TimeZone.getTimeZone("GMT+8")), buildTime : new Date().format("MM-dd HH:mm", TimeZone.getTimeZone("GMT+8")),
//百度语音识别 //百度语音识别

15
live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup2.java
View File

@ -61,6 +61,7 @@ import com.yunbao.common.event.GiftNumberEvent;
import com.yunbao.common.event.LiveGiftDialogEvent; import com.yunbao.common.event.LiveGiftDialogEvent;
import com.yunbao.common.event.SendBlindGiftEvent; import com.yunbao.common.event.SendBlindGiftEvent;
import com.yunbao.common.glide.ImgLoader; import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.http.API;
import com.yunbao.common.http.HttpCallback; import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.http.HttpClient; import com.yunbao.common.http.HttpClient;
import com.yunbao.common.http.LiveHttpUtil; import com.yunbao.common.http.LiveHttpUtil;
@ -108,6 +109,9 @@ import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
/** /**
* 直播间新送礼弹窗 * 直播间新送礼弹窗
*/ */
@ -750,19 +754,14 @@ public class LiveGiftPopup2 extends AbsDialogFragment {
} }
if (liveGiftModel.getTag() != null) { if (liveGiftModel.getTag() != null) {
if (mCount.equals("1")) { if (mCount.equals("1")) {
LiveHttpUtil.setFrontTask("sendgift", mLiveUid, new HttpCallback() { API.get().pdLiveApi(mContext).sendFreeGift(mLiveUid).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(listResponseModel -> {
@Override
public void onSuccess(int code, String msg, String[] info) {
EventBus.getDefault().post("stop_svga_new_user_gif"); EventBus.getDefault().post("stop_svga_new_user_gif");
EventBus.getDefault().post("stop_new_user_gif"); EventBus.getDefault().post("stop_new_user_gif");
if (code == 0) { if (listResponseModel.getData() != null && listResponseModel.getData().getCode() == 0) {
EventBus.getDefault().post("stop_new_user_gif1"); EventBus.getDefault().post("stop_new_user_gif1");
} }
dismiss(); dismiss();
} }, Throwable::printStackTrace).isDisposed();
});
} else {
ToastUtil.show(mContext.getString(com.yunbao.live.R.string.only_one));
} }
} else { } else {
if (TextUtils.isEmpty(mLiveUid) || TextUtils.isEmpty(mStream) || liveGiftModel == null) { if (TextUtils.isEmpty(mLiveUid) || TextUtils.isEmpty(mStream) || liveGiftModel == null) {

16
live/src/main/java/com/yunbao/live/socket/SocketRyChatUtil.java
View File

@ -210,14 +210,14 @@ public class SocketRyChatUtil {
} }
}); });
LiveHttpUtil.setFrontTask("illumine", new HttpCallback() { // LiveHttpUtil.setFrontTask("illumine", new HttpCallback() {
@Override // @Override
public void onSuccess(int code, String msg, String[] info) { // public void onSuccess(int code, String msg, String[] info) {
if (code == 0) { // if (code == 0) {
EventBus.getDefault().post("stop_svga_new_user_double1"); // EventBus.getDefault().post("stop_svga_new_user_double1");
} // }
} // }
}); // });
if (SocketRyClient.mSocketHandler != null) if (SocketRyClient.mSocketHandler != null)
SocketRyClient.mSocketHandler.processBroadcast(msg.mResult.toString() + ""); SocketRyClient.mSocketHandler.processBroadcast(msg.mResult.toString() + "");
} }

16
live/src/main/java/com/yunbao/live/socket/SocketSwChatUtil.java
View File

@ -210,14 +210,14 @@ public class SocketSwChatUtil {
} }
}); });
LiveHttpUtil.setFrontTask("illumine", new HttpCallback() { // LiveHttpUtil.setFrontTask("illumine", new HttpCallback() {
@Override // @Override
public void onSuccess(int code, String msg, String[] info) { // public void onSuccess(int code, String msg, String[] info) {
if (code == 0) { // if (code == 0) {
EventBus.getDefault().post("stop_svga_new_user_double1"); // EventBus.getDefault().post("stop_svga_new_user_double1");
} // }
} // }
}); // });
if (SocketSwClient.mSocketHandler != null) if (SocketSwClient.mSocketHandler != null)
SocketSwClient.mSocketHandler.processBroadcast(msg.mResult.toString() + ""); SocketSwClient.mSocketHandler.processBroadcast(msg.mResult.toString() + "");
} }

50
live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
View File

@ -554,7 +554,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
@Subscribe(threadMode = ThreadMode.MAIN) @Subscribe(threadMode = ThreadMode.MAIN)
public void onUpdata(String str) { public void onUpdata(String str) {
if ("svga_new_user_gif".equals(str)) { if ("svga_new_user_gif".equals(str)) {
svga_new_user_gif(); // svga_new_user_gif();
} else if ("svga_new_user_double".equals(str)) { } else if ("svga_new_user_double".equals(str)) {
svga_new_user_double(); svga_new_user_double();
} else if ("svga_new_user_follow".equals(str)) { } else if ("svga_new_user_follow".equals(str)) {
@ -4832,15 +4832,15 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
EventBus.getDefault().post("stop_svga_new_user_follow"); EventBus.getDefault().post("stop_svga_new_user_follow");
LiveHttpUtil.setFrontTask("attent", new HttpCallback() { // LiveHttpUtil.setFrontTask("attent", new HttpCallback() {
@Override // @Override
public void onSuccess(int code, String msg, String[] info) { // public void onSuccess(int code, String msg, String[] info) {
if (code == 0) { // if (code == 0) {
isAttention = 1; // isAttention = 1;
EventBus.getDefault().post("stop_svga_new_user_follow1"); // EventBus.getDefault().post("stop_svga_new_user_follow1");
} // }
} // }
}); // });
if (TextUtils.isEmpty(mLiveUid)) { if (TextUtils.isEmpty(mLiveUid)) {
return; return;
@ -5836,6 +5836,14 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
public void configBanner3(NewPeopleTaskModel newPeopleTask) { public void configBanner3(NewPeopleTaskModel newPeopleTask) {
TaskModel taskModel = newPeopleTask.getTask(); TaskModel taskModel = newPeopleTask.getTask();
if (newPeopleTask.hasFreeGift()) {
IMLoginManager.get(mContext).setNewUserGif(true);
svga_new_user_gif();
EventBus.getDefault().post("svga_new_user_gif");
}else {
IMLoginManager.get(mContext).setNewUserGif(false);
}
if (taskModel != null) { if (taskModel != null) {
GiftModel giftModel = newPeopleTask.getGift(); GiftModel giftModel = newPeopleTask.getGift();
if (giftModel != null) { if (giftModel != null) {
@ -5850,15 +5858,21 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
bean1.setName(giftModel.getGiftname()); bean1.setName(giftModel.getGiftname());
bean1.setTag("1"); bean1.setTag("1");
bean1.setPrice(WordUtil.isNewZh() ? "免费" : "free"); bean1.setPrice(WordUtil.isNewZh() ? "免费" : "free");
if (!IMLoginManager.get(mContext).isisNewUserOne()) {
if (TextUtils.equals(taskModel.getSendgift(), "0")) { // if (!IMLoginManager.get(mContext).isisNewUserOne()) {
IMLoginManager.get(mContext).setNewUserGif(true); //
EventBus.getDefault().post("svga_new_user_gif"); // }
} // if (newPeopleTask.hasFreeGift()) {
} // IMLoginManager.get(mContext).setNewUserGif(true);
// svga_new_user_gif();
// EventBus.getDefault().post("svga_new_user_gif");
// }else {
// IMLoginManager.get(mContext).setNewUserGif(false);
// }
BannerBean banner3Bean = new BannerBean(); BannerBean banner3Bean = new BannerBean();
banner3Bean.setImageUrl("https://downs.yaoulive.com/live_Mission_box.png"); banner3Bean.setImageUrl("https://downs.yaoulive.com/live_Mission_box.png");
banner3Bean.setLink(taskModel.getSendgift()); banner3Bean.setLink(newPeopleTask.getIsFreeGift());
mBannerList3.add(banner3Bean); mBannerList3.add(banner3Bean);
@ -5872,7 +5886,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
banner3Bean2.setLink(taskModel.getIllumine()); banner3Bean2.setLink(taskModel.getIllumine());
mBannerList3.add(banner3Bean2); mBannerList3.add(banner3Bean2);
if (TextUtils.equals(taskModel.getSendgift(), "0") && !IMLoginManager.get(mContext).isisNewUserOne()) { if (newPeopleTask.hasFreeGift() && !IMLoginManager.get(mContext).isisNewUserOne()) {
showBanner3(bean1); showBanner3(bean1);
} else if (TextUtils.equals(taskModel.getAttent(), "0") && !IMLoginManager.get(mContext).isisNewUserOne()) { } else if (TextUtils.equals(taskModel.getAttent(), "0") && !IMLoginManager.get(mContext).isisNewUserOne()) {
showBanner3(bean1); showBanner3(bean1);

2
live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
View File

@ -924,7 +924,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
mLiveRoomViewHolder.firstLookLiveNotify(); mLiveRoomViewHolder.firstLookLiveNotify();
} }
//判断是否有免费礼物 //判断是否有免费礼物
if("0".equals(data.getNewPeopleTask().getTask().getSendgift())){ if(data.getNewPeopleTask().hasFreeGift()){
mLiveRoomViewHolder.firstLook5MinLiveNotify(); mLiveRoomViewHolder.firstLook5MinLiveNotify();
} }
//观看200秒之后，推送活动入口im消息 //观看200秒之后，推送活动入口im消息