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

fix:小时榜多次跳转后返回是回到主页

Browse Source 
update:调整UI
This commit is contained in:
zlzw
2022-08-30 18:57:58 +08:00
parent 40a8d604b0
commit 11854ba95a
10 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
live/src/main/java/com/yunbao/live/dialog/LiveHDDialogFragment.java
View File

@@ -4,6 +4,7 @@ import static com.yunbao.common.CommonAppContext.logger;
import static com.yunbao.common.CommonAppContext.mFirebaseAnalytics;
import static com.yunbao.common.utils.RouteUtil.PATH_COIN;
import android.content.Intent;
import android.graphics.Color;
import android.os.Build;
import android.os.Bundle;
@@ -26,6 +27,7 @@ import com.adjust.sdk.Adjust;
import com.adjust.sdk.AdjustEvent;
import com.alibaba.android.arouter.launcher.ARouter;
import com.alibaba.fastjson.JSON;
import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.Constants;
import com.yunbao.common.bean.JsWishBean;
import com.yunbao.common.dialog.AbsDialogFragment;
@@ -35,6 +37,7 @@ import com.yunbao.common.utils.RouteUtil;
import com.yunbao.live.R;
import com.yunbao.live.activity.LiveActivity;
import com.yunbao.live.activity.LiveAudienceActivity;
import com.yunbao.live.activity.ZhuangBanActivity;
import com.yunbao.live.bean.LiveBean;
import com.yunbao.live.http.LiveHttpUtil;
import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
@@ -230,6 +233,18 @@ public class LiveHDDialogFragment extends AbsDialogFragment {
//看直播
gotoLive(liveId);
}
@JavascriptInterface
public void androidClickToNewH5PageView(String url){
url = CommonAppConfig.HOST + url;
url += "?uid=" + CommonAppConfig.getInstance().getUid() + "&token="
+ CommonAppConfig.getInstance().getToken();
Log.i("tag", url);
Intent intent = new Intent(mContext, ZhuangBanActivity.class);
intent.putExtra("url", url);
intent.putExtra("isFull", false);
mContext.startActivity(intent);
}
}
private LiveRoomCheckLivePresenter mCheckLivePresenter; private void gotoLive(final String live_id) {
LiveHttpUtil.getLiveInfo(live_id, new HttpCallback() {
@@ -246,8 +261,8 @@ public class LiveHDDialogFragment extends AbsDialogFragment {
return;
}
((LiveAudienceActivity) mContext).finish();
LiveAudienceActivity.forward(mContext, liveBean, liveType, liveTypeVal, "", 0, liveSdk);
}
});
}

2
live/src/main/java/com/yunbao/live/dialog/LiveUserMoreDialogFragment.java
View File

@@ -302,7 +302,7 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie
private List<LiveUserRankBean> processRankData(JSONObject json){
JSONArray rank=Integer.parseInt(Tips)==4?json.getJSONArray("listDay"):json.getJSONArray("listWeek");
List<LiveUserRankBean> data =new ArrayList<>();
/**
/*
* 由于在线观众和粉丝列表实体结构与榜单结构不一致，做个兼容操作
*/
if(rank==null){

9
live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java
View File

@@ -377,13 +377,10 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
NewPeopleInfo peopleInfo = stringResponseModel.getData().getInfo();
if (peopleInfo.getIsShow()) {
liveNewPeople.setVisibility(View.VISIBLE);
if(peopleInfo.getLink().startsWith("http")){
newPeopleUrl = peopleInfo.getLink();
if(!newPeopleUrl.contains("?")){
newPeopleUrl+="?";
}
if (peopleInfo.getLink().startsWith("http")){
newPeopleUrl=peopleInfo.getLink()+"?";
}else {
newPeopleUrl = CommonAppConfig.HOST + peopleInfo.getLink();
newPeopleUrl = CommonAppConfig.HOST + "/" + peopleInfo.getLink();
}
}
}, Throwable::printStackTrace).isDisposed();

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

@@ -1155,7 +1155,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
if (rank == 0) {
mHourRank.setText(R.string.no_rank_data);
} else {
mHourRank.setText(formatBigNum.formatBigNum(rank + ""));
mHourRank.setText("第"+formatBigNum.formatBigNum(rank + "")+"名");
}
}
}