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

update 版本

Browse Source
This commit is contained in:
zlzw 2024-08-15 17:31:39 +08:00
parent 451a875526
commit 47da21351e
30 changed files with 701 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/shayu/phonelive/AppContext.java
View File

@ -28,6 +28,7 @@ import com.facebook.appevents.AppEventsLogger;
import com.fm.openinstall.OpenInstall;
import com.google.gson.Gson;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.DebugUtils;
import com.yunbao.common.utils.LogUtils;
import com.tencent.imsdk.v2.V2TIMGroupMemberInfo;
import com.tencent.imsdk.v2.V2TIMManager;
@ -355,7 +356,7 @@ public class AppContext extends CommonAppContext {
NeverCrashUtils.getInstance().setDebugMode(BuildConfig.DEBUG).setMainCrashHandler((t, e) -> {
Log.e("ApplicationError", "主线程异常");//此处log只是展示，当debug为true时，主类内部log会打印异常信息
e.printStackTrace();
AppManager.runDebugCode(() -> {
DebugUtils.runDebugCode(() -> {
//闪退后finish所有Activity并且杀死进程
for (WeakReference<Activity> activity : activities) {
if (activity != null && activity.get() != null) {

5
app/src/main/java/com/shayu/phonelive/NeverCrashUtils.java
View File

@ -10,6 +10,7 @@ import android.widget.Toast;
import com.yunbao.common.bean.CrashSaveBean;
import com.yunbao.common.utils.AppManager;
import com.yunbao.common.utils.DebugUtils;
import com.yunbao.common.utils.FileUtil;
import com.yunbao.common.utils.SpUtil;
@ -105,10 +106,10 @@ public class NeverCrashUtils {
}
e.printStackTrace();
AppContext.setFirebaseCrashData();
AppManager.runDebugCode(() -> Toast.makeText(application, "发生闪退:" + e.getMessage(), Toast.LENGTH_SHORT).show());
DebugUtils.runDebugCode(() -> Toast.makeText(application, "发生闪退:" + e.getMessage(), Toast.LENGTH_SHORT).show());
FileUtil.saveStringToFile(new File(application.getDir("files", Context.MODE_PRIVATE).getAbsolutePath()), throwableToString(e), "error.log");
getMainCrashHandler().mainException(Looper.getMainLooper().getThread(), e);
AppManager.runDebugCode(() -> errorWhile = false);
DebugUtils.runDebugCode(() -> errorWhile = false);
// return;
}
}

55
common/src/main/java/com/yunbao/common/adapter/GiftWallGiftInfoListItemAdapter.java
View File

@ -9,12 +9,16 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import com.blankj.utilcode.util.LogUtils;
import com.makeramen.roundedimageview.RoundedImageView;
import com.yunbao.common.R;
import com.yunbao.common.bean.GiftWallInfoBean;
import com.yunbao.common.bean.GiftWallTab2Bean;
import com.yunbao.common.dialog.GiftWallMainTab2ClassicInfoDialog;
import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.views.weight.ViewClicksAntiShake;
import java.util.ArrayList;
import java.util.List;
@ -27,9 +31,14 @@ public class GiftWallGiftInfoListItemAdapter extends RecyclerView.Adapter<GiftWa
private boolean isLiveRoom;
private boolean isStar;
int giftStatus;
int giftId;
private String anchorName;
private String anchorAvatar;
public void setGiftId(int giftId) {
this.giftId = giftId;
}
public void setAnchorName(String anchorName) {
this.anchorName = anchorName;
}
@ -71,9 +80,20 @@ public class GiftWallGiftInfoListItemAdapter extends RecyclerView.Adapter<GiftWa
notifyDataSetChanged();
}
@Override
public int getItemViewType(int position) {
if (isStar && (getItemCount() > 0) && data.get(0).getId() != -1) {
return 1;
}
return 0;
}
@NonNull
@Override
public VH onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
if (viewType == 1) {
return new VH2(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_dialog_gift_wall_gift_info2, parent, false));
}
return new VH(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_dialog_gift_wall_gift_info, parent, false));
}
@ -156,4 +176,39 @@ public class GiftWallGiftInfoListItemAdapter extends RecyclerView.Adapter<GiftWa
}
}
public class VH2 extends VH {
View avatar2_layout;
View tips2;
public VH2(@NonNull View itemView) {
super(itemView);
avatar2_layout = itemView.findViewById(R.id.avatar2_layout);
tips2 = itemView.findViewById(R.id.tips2);
}
@Override
public void setData(GiftWallInfoBean.Data data, int position) {
super.setData(data, position);
ViewClicksAntiShake.clicksAntiShake(tips2, new ViewClicksAntiShake.ViewClicksCallBack() {
@Override
public void onViewClicks() {
GiftWallTab2Bean.Gift giftData = new GiftWallTab2Bean.Gift();
giftData.setGiftId(giftId);
giftData.setSendType(-1);
giftData.setNamingLiveId(Integer.parseInt(data.getLive_id()));
giftData.setNamingLiveAvatar(data.getLive_avatar());
giftData.setNamingLiveNicename(data.getLive_user_name());
giftData.setGiftHallSendNum(data.getGift_hall_send_num());
try {
giftData.setNamingLiveId(Integer.parseInt(data.getLive_id()));
} catch (Exception e) {
e.printStackTrace();
return;
}
new GiftWallMainTab2ClassicInfoDialog(itemView.getContext(), giftData, isAnchor).setFullWindows(!isLiveRoom).showDialog();
}
});
}
}
}

16
common/src/main/java/com/yunbao/common/bean/GiftWallInfoBean.java
View File

@ -327,5 +327,21 @@ public class GiftWallInfoBean extends BaseModel {
public void setCreate_time(String create_time) {
this.create_time = create_time;
}
@Override
public String toString() {
return "Data{" +
"gift_hall_send_num=" + gift_hall_send_num +
", user_name='" + user_name + '\'' +
", avatar='" + avatar + '\'' +
", user_id='" + user_id + '\'' +
", id=" + id +
", gift_hall_rank_hide=" + gift_hall_rank_hide +
", create_time='" + create_time + '\'' +
", live_id='" + live_id + '\'' +
", live_user_name='" + live_user_name + '\'' +
", live_avatar='" + live_avatar + '\'' +
'}';
}
}
}

31
common/src/main/java/com/yunbao/common/bean/GiftWallMainTab2ClassicInfoBean.java
View File

@ -3,6 +3,7 @@ package com.yunbao.common.bean;
import com.google.gson.annotations.SerializedName;
import com.yunbao.common.utils.StringUtil;
import java.util.ArrayList;
import java.util.List;
public class GiftWallMainTab2ClassicInfoBean extends BaseModel{
@ -41,6 +42,36 @@ public class GiftWallMainTab2ClassicInfoBean extends BaseModel{
this.isMe = isMe;
}
public void setWallInfoGiftInfo(GiftWallInfoBean.GiftInfo info,GiftWallTab2Bean.Gift gift) {
giftInfo=new GiftInfo();
giftInfo.setGiftId(info.getGift_id());
giftInfo.setSendType(info.getSendtype());
giftInfo.setGiftName(info.getGiftname());
giftInfo.setGiftIcon(info.getGifticon());
giftInfo.setIlluminateNum(info.getIlluminate_num());
giftInfo.setNamingLiveAvatar(gift.getNamingLiveAvatar());
giftInfo.setNamingLiveId(gift.getNamingLiveId());
giftInfo.setNamingLiveNicename(gift.getNamingLiveNicename());
giftInfo.setGiftHallSendNum(gift.getGiftHallSendNum());
}
public void setWallInfoData(List<GiftWallInfoBean.Data> list) {
data=new ArrayList<>();
for (GiftWallInfoBean.Data item : list) {
GiftData gift=new GiftData();
gift.setUserId(item.user_id);
gift.setAvatar(item.getAvatar());
gift.setCreateTime(item.getCreate_time());
gift.setLiveAvatar(item.getLive_avatar());
gift.setActiveRankHide(item.getGift_hall_rank_hide());
gift.setLiveUserName(item.getLive_user_name());
gift.setGiftHallSendNum(item.getGift_hall_send_num());
gift.setNaming_user_gift_hall_rank_hide(item.getGift_hall_rank_hide());
gift.setUserName(item.getUser_name());
data.add(gift);
}
}
// 内部类：GiftInfo
public static class GiftInfo {

13
common/src/main/java/com/yunbao/common/dialog/GiftWallGiftInfoDialog.java
View File

@ -67,6 +67,7 @@ public class GiftWallGiftInfoDialog extends AbsDialogPopupWindow {
View bottom_layout;
View gift_schedule;
ImageView diamond_icon;
View titleLayout, titleLayout2;
GiftWallGiftInfoListItemAdapter adapter;
RecyclerView recyclerView;
@ -167,6 +168,8 @@ public class GiftWallGiftInfoDialog extends AbsDialogPopupWindow {
tab_layout = findViewById(R.id.tab_layout);
bottom_layout = findViewById(R.id.bottom_layout);
gift_schedule = findViewById(R.id.gift_schedule);
titleLayout = findViewById(R.id.list_title);
titleLayout2 = findViewById(R.id.list_title2);
adapter = new GiftWallGiftInfoListItemAdapter();
adapter.setAnchor(isAnchor);
adapter.setLiveRoom(isLiveRoom);
@ -251,6 +254,9 @@ public class GiftWallGiftInfoDialog extends AbsDialogPopupWindow {
mIvBack.setLayoutParams(params);
ViewClicksAntiShake.clicksAntiShake(mIvBack, this::dismiss);
resetWindows();
if(isStar){
findViewById(R.id.anchorTips).setVisibility(View.VISIBLE);
}
}
private void initTabText() {
@ -259,7 +265,11 @@ public class GiftWallGiftInfoDialog extends AbsDialogPopupWindow {
((TextView) findViewById(R.id.user_name)).setText(WordUtil.getNewString(R.string.dialog_gift_wall_list_info_list_header_rename1));
((TextView) findViewById(R.id.tv_rename)).setText(WordUtil.getNewString(R.string.dialog_gift_wall_list_info_list_header_rename_value1));
tv_list_title.setText(WordUtil.getNewString(R.string.dialog_gift_wall_gfit_info_list_title_star));
titleLayout.setVisibility(View.GONE);
titleLayout2.setVisibility(View.VISIBLE);
} else {
titleLayout.setVisibility(VISIBLE);
titleLayout2.setVisibility(View.GONE);
tab2.setText(WordUtil.getNewString(R.string.dialog_gift_wall_gfit_info_list_title_champion));
tv_list_title.setText(WordUtil.getNewString(R.string.dialog_gift_wall_gfit_info_list_title_champion));
((TextView) findViewById(R.id.user_name)).setText(WordUtil.getNewString(R.string.dialog_gift_wall_list_info_list_header_rename));
@ -336,6 +346,7 @@ public class GiftWallGiftInfoDialog extends AbsDialogPopupWindow {
btn_lighten.setBackgroundResource(R.drawable.gift_wall_gift_info_un_lighten);
}
adapter.setGiftStatus(giftBean.getGift_info().getIlluminate_status());
adapter.setGiftId(giftBean.getGift_info().getGift_id());
/**
* 如果对方是主播，要有点亮标记。
* 如果对方是用户，不要有点亮标记
@ -392,7 +403,9 @@ public class GiftWallGiftInfoDialog extends AbsDialogPopupWindow {
}
private void setTips(String tmp) {
if(btn_one.getVisibility()==VISIBLE){
btn_one_tips.setVisibility(View.VISIBLE);
}
btn_one_tips.setText(String.format(Locale.getDefault(), "%s%s%s"
, WordUtil.isNewZh() ? "需 " : "Need ",
tmp,

39
common/src/main/java/com/yunbao/common/dialog/GiftWallMainTab2ClassicInfoDialog.java
View File

@ -21,6 +21,7 @@ import com.lxj.xpopup.XPopup;
import com.makeramen.roundedimageview.RoundedImageView;
import com.yunbao.common.R;
import com.yunbao.common.adapter.GiftWallTab2GiftInfoListItemAdapter;
import com.yunbao.common.bean.GiftWallInfoBean;
import com.yunbao.common.bean.GiftWallMainTab2ClassicInfoBean;
import com.yunbao.common.bean.GiftWallTab2Bean;
import com.yunbao.common.custom.ItemDecoration;
@ -100,17 +101,37 @@ public class GiftWallMainTab2ClassicInfoDialog extends AbsDialogPopupWindow {
}
void initData() {
LiveNetManager.get(mContext).lastAllGiftHallWeekStarDetail(gift.getGiftId() + "", gift.getNamingLiveId() + "", new HttpCallback<GiftWallMainTab2ClassicInfoBean>() {
@Override
public void onSuccess(GiftWallMainTab2ClassicInfoBean data) {
initData(data);
}
if (gift.getSendType() == -1) {
LiveNetManager.get(mContext)
.liveGiftHallDetail(gift.getNamingLiveId() + "", gift.getGiftId() + "", 2, 1, new HttpCallback<GiftWallInfoBean>() {
@Override
public void onSuccess(GiftWallInfoBean data) {
GiftWallMainTab2ClassicInfoBean infoBean = new GiftWallMainTab2ClassicInfoBean();
infoBean.setIsMe(data.getIs_me());
infoBean.setWallInfoGiftInfo(data.getGift_info(),gift);
infoBean.setWallInfoData(data.getData());
initData(infoBean);
}
@Override
public void onError(String error) {
@Override
public void onError(String error) {
}
});
}
});
return;
}
LiveNetManager.get(mContext).lastAllGiftHallWeekStarDetail(gift.getGiftId() + "",
gift.getNamingLiveId() + "", new HttpCallback<GiftWallMainTab2ClassicInfoBean>() {
@Override
public void onSuccess(GiftWallMainTab2ClassicInfoBean data) {
initData(data);
}
@Override
public void onError(String error) {
}
});
}
void initData(GiftWallMainTab2ClassicInfoBean data) {

4
common/src/main/java/com/yunbao/common/dialog/SudGameDoubleDialog.java
View File

@ -116,6 +116,9 @@ public class SudGameDoubleDialog extends AbsDialogCenterPopupWindow {
boolean isDraw = sudSettleBean1.getWin_num() == sudSettleBean2.getWin_num();
boolean isZh = WordUtil.isNewZh();
LogUtils.e("isFirstMe:" + isFirstMe);
if(isActivityGame){
findViewById(R.id.tips).setVisibility(View.INVISIBLE);
}
if (containMe) {
// 当前用户在游戏中
// SudSettleBean winBean = isFirstMe ? sudSettleBean1 : sudSettleBean2;
@ -165,7 +168,6 @@ public class SudGameDoubleDialog extends AbsDialogCenterPopupWindow {
if (!map.isEmpty()) {
isDraw = map.get("win").intValue() == map.get("loss").intValue();
}
findViewById(R.id.tips).setVisibility(View.INVISIBLE);
} else {
sub_win_score.setText(sudSettleBean1.getWin_num() > 0 ? "+" + sudSettleBean1.getWin_num() : String.valueOf(sudSettleBean1.getWin_num()));
sub_loss_score.setText(String.valueOf(sudSettleBean2.getWin_num()));

5
common/src/main/java/com/yunbao/common/manager/game/BilliardsRandomManager.java
View File

@ -48,7 +48,7 @@ public class BilliardsRandomManager extends AbsRandomGameManager {
}
}
};
private boolean isInitDebug = true;
private boolean isInitDebug = false;
@Override
public void onStart(CheckCurrencyModel currencyModel, CreateSudRoomModel data, boolean isHome, boolean isRandom) {
@ -111,7 +111,7 @@ public class BilliardsRandomManager extends AbsRandomGameManager {
joinAiRobot();
}
if (event.getSudMGPMGState().equals(SudMGPMGState.MG_COMMON_PLAYER_IN)) {
LogUtils.e("收到的回调: AI uid = " + getAiUid() + "| kickUid = " + event.getPlayerIn().kickUID);
LogUtils.e("收到的回调: AI uid = " + getAiUid() + "| kickUid = " + event.getPlayerIn().kickUID + "|" + getPlayerSize());
if (event.getPlayerIn().reason == 1 && aiInfo != null) {
ToastUtil.show("踢掉了AI");
reset();
@ -141,7 +141,6 @@ public class BilliardsRandomManager extends AbsRandomGameManager {
private void joinAiRobot() {
if (!isAddRobot) return;
if (!isRandom) return;
if(!isCaptain)return;
if (getPlayerSize() == 2) return;
if (autoJoinRobotHandler != null) {
autoJoinRobotHandler.removeCallbacks(autoJoinRobotRunnable);

3
common/src/main/java/com/yunbao/common/sud/decorator/SudFSMMGDecorator.java
View File

@ -14,6 +14,7 @@ import com.yunbao.common.manager.RandomSudGameManager;
import com.yunbao.common.sud.state.SudMGPMGState;
import com.yunbao.common.utils.AppManager;
import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.DebugUtils;
import com.yunbao.common.utils.ISudFSMStateHandleUtils;
import com.yunbao.common.utils.SudJsonUtils;
@ -220,7 +221,7 @@ public class SudFSMMGDecorator implements ISudFSMMG {
break;
case SudMGPMGState.MG_COMMON_SELF_CLICK_START_BTN: // 8. 开始游戏按钮点击状态
SudMGPMGState.MGCommonSelfClickStartBtn mgCommonSelfClickStartBtn = SudJsonUtils.fromJson(dataJson, SudMGPMGState.MGCommonSelfClickStartBtn.class);
AppManager.runDebugCode(new Runnable() {
DebugUtils.runDebugCode(new Runnable() {
@Override
public void run() {
RandomSudGameManager.getManager().reset();

9
common/src/main/java/com/yunbao/common/utils/AppManager.java
View File

@ -179,15 +179,6 @@ public class AppManager {
activityStack.clear();
}
/**
* 仅在debug下运行的代码
*/
public static void runDebugCode(Runnable runnable) {
if (BuildConfig.DEBUG) {
runnable.run();
}
}
/**
* 退出应用程序

29
common/src/main/java/com/yunbao/common/utils/DebugUtils.java Normal file
View File

@ -0,0 +1,29 @@
package com.yunbao.common.utils;
import android.util.Log;
import com.yunbao.common.BuildConfig;
public class DebugUtils {
/**
* 打印堆栈信息
*/
public static void showStackTrace(){
StackTraceElement[] stackTrace = new Throwable().getStackTrace();
StringBuilder sb=new StringBuilder();
for (StackTraceElement element : stackTrace) {
if(element!=null){
sb.append(element).append("\n");
}
}
Log.e("DebugUtils",sb.toString());
}
/**
* 仅在debug下运行的代码
*/
public static void runDebugCode(Runnable runnable) {
if (BuildConfig.DEBUG) {
runnable.run();
}
}
}

14
common/src/main/java/com/yunbao/common/utils/JavascriptInterfaceUtils.java
View File

@ -23,6 +23,7 @@ import com.lxj.xpopup.XPopup;
import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.Constants;
import com.yunbao.common.bean.CheckUpgradesModel;
import com.yunbao.common.bean.CreateSudRoomModel;
import com.yunbao.common.bean.IMLoginModel;
import com.yunbao.common.bean.LiveBean;
import com.yunbao.common.bean.ReportCommunityBean;
@ -38,6 +39,7 @@ import com.yunbao.common.http.HttpClient;
import com.yunbao.common.http.LiveHttpUtil;
import com.yunbao.common.interfaces.CommonCallback;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.manager.RandomSudGameManager;
import org.greenrobot.eventbus.EventBus;
@ -717,4 +719,16 @@ public class JavascriptInterfaceUtils {
throw new RuntimeException(e);
}
}
@JavascriptInterface
public void androidRandomSudGame(){
RandomSudGameManager.getManager().random(mContext);
}
@JavascriptInterface
public void androidStartSudGame(String roomName,String roomId,String gameId){
CreateSudRoomModel createSudRoomModel = new CreateSudRoomModel();
createSudRoomModel.setSudGameId(gameId);
createSudRoomModel.setSudGameRoomId(roomId);
createSudRoomModel.setRoomName(roomName);
RandomSudGameManager.getManager().start(createSudRoomModel,true,true);
}
}

9
common/src/main/res/drawable/bg_gift_wall_star_t1.xml Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:width="39dp" android:height="14dp">
<shape android:shape="rectangle">
<solid android:color="#ffcad8ff" />
<corners android:topLeftRadius="9dp" android:topRightRadius="9dp" android:bottomLeftRadius="9dp" android:bottomRightRadius="9dp" />
</shape>
</item>
</selector>

9
common/src/main/res/drawable/bg_gift_wall_star_t2.xml Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:width="22dp" android:height="22dp">
<shape android:shape="rectangle">
<solid android:color="#ffffffff" />
<corners android:radius="10dp" />
</shape>
</item>
</selector>

149
common/src/main/res/layout/dialog_gift_wall_gift_info.xml
View File

@ -186,7 +186,9 @@
android:textAllCaps="false"
android:textColor="#02215D"
android:textSize="16sp"
tools:text="繼續點亮" />
android:visibility="gone"
tools:text="繼續點亮"
tools:visibility="visible" />
</LinearLayout>
@ -199,8 +201,8 @@
android:layout_marginTop="10dp"
android:layout_marginEnd="17dp"
android:layout_marginBottom="58dp"
android:paddingBottom="32dp"
android:background="@mipmap/gift_wall_gift_info_list"
android:paddingBottom="32dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/linearLayout2">
@ -263,29 +265,41 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<include
android:id="@+id/list_title"
layout="@layout/item_dialog_gift_wall_gift_info"
<LinearLayout
android:id="@+id/titleLayout"
android:layout_width="0dp"
android:layout_height="50dp"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginTop="18dp"
android:layout_marginEnd="20dp"
android:orientation="vertical"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tips_timer" />
app:layout_constraintTop_toBottomOf="@+id/tips_timer">
<include
android:id="@+id/list_title"
layout="@layout/item_dialog_gift_wall_gift_info" />
<include
android:id="@+id/list_title2"
layout="@layout/item_dialog_gift_wall_gift_info2t"
android:visibility="gone" />
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginTop="5dp"
android:layout_marginEnd="20dp"
android:orientation="vertical"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/list_title"
app:layout_constraintTop_toBottomOf="@+id/titleLayout"
tools:itemCount="1"
tools:listitem="@layout/item_dialog_gift_wall_gift_info" />
</androidx.constraintlayout.widget.ConstraintLayout>
@ -297,54 +311,79 @@
android:layout_width="0dp"
android:layout_height="64dp"
android:background="@mipmap/gift_wall_gift_info_botton"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
app:layout_constraintStart_toStartOf="parent"
tools:visibility="visible">
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/bottom_avatar"
android:layout_width="37dp"
android:layout_height="37dp"
android:layout_alignParentBottom="true"
android:layout_marginStart="17dp"
android:scaleType="centerCrop"
android:src="@mipmap/icon_avatar_placeholder"
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:riv_oval="true" />
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/bottom_user_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:text="TextView"
android:textColor="#FFFFFF"
android:textSize="14sp"
app:layout_constraintStart_toEndOf="@+id/bottom_avatar"
app:layout_constraintTop_toTopOf="@+id/bottom_avatar" />
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/bottom_avatar"
android:layout_width="37dp"
android:layout_height="37dp"
android:layout_alignParentBottom="true"
android:layout_marginStart="17dp"
android:scaleType="centerCrop"
android:src="@mipmap/icon_avatar_placeholder"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:riv_oval="true" />
<TextView
android:id="@+id/textView7"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:text="@string/dialog_gift_wall_gfit_info_list_bottom_send"
android:textColor="#BDBDBD"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="@+id/bottom_avatar"
app:layout_constraintStart_toEndOf="@+id/bottom_avatar" />
<TextView
android:id="@+id/bottom_user_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:text="TextView"
android:textColor="#FFFFFF"
android:textSize="14sp"
app:layout_constraintStart_toEndOf="@+id/bottom_avatar"
app:layout_constraintTop_toTopOf="@+id/bottom_avatar" />
<TextView
android:id="@+id/textView7"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:text="@string/dialog_gift_wall_gfit_info_list_bottom_send"
android:textColor="#BDBDBD"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="@+id/bottom_avatar"
app:layout_constraintStart_toEndOf="@+id/bottom_avatar" />
<TextView
android:id="@+id/send_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#FFFFFF"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="@+id/textView7"
app:layout_constraintStart_toEndOf="@+id/textView7"
tools:text="00" />
<Button
android:id="@+id/anchorTips"
android:layout_width="39dp"
android:layout_height="14dp"
android:background="@drawable/bg_gift_wall_star_t1"
android:text="@string/dialog_gift_wall_gfit_info_list_bottom_tips"
android:textAllCaps="false"
android:textSize="8sp"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="@+id/bottom_avatar"
app:layout_constraintStart_toStartOf="@+id/bottom_avatar"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:id="@+id/send_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#FFFFFF"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="@+id/textView7"
app:layout_constraintStart_toEndOf="@+id/textView7"
tools:text="00" />
<TextView
android:id="@+id/btn_one"
@ -353,32 +392,34 @@
android:layout_marginEnd="17dp"
android:background="@drawable/gift_wall_gift_info_btn"
android:gravity="center"
android:textAllCaps="false"
android:paddingStart="10dp"
android:paddingEnd="10dp"
android:textAllCaps="false"
android:textColor="#02215D"
android:textSize="11.5sp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="@string/dialog_gift_wall_gfit_info_list_bottom_btn_one_champion" />
tools:text="@string/dialog_gift_wall_gfit_info_list_bottom_btn_one_champion"
tools:visibility="visible" />
<Button
android:id="@+id/btn_one_tips"
android:layout_width="wrap_content"
android:layout_height="11dp"
android:layout_marginBottom="-5dp"
android:textAllCaps="false"
android:background="@drawable/gift_wall_gift_info_bottom_btn_tips"
android:elevation="10dp"
android:minWidth="32dp"
android:text="需10个"
android:textAllCaps="false"
android:textSize="8dp"
android:visibility="gone"
tools:visibility="visible"
android:translationZ="2dp"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@+id/btn_one"
app:layout_constraintEnd_toEndOf="@+id/btn_one" />
app:layout_constraintEnd_toEndOf="@+id/btn_one"
tools:visibility="visible" />
</androidx.constraintlayout.widget.ConstraintLayout>

150
common/src/main/res/layout/item_dialog_gift_wall_gift_info2.xml Normal file
View File

@ -0,0 +1,150 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/tv_rank"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="0.8"
android:gravity="start|center"
android:text="@string/dialog_gift_wall_list_info_list_header_rank"
android:textColor="#FFFFFF"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="10" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="bottom"
android:gravity="center|bottom"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="@+id/tv_rank"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/tv_rank">
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/avatar"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_alignParentBottom="true"
android:scaleType="centerCrop"
android:src="@mipmap/icon_avatar_placeholder"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/tv_rank"
app:layout_constraintEnd_toEndOf="@+id/avatar2"
app:layout_constraintTop_toTopOf="@+id/tv_rank"
app:riv_oval="true"
tools:visibility="visible" />
<TextView
android:id="@+id/item_anchor_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:gravity="center"
android:singleLine="true"
android:text="@string/dialog_gift_wall_list_info_list_header_rename"
android:textColor="#FFFFFF"
android:textSize="12sp"
android:visibility="gone"
tools:visibility="visible" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/tv_rename"
app:layout_constraintStart_toEndOf="@+id/avatar2"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/avatar2_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="visible">
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/avatar2"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_alignParentBottom="true"
android:layout_marginTop="8dp"
android:src="@mipmap/icon_avatar_placeholder"
android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:riv_oval="true"
tools:visibility="visible" />
<Button
android:id="@+id/tips1"
android:layout_width="39dp"
android:layout_height="14dp"
android:background="@drawable/bg_gift_wall_star_t1"
android:text="@string/dialog_gift_wall_list_info_list_header_rename_tip1"
android:textAllCaps="false"
android:textSize="8sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Button
android:id="@+id/tips2"
android:layout_width="22dp"
android:layout_height="22dp"
android:layout_marginStart="40dp"
android:background="@drawable/bg_gift_wall_star_t2"
android:text="@string/dialog_gift_wall_list_info_list_header_rename_tip2"
android:textAllCaps="false"
android:textSize="6sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:id="@+id/user_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:gravity="center"
android:singleLine="true"
android:text="@string/dialog_gift_wall_list_info_list_header_rename_tip3"
android:textColor="#FFFFFF"
android:textSize="12sp"
tools:text="@string/dialog_gift_wall_list_info_list_header_rename_tip3" />
</LinearLayout>
<TextView
android:id="@+id/tv_rename"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="0.8"
android:gravity="end|center"
android:text="@string/dialog_gift_wall_list_info_list_header_rename_value"
android:textColor="#FFFFFF"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</LinearLayout>

151
common/src/main/res/layout/item_dialog_gift_wall_gift_info2t.xml Normal file
View File

@ -0,0 +1,151 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/tv_rank"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="0.8"
android:gravity="start|center"
android:text="@string/dialog_gift_wall_list_info_list_header_rank"
android:textColor="#FFFFFF"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="10" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="bottom"
android:gravity="center|bottom"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="@+id/tv_rank"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/tv_rank">
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/avatar"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_alignParentBottom="true"
android:scaleType="centerCrop"
android:src="@mipmap/icon_avatar_placeholder"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/tv_rank"
app:layout_constraintEnd_toEndOf="@+id/avatar2"
app:layout_constraintTop_toTopOf="@+id/tv_rank"
app:riv_oval="true"
/>
<TextView
android:id="@+id/item_anchor_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:gravity="center"
android:singleLine="true"
android:text="@string/dialog_gift_wall_list_info_list_header_rename"
android:textColor="#FFFFFF"
android:textSize="12sp"
android:visibility="visible"
/>
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/tv_rename"
app:layout_constraintStart_toEndOf="@+id/avatar2"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/avatar2_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
tools:visibility="visible">
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/avatar2"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_alignParentBottom="true"
android:layout_marginTop="8dp"
android:src="@mipmap/icon_avatar_placeholder"
android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:riv_oval="true"
tools:visibility="visible" />
<Button
android:id="@+id/tips1"
android:layout_width="39dp"
android:layout_height="14dp"
android:background="@drawable/bg_gift_wall_star_t1"
android:text="@string/dialog_gift_wall_list_info_list_header_rename_tip1"
android:textAllCaps="false"
android:textSize="8sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Button
android:id="@+id/tips2"
android:layout_width="22dp"
android:layout_height="22dp"
android:layout_marginStart="40dp"
android:background="@drawable/bg_gift_wall_star_t2"
android:text="@string/dialog_gift_wall_list_info_list_header_rename_tip2"
android:textAllCaps="false"
android:textSize="6sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:id="@+id/user_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:gravity="center"
android:singleLine="true"
android:text="@string/dialog_gift_wall_list_info_list_header_rename_tip3"
android:textColor="#FFFFFF"
android:textSize="12sp"
tools:text="@string/dialog_gift_wall_list_info_list_header_rename_tip3" />
</LinearLayout>
<TextView
android:id="@+id/tv_rename"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="0.8"
android:gravity="end|center"
android:text="@string/dialog_gift_wall_list_info_list_header_rename_value"
android:textColor="#FFFFFF"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</LinearLayout>

BIN
common/src/main/res/mipmap-xxhdpi/bg_game_list_activity_top.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 10 KiB

4
common/src/main/res/values-zh/strings.xml
View File

@ -1524,11 +1524,15 @@
<string name="dialog_gift_wall_gfit_info_list_bottom_btn_one_star_get">已摘星</string>
<string name="dialog_gift_wall_gfit_info_list_bottom_btn_one_champion_get">已冠名</string>
<string name="dialog_gift_wall_gfit_info_list_bottom_btn_one_champion_get_un">未冠名</string>
<string name="dialog_gift_wall_gfit_info_list_bottom_tips">當前主播</string>
<string name="dialog_gift_wall_list_info_list_header_rank">排名</string>
<string name="dialog_gift_wall_list_info_list_header_rename">冠名歸屬</string>
<string name="dialog_gift_wall_list_info_list_header_rename1">周星歸屬</string>
<string name="dialog_gift_wall_list_info_list_header_rename_value">冠名值</string>
<string name="dialog_gift_wall_list_info_list_header_rename_value1">星光值</string>
<string name="dialog_gift_wall_list_info_list_header_rename_tip1">最佳助力</string>
<string name="dialog_gift_wall_list_info_list_header_rename_tip2">最佳\n助力</string>
<string name="dialog_gift_wall_list_info_list_header_rename_tip3">助力團</string>
<string name="dialog_gift_wall_list1_title">周星禮物</string>
<string name="dialog_gift_wall_list2_title">經典禮物</string>
<string name="dialog_gift_wall_tab2_list_wait">等待點亮</string>

4
common/src/main/res/values/strings.xml
View File

@ -1528,11 +1528,15 @@
<string name="dialog_gift_wall_gfit_info_list_bottom_btn_one_star_get">Picked</string>
<string name="dialog_gift_wall_gfit_info_list_bottom_btn_one_champion_get">Titled</string>
<string name="dialog_gift_wall_gfit_info_list_bottom_btn_one_champion_get_un">Untitled</string>
<string name="dialog_gift_wall_gfit_info_list_bottom_tips">Anchor</string>
<string name="dialog_gift_wall_list_info_list_header_rank">Rank</string>
<string name="dialog_gift_wall_list_info_list_header_rename">Title attribution</string>
<string name="dialog_gift_wall_list_info_list_header_rename1">Weekly star attribution</string>
<string name="dialog_gift_wall_list_info_list_header_rename_value">Title value</string>
<string name="dialog_gift_wall_list_info_list_header_rename_value1">Star value</string>
<string name="dialog_gift_wall_list_info_list_header_rename_tip1">Best</string>
<string name="dialog_gift_wall_list_info_list_header_rename_tip2">More</string>
<string name="dialog_gift_wall_list_info_list_header_rename_tip3">Assistance Team</string>
<string name="dialog_gift_wall_list1_title">Star Gifts</string>
<string name="dialog_gift_wall_list2_title">Classic Gifts</string>
<string name="dialog_gift_wall_tab2_list_wait">Waiting for lighting</string>

27
live/src/main/java/com/yunbao/live/activity/SudSwGameActivity.java
View File

@ -2,6 +2,7 @@ package com.yunbao.live.activity;
import android.Manifest;
import android.app.Activity;
import android.app.Dialog;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
@ -58,6 +59,7 @@ import com.yunbao.common.sud.model.GameConfigModel;
import com.yunbao.common.sud.model.GameViewInfoModel;
import com.yunbao.common.sud.state.SudMGPMGState;
import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.DialogUitl;
import com.yunbao.common.utils.DpUtil;
import com.yunbao.common.utils.ProcessResultUtil;
import com.yunbao.common.utils.RouteUtil;
@ -276,7 +278,7 @@ public class SudSwGameActivity extends AbsActivity implements GameSwMicManager.M
mLiveUid = mCreateSudRoomModel.getSudGameRoomId();
//第二次进入时，viewmodel数据丢失，所以初始化时直接获取
gameViewModel.getScore(mCreateSudRoomModel.getSudGameRoomId(), mContext);
if(isActivityGame){
if (isActivityGame) {
RandomSudGameManager.getManager().setGameViewModel(gameViewModel);
}
gameContainer = findViewById(R.id.game_container);
@ -562,7 +564,7 @@ public class SudSwGameActivity extends AbsActivity implements GameSwMicManager.M
@Subscribe(threadMode = ThreadMode.MAIN)
public void onCheckRemainingBalanceEvent(CheckRemainingBalanceEvent event) {
LogUtils.e("收到的回调:"+event.getSudMGPMGState()+"|"+event.getPlayerIn());
LogUtils.e("收到的回调:" + event.getSudMGPMGState() + "|" + event.getPlayerIn());
if (isActivityGame) {
RandomSudGameManager.getManager().onGameState(event);
}
@ -619,12 +621,27 @@ public class SudSwGameActivity extends AbsActivity implements GameSwMicManager.M
gameViewModel.sudGameRank(event.getMgCommonGameSettle(null));//结算游戏
}
} else {
ToastUtil.show(getString(R.string.net_error));
if (isActivityGame) {
showDialog();
} else {
ToastUtil.show(getString(R.string.net_error));
}
}
}
private void showDialog() {
DialogUitl.showSimpleDialog(mContext, WordUtil.isNewZh() ? "結算超時\n請前往活動頁面查看本局結果" :
"Settlement timed out\nPlease check the result on the event page Confirm.", new DialogUitl.SimpleCallback() {
@Override
public void onConfirmClick(Dialog dialog, String content) {
dialog.dismiss();
}
});
}
private void loadScore(List<SudGameInfoBean> infoBean, int index) {
if (index == 0) {
showDialog();
return;
}
LiveNetManager.get(mContext)
@ -634,7 +651,7 @@ public class SudSwGameActivity extends AbsActivity implements GameSwMicManager.M
if (data.isEmpty()) {
new Handler(Looper.getMainLooper()).postDelayed(() -> {
loadScore(infoBean, index - 1);
}, 300);
}, 500);
return;
}
gameViewModel.setSudGameInfoBeanList(infoBean);
@ -677,7 +694,7 @@ public class SudSwGameActivity extends AbsActivity implements GameSwMicManager.M
LiveNetManager.get(mContext).deductMoney(mCreateSudRoomModel.getSudGameRoomId());
break;
case SudMGPMGState.MG_GAME_LOAD_OVER:
if(isActivityGame&&isRandomRankUser) {
if (isActivityGame && isRandomRankUser) {
gameViewModel.sudFSTAPPDecorator.notifyAPPCommonSelfIn(true, -1, true, 1);
gameViewModel.sudFSTAPPDecorator.notifyAPPCommonSelfReady(true);
}

13
live/src/main/java/com/yunbao/live/activity/SystemMessageActivity.java
View File

@ -7,6 +7,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import com.blankj.utilcode.util.LogUtils;
import com.yunbao.common.Constants;
import com.yunbao.common.activity.AbsActivity;
import com.yunbao.common.activity.SelectImageActivity;
@ -72,13 +73,17 @@ public class SystemMessageActivity extends AbsActivity {
// }
init();
punish = findViewById(R.id.tv_sys_msg_punish);
punish.setVisibility(View.VISIBLE);
punishNotice = findViewById(R.id.tv_sys_msg_punish_notice);
punish.setOnClickListener(v -> {
RouteUtil.forwardPunishActivity();
punishNotice.setVisibility(View.GONE);
});
if (!"4".equals(type)) {
punish.setVisibility(View.GONE);
punishNotice.setVisibility(View.GONE);
} else {
punish.setVisibility(View.VISIBLE);
}
mSystemMessageViewHolder.btn_back.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@ -88,7 +93,9 @@ public class SystemMessageActivity extends AbsActivity {
LiveNetManager.get(mContext).getPenalizeStatus(new com.yunbao.common.http.base.HttpCallback<ResponseModel>() {
@Override
public void onSuccess(ResponseModel responseModel) {
punishNotice.setVisibility(View.VISIBLE);
if (punish.getVisibility() == View.VISIBLE) {
punishNotice.setVisibility(View.VISIBLE);
}
}
@Override

1
live/src/main/java/com/yunbao/live/adapter/LiveAnchorEditCallMeAdapter.java
View File

@ -176,6 +176,7 @@ public class LiveAnchorEditCallMeAdapter extends RecyclerView.Adapter<LiveAnchor
public void onDismiss() {
}
})
.setHotGiftListUrl(true)
.setShowNumber(false)
.setTitle(mContext.getString(R.string.live_anchor_edit_call_me_select_gift))
.setHideGiftType(true)

3
live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java
View File

@ -62,6 +62,7 @@ import com.yunbao.common.interfaces.OnItemClickListener;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.AppManager;
import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.DebugUtils;
import com.yunbao.common.utils.DialogUitl;
import com.yunbao.common.utils.DpUtil;
import com.yunbao.common.utils.GiftCacheUtil;
@ -1092,7 +1093,7 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
Bus.get().post(event);
}).build().show();
AppManager.runDebugCode(() -> {
DebugUtils.runDebugCode(() -> {
Log.i("gifBean", mLiveGiftBean.toString());
});
} else if (code == 1001) {

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

@ -70,6 +70,7 @@ import com.opensource.svgaplayer.SVGAParser;
import com.opensource.svgaplayer.SVGAVideoEntity;
import com.yunbao.common.bean.PrankProgressBean;
import com.yunbao.common.fragment.GiftWallMainTab1Fragment;
import com.yunbao.common.utils.DebugUtils;
import com.yunbao.common.utils.L;
import com.yunbao.common.utils.MobclickAgent;
import com.yunbao.common.CommonAppConfig;
@ -2354,7 +2355,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
if (!IMLoginManager.get(mContext).hintChat()) {
msgLayout.setVisibility(View.VISIBLE);
}
AppManager.runDebugCode(() -> msgLayout.setVisibility(View.GONE));
DebugUtils.runDebugCode(() -> msgLayout.setVisibility(View.GONE));
if (d_pk_view != null) {
d_pk_view.setVisibility(View.GONE);
}

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

@ -33,6 +33,7 @@ import com.lzf.easyfloat.permission.PermissionUtils;
import com.lzf.easyfloat.utils.LifecycleUtils;
import com.yunbao.common.dialog.DebugDialog;
import com.yunbao.common.manager.imrongcloud.RongcloudIMManager;
import com.yunbao.common.utils.DebugUtils;
import com.yunbao.common.utils.MobclickAgent;
import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.CommonAppContext;
@ -287,7 +288,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
liveImDeletUtil = new LiveImDeletUtil();
portraitLiveManager = this;
ininView();
AppManager.runDebugCode(() -> waitShowTopBannerTime = 1000);
DebugUtils.runDebugCode(() -> waitShowTopBannerTime = 1000);
}
/**
@ -873,7 +874,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
}
}
//liveHandler.postDelayed(loadTimeoutRunnableGone, 15_000);
AppManager.runDebugCode(() -> {
DebugUtils.runDebugCode(() -> {
liveHandler.postDelayed(loadTimeoutRunnableGone, 1_000);
});
if (TextUtils.equals(data.getEnterRoomInfo().getIsconnection(), "1")) {

5
live/src/main/res/layout/view_sys_msg.xml
View File

@ -62,12 +62,13 @@
android:id="@+id/tv_sys_msg_punish_notice"
android:layout_width="6dp"
android:layout_height="6dp"
android:background="@drawable/bg_red_yuan"
android:layout_alignTop="@+id/tv_sys_msg_punish"
android:layout_alignEnd="@id/tv_sys_msg_punish"
android:layout_marginTop="-1.5dp"
android:layout_marginEnd="-1.5dp"
android:visibility="gone" />
android:background="@drawable/bg_red_yuan"
android:visibility="gone"
tools:visibility="visible" />
</RelativeLayout>

29
main/src/main/java/com/yunbao/main/activity/MainActivity.java
View File

@ -12,13 +12,16 @@ import android.app.Dialog;
import android.app.NotificationChannel;
import android.app.PendingIntent;
import android.content.ClipData;
import android.content.ComponentName;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.ServiceConnection;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.os.IBinder;
import android.text.TextUtils;
import android.util.Log;
import android.view.Display;
@ -53,6 +56,7 @@ import com.tencent.imsdk.v2.V2TIMSDKListener;
import com.tencent.imsdk.v2.V2TIMUserFullInfo;
import com.yunbao.common.bean.QiniuLog;
import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.server.DownloadService;
import com.yunbao.common.utils.AppManager;
import com.yunbao.common.utils.LogUtil;
import com.yunbao.common.utils.MobclickAgent;
@ -231,6 +235,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
SWAuManager.get().initRtcEngine(this);
ActivityCompat.postponeEnterTransition(this);
ConversationIMListManager.get(this);
connectionInstallApkService();
//在请求一下这个接口给我后台版本号
CommonHttpUtil.getConfig(mContext, new CommonCallback<ConfigBean>() {
@Override
@ -900,6 +905,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
.dismissOnTouchOutside(false) // 点击外部是否关闭弹窗，默认为true
.asCustom(
new APKUpdateCustomPopup(mContext, false)
.setForceInstall(APKManager.get().getAPKGoogleIsUp() == 1)
.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override
public void onDismiss(DialogInterface dialogInterface) {
@ -920,6 +926,24 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
OpenAdManager.getInstance().show(OpenAdManager.TYPE_HOME, false);
}
DownloadService.ServiceBinder binder = null;
private void connectionInstallApkService() {
ServiceConnection connection = new ServiceConnection() {
@Override
public void onServiceConnected(ComponentName name, IBinder service) {
binder = (DownloadService.ServiceBinder) service;
}
@Override
public void onServiceDisconnected(ComponentName name) {
}
};
mContext.bindService(new Intent(mContext, DownloadService.class), connection, Context.BIND_AUTO_CREATE);
}
/**
* 填写邀请码
*/
@ -1008,6 +1032,11 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
@Override
protected void onResume() {
super.onResume();
if (binder != null) {
if (binder.isDownloadOK()) {
binder.install();
}
}
if (mFristLoad) {
mFristLoad = false;
// getLocation();

8
main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java
View File

@ -1,6 +1,8 @@
package com.yunbao.main.views;
import android.app.Activity;
import android.app.NotificationChannel;
import android.app.NotificationManager;
import android.content.Context;
import android.view.View;
import android.view.ViewGroup;
@ -10,6 +12,7 @@ import android.widget.ImageView;
import android.widget.TextView;
import androidx.appcompat.app.AppCompatActivity;
import androidx.core.app.NotificationCompat;
import com.lxj.xpopup.XPopup;
import com.lxj.xpopup.core.BottomPopupView;
@ -17,11 +20,14 @@ import com.yunbao.common.dialog.GiftWallDialog;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.manager.RandomSudGameManager;
import com.yunbao.common.utils.AppManager;
import com.yunbao.common.utils.DebugUtils;
import com.yunbao.common.utils.MobclickAgent;
import com.yunbao.common.activity.AbsActivity;
import com.yunbao.common.event.FloatWarOrderEvent;
import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.live.dialog.LivePrankDialogFragment;
import com.yunbao.main.R;
@ -66,7 +72,7 @@ public class MainHomeViewHolder extends AbsMainHomeParentViewHolder {
img_trophy.setOnLongClickListener(new View.OnLongClickListener() {
@Override
public boolean onLongClick(View view) {
AppManager.runDebugCode(new Runnable() {
DebugUtils.runDebugCode(new Runnable() {
@Override
public void run() {
/* new GiftWallDialog(mContext, IMLoginManager.get(mContext).getUserInfo().getId() + "",