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

fix[声望升级-合并]

Browse Source
This commit is contained in:
Martin 2024-05-22 13:46:52 +08:00
parent cbf517bed6
commit b6d0ea1fba
5 changed files with 2 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/src/main/java/com/yunbao/common/bean/AiAutomaticSpeechModel.java
View File

@ -30,9 +30,6 @@ public class AiAutomaticSpeechModel extends BaseModel {
//气泡背景
@SerializedName("system_bubble")
private String systemBubble;
@SerializedName("icon_en")
@JSONField(name = "icon_en")
private String iconEn;
public String getNameColor() {
return nameColor;
@ -52,15 +49,6 @@ public class AiAutomaticSpeechModel extends BaseModel {
return this;
}
public String getIconEn() {
return iconEn;
}
public AiAutomaticSpeechModel setIconEn(String iconEn) {
this.iconEn = iconEn;
return this;
}
public String getContent() {
return content;
}

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

@ -62,15 +62,6 @@ public class AppManager {
activityStack.add(activity);
}
public Activity getMainActivity() {
for (Activity activity : activityStack) {
if (activity.getClass().getSimpleName().contains("MainActivity")) {
return activity;
}
}
return null;
}
/**
* 移除Activity
*/

6
live/src/main/java/com/yunbao/live/bean/LiveChatBean.java
View File

@ -60,8 +60,6 @@ public class LiveChatBean {
private String giftname_en;
private String toUid;
private String medal_new_en;
public int getNORMAL() {
return NORMAL;
}
@ -214,10 +212,6 @@ public class LiveChatBean {
return medal_new_en;
}
public void setMedal_new_en(String medal_new_en) {
this.medal_new_en = medal_new_en;
}
public String getHot_card() {
return hot_card;
}

2
live/src/main/java/com/yunbao/live/presenter/LiveGiftAnimPresenter.java
View File

@ -459,7 +459,7 @@ public class LiveGiftAnimPresenter {
LiveBean liveBean = JSON.parseObject(info[0], LiveBean.class);
new LiveRoomCheckLivePresenter(mContext, liveBean.getUid(), liveBean.getStream(), new LiveRoomCheckLivePresenter.NewActionListener() {
@Override
public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk) {
public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk,boolean isSw) {
if (liveBean == null) {
return;
}

2
main/src/main/java/com/yunbao/main/dialog/MainStartDialogFragment.java
View File

@ -22,7 +22,6 @@ import android.widget.LinearLayout;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.umeng.analytics.MobclickAgent;
import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.CommonAppContext;
import com.yunbao.common.Constants;
@ -32,6 +31,7 @@ import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.http.LiveHttpUtil;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.DialogUitl;
import com.yunbao.common.utils.MobclickAgent;
import com.yunbao.common.utils.PluginManager;
import com.yunbao.common.utils.ProcessResultUtil;
import com.yunbao.common.utils.ToastUtil;