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

部分BUG修改

Browse Source
This commit is contained in:
ningwenqiang
2024-09-21 14:35:07 +08:00
parent 81cf2824a7
commit f30144c42c
10 changed files with 23 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
live/src/main/java/com/yunbao/live/activity/LiveSwAnchorActivity.java
View File

@@ -834,9 +834,7 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl
mLiveRoomViewHolder.setLiveInfo(mLiveUid, mStream, obj.getIntValue("userlist_time") * 1000);
mLiveRoomViewHolder.setVotes(obj.getString("votestotal"));
mLiveRoomViewHolder.setMedaRankNum(obj.getString("medalRankNum"));
String url = obj.getString("new_task_url")+"&uid="+mLiveUid+"&token="+CommonAppConfig.getInstance().getToken();
Log.i("新手任务url",url);
mLiveRoomViewHolder.setShowTask(url,obj.getIntValue("is_new_live")==1);
mLiveRoomViewHolder.setShowTask(obj.getString("new_task_url"),obj.getIntValue("is_new_live")==1);
mLiveRoomViewHolder.startFace();
UserBean u = CommonAppConfig.getInstance().getUserBean();
if (u != null) {

9
live/src/main/java/com/yunbao/live/activity/ZhuangBanActivity.java
View File

@@ -298,10 +298,15 @@ public class ZhuangBanActivity extends AbsActivity {
public static void forward(Context context, String url, boolean addArgs, int isLive) {
if (addArgs) {
url += "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + (WordUtil.isNewZh() ? "1" : 0);
if(url.contains("?")){
url += "&uid=" + CommonAppConfig.getInstance().getUid();
}else {
url += "?uid=" + CommonAppConfig.getInstance().getUid();
}
url += "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + (WordUtil.isNewZh() ? "1" : 0);
}
Intent intent = new Intent(context, ZhuangBanActivity.class);
Log.i("tag", url);
Log.i("ForwardUrl", url);
intent.putExtra(Constants.URL, url);
if (url.contains("Noble/index.html") || url.contains("RongYuQiang")) {
intent.putExtra("title", "");

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

@@ -3039,6 +3039,9 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
anchorTimeHandler.removeCallbacks(anchorTimeRunnable);
pa_pao_layout.setVisibility(View.GONE);
combo_layout.setVisibility(View.GONE);
mAnchorSay.setVisibility(View.GONE);
newGodSayGroup.setVisibility(View.GONE);
mLiveRoomHandler.removeMessages(LiveRoomHandler.WHAT_ANCHOR_GOD_SHOW_HIDE);
resetViewGone();
visibility = false;
pkUidTmp = "";
@@ -5592,13 +5595,12 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
}
public void setShowTask(String url, boolean isShow) {
newTaskGroup = findViewById(R.id.newTaskGroup);
newTaskBg = findViewById(R.id.newTaskBg);
newTaskBg.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
ZhuangBanActivity.forward(mContext, url, false, 1);
ZhuangBanActivity.forward(mContext, url, true, 1);
}
});
newTaskGroup.setVisibility(isShow ? View.VISIBLE : View.GONE);