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

主播端不关闭连麦直接下播导致的问题。修复，用户端因为主播下播没关连麦导致的连麦状态不对的修复

Browse Source
This commit is contained in:
18401019693
2023-11-01 18:09:55 +08:00
parent 21473b1d69
commit d7bc2615d6
12 changed files with 126 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -135,6 +135,7 @@ import java.io.File;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
@@ -588,8 +589,11 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
*/
private synchronized void initAnchorRecommendBanner() {
if (!isfloatBannernet) return;
Map<String, Object> map = new HashMap<>();
map.put("num", "10");
map.put("live_recommend", "quick_look");
MainNetManager.get(mContext)
.anchorRecommend("10", new com.yunbao.common.http.base.HttpCallback<AnchorRecommendModel>() {
.anchorRecommend(map, new com.yunbao.common.http.base.HttpCallback<AnchorRecommendModel>() {
@SuppressLint("SetTextI18n")
@Override
public void onSuccess(AnchorRecommendModel data) {

7
main/src/main/java/com/yunbao/main/fragment/SearchRecommendFragment.java
View File

@@ -23,6 +23,7 @@ import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -65,9 +66,11 @@ public class SearchRecommendFragment extends BaseFragment {
searchRecommendModels.add(model.setHistoryRecordMap(historyRecordMap));
}
adapter.addData(searchRecommendModels);
Map<String, Object> map = new HashMap<>();
map.put("num", "10");
map.put("live_recommend", "search");
MainNetManager.get(getActivity())
.anchorRecommend("10", new HttpCallback<AnchorRecommendModel>() {
.anchorRecommend(map, new HttpCallback<AnchorRecommendModel>() {
@Override
public void onSuccess(AnchorRecommendModel data) {
if (getActivity().isFinishing()) return;

45
main/src/main/java/com/yunbao/main/fragment/SearchResultsItemFragment.java
View File

@@ -17,14 +17,16 @@ import com.yunbao.common.fragment.BaseFragment;
import com.yunbao.common.http.base.HttpCallback;
import com.yunbao.common.http.main.MainNetManager;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordsTypeUtil;
import com.yunbao.common.views.weight.OnRecyclerViewScrollListener;
import com.yunbao.main.R;
import com.yunbao.main.adapter.SearchRecommendBodyAdapter;
import com.yunbao.main.adapter.SearchResultsItemAdapter;
import com.yunbao.common.utils.WordsTypeUtil;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 展示結果的分類頁面
@@ -76,7 +78,7 @@ public class SearchResultsItemFragment extends BaseFragment {
searchList.addOnScrollListener(new OnRecyclerViewScrollListener() {
@Override
public void onBottom() {
if (type>1){
if (type > 1) {
page = page + 1;
setSearchKey(searchKey, type);
}
@@ -93,8 +95,12 @@ public class SearchResultsItemFragment extends BaseFragment {
changeBatch.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Map<String, Object> map = new HashMap<>();
map.put("num", "10");
map.put("live_recommend", "search");
map.put("refresh", "1");
MainNetManager.get(getActivity())
.anchorRecommend("10", new HttpCallback<AnchorRecommendModel>() {
.anchorRecommend(map, new HttpCallback<AnchorRecommendModel>() {
@Override
public void onSuccess(AnchorRecommendModel data) {
adapter.showData(data.getList());
@@ -107,8 +113,11 @@ public class SearchResultsItemFragment extends BaseFragment {
});
}
});
Map<String, Object> map = new HashMap<>();
map.put("num", "10");
map.put("live_recommend", "search");
MainNetManager.get(getActivity())
.anchorRecommend("10", new HttpCallback<AnchorRecommendModel>() {
.anchorRecommend(map, new HttpCallback<AnchorRecommendModel>() {
@Override
public void onSuccess(AnchorRecommendModel data) {
adapter.showData(data.getList());
@@ -117,7 +126,7 @@ public class SearchResultsItemFragment extends BaseFragment {
@Override
public void onError(String error) {
ToastUtil.show( R.string.net_error);
ToastUtil.show(R.string.net_error);
}
});
}
@@ -142,22 +151,24 @@ public class SearchResultsItemFragment extends BaseFragment {
type, page, new HttpCallback<List<List<SearchModel>>>() {
@Override
public void onSuccess(List<List<SearchModel>> data) {
if (getActivity()==null||getActivity().isFinishing()) return;
if (getActivity() == null || getActivity().isFinishing())
return;
if (data.get(0).size() == 0 && data.get(1).size() == 0) {
emptyLayout.setVisibility(View.VISIBLE);
searchList.setVisibility(View.GONE);
} else {
itemAdapter.showData(data, type, searchKey);
searchList.setVisibility(View.VISIBLE);
}
if (data.get(0).size() == 0 && data.get(1).size() == 0) {
emptyLayout.setVisibility(View.VISIBLE);
searchList.setVisibility(View.GONE);
} else {
itemAdapter.showData(data, type, searchKey);
searchList.setVisibility(View.VISIBLE);
}
}
@Override
public void onError(String error) {
if (getActivity()==null||getActivity().isFinishing()) return;
if (getActivity() == null || getActivity().isFinishing())
return;
emptyLayout.setVisibility(View.VISIBLE);
searchList.setVisibility(View.GONE);
}
@@ -169,7 +180,8 @@ public class SearchResultsItemFragment extends BaseFragment {
type, page, new HttpCallback<List<SearchModel>>() {
@Override
public void onSuccess(List<SearchModel> data) {
if (getActivity()==null||getActivity().isFinishing()) return;
if (getActivity() == null || getActivity().isFinishing())
return;
List<List<SearchModel>> listList = new ArrayList<>();
listList.add(data);
if (page > 1) {
@@ -191,7 +203,8 @@ public class SearchResultsItemFragment extends BaseFragment {
@Override
public void onError(String error) {
if (getActivity()==null||getActivity().isFinishing()) return;
if (getActivity() == null || getActivity().isFinishing())
return;
emptyLayout.setVisibility(View.VISIBLE);
searchList.setVisibility(View.GONE);
}

7
main/src/main/java/com/yunbao/main/views/SearchRecommendBodyViewHolder.java
View File

@@ -21,6 +21,7 @@ import com.yunbao.main.R;
import com.yunbao.main.adapter.SearchRecommendBodyAdapter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -43,8 +44,12 @@ public class SearchRecommendBodyViewHolder extends RecyclerView.ViewHolder {
@Override
public void onClick(View v) {
// Bus.get().post(new SearchRecommendEvent());
Map<String, Object> map = new HashMap<>();
map.put("num", "10");
map.put("live_recommend", "search");
map.put("refresh", "1");
MainNetManager.get((Activity) itemView.getContext())
.anchorRecommend("10", new HttpCallback<AnchorRecommendModel>() {
.anchorRecommend(map, new HttpCallback<AnchorRecommendModel>() {
@Override
public void onSuccess(AnchorRecommendModel data) {
showData(data.getList());