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

fix:调整开启私聊浮窗时，下方私聊不显示红点

Browse Source 
fix:调整新人任务布局间距
fix：修复搜索栏一直搜索会空指针闪退问题
This commit is contained in:
zlzw 2022-09-06 16:18:22 +08:00
parent 0a179e5727
commit 4560c00810
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,6 +37,7 @@ import com.yunbao.common.http.HttpClient;
import com.yunbao.common.manager.imrongcloud.MessageIMManager; import com.yunbao.common.manager.imrongcloud.MessageIMManager;
import com.yunbao.common.utils.Bus; import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.DpUtil; import com.yunbao.common.utils.DpUtil;
import com.yunbao.common.utils.SpUtil;
import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.views.weight.ViewClicksAntiShake; import com.yunbao.common.views.weight.ViewClicksAntiShake;
import com.yunbao.live.R; import com.yunbao.live.R;
@ -439,7 +440,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
public void onMessageIMEvent(MessageIMEvent event) { public void onMessageIMEvent(MessageIMEvent event) {
//判断消息中心红点是否已经展示，如果已经展示并且未读消息大于0则不再执行之后的逻辑 //判断消息中心红点是否已经展示，如果已经展示并且未读消息大于0则不再执行之后的逻辑
int number = event.getNumber(); int number = event.getNumber();
if (v_msg_redpoint.getVisibility() == View.VISIBLE && number > 0) return; if (v_msg_redpoint.getVisibility() == View.VISIBLE && number > 0 || SpUtil.getInstance().getBooleanValue("private_chat_message_switch")) return;
if (number > 0) { if (number > 0) {
v_msg_redpoint.setVisibility(View.VISIBLE); v_msg_redpoint.setVisibility(View.VISIBLE);
} else { } else {

11
live/src/main/res/layout/view_live_room.xml
View File

@ -95,7 +95,7 @@
android:layout_height="80dp" android:layout_height="80dp"
android:layout_gravity="right" android:layout_gravity="right"
android:layout_marginRight="15dp" android:layout_marginRight="15dp"
android:layout_marginBottom="25dp" android:layout_marginBottom="5dp"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:orientation="vertical" android:orientation="vertical"
android:visibility="gone"> android:visibility="gone">
@ -110,15 +110,13 @@
app:indicator_width="8dp" /> app:indicator_width="8dp" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/btn_event" android:id="@+id/btn_event"
android:layout_width="68dp" android:layout_width="68dp"
android:layout_height="68dp" android:layout_height="68dp"
android:layout_gravity="right" android:layout_gravity="right"
android:layout_marginRight="10dp" android:layout_marginRight="10dp"
android:layout_marginBottom="20dp" android:layout_marginBottom="5dp"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:orientation="vertical" android:orientation="vertical"
android:visibility="gone"> android:visibility="gone">
@ -128,7 +126,10 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:src="@drawable/live_turntable" /> android:src="@drawable/live_turntable" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="30dp">
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

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

@ -140,7 +140,7 @@ public class SearchResultsItemFragment extends BaseFragment {
type, page, new HttpCallback<List<List<SearchModel>>>() { type, page, new HttpCallback<List<List<SearchModel>>>() {
@Override @Override
public void onSuccess(List<List<SearchModel>> data) { public void onSuccess(List<List<SearchModel>> data) {
if (getActivity().isFinishing()) return; if (getActivity()==null||getActivity().isFinishing()) return;
if (data.get(0).size() == 0 && data.get(1).size() == 0) { if (data.get(0).size() == 0 && data.get(1).size() == 0) {
@ -155,7 +155,7 @@ public class SearchResultsItemFragment extends BaseFragment {
@Override @Override
public void onError(String error) { public void onError(String error) {
if (getActivity().isFinishing()) return; if (getActivity()==null||getActivity().isFinishing()) return;
emptyLayout.setVisibility(View.VISIBLE); emptyLayout.setVisibility(View.VISIBLE);
searchList.setVisibility(View.GONE); searchList.setVisibility(View.GONE);
} }
@ -167,7 +167,7 @@ public class SearchResultsItemFragment extends BaseFragment {
type, page, new HttpCallback<List<SearchModel>>() { type, page, new HttpCallback<List<SearchModel>>() {
@Override @Override
public void onSuccess(List<SearchModel> data) { public void onSuccess(List<SearchModel> data) {
if (getActivity().isFinishing()) return; if (getActivity()==null||getActivity().isFinishing()) return;
List<List<SearchModel>> listList = new ArrayList<>(); List<List<SearchModel>> listList = new ArrayList<>();
listList.add(data); listList.add(data);
if (page > 1) { if (page > 1) {
@ -189,7 +189,7 @@ public class SearchResultsItemFragment extends BaseFragment {
@Override @Override
public void onError(String error) { public void onError(String error) {
if (getActivity().isFinishing()) return; if (getActivity()==null||getActivity().isFinishing()) return;
emptyLayout.setVisibility(View.VISIBLE); emptyLayout.setVisibility(View.VISIBLE);
searchList.setVisibility(View.GONE); searchList.setVisibility(View.GONE);
} }