From 7a61d3a66143087344202255222f25d251259e78 Mon Sep 17 00:00:00 2001 From: oujunhui <313127320@qq.com> Date: Fri, 15 May 2020 21:02:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8D=A2=E9=BA=A6=E4=B8=8D=E6=B8=85=E9=99=A4?= =?UTF-8?q?=E9=AD=85=E5=8A=9B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../avroom/giftvalue/GiftValueDialogUiHelper.java | 8 ++++---- .../erban/ui/user/UserModifyPhotosActivity.java | 2 +- .../community/square/SquareDynamicFragment.java | 3 +++ .../square/adapter/SquareDynamicAdapter.java | 2 +- .../room/giftvalue/GiftValueModel.java | 15 +++++++++------ .../room/giftvalue/IGiftValueModel.java | 5 ++++- .../room/giftvalue/helper/GiftValueMrg.java | 9 ++++++++- 7 files changed, 30 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/com/yizhuan/erban/avroom/giftvalue/GiftValueDialogUiHelper.java b/app/src/main/java/com/yizhuan/erban/avroom/giftvalue/GiftValueDialogUiHelper.java index 6b4710ee1..631edddf3 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/giftvalue/GiftValueDialogUiHelper.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/giftvalue/GiftValueDialogUiHelper.java @@ -62,16 +62,16 @@ public class GiftValueDialogUiHelper { public boolean isNeedConfirmDialog(int type) { if (type == TYPE_CLOSE_SHOW_GIFT_VALUE) { - Boolean value = (Boolean) SharedPreferenceUtils.get(KEY_NEED_DIALOG_WHEN_CLOSE_GIFT_VALUE_MODEL, true); + Boolean value = (Boolean) SharedPreferenceUtils.get(KEY_NEED_DIALOG_WHEN_CLOSE_GIFT_VALUE_MODEL, false); return value != null && value; } else if (type == TYPE_DOWN_MIC) { - Boolean value = (Boolean) SharedPreferenceUtils.get(KEY_DOWN_MIC_NEED_DIALOG_TIPS, true); + Boolean value = (Boolean) SharedPreferenceUtils.get(KEY_DOWN_MIC_NEED_DIALOG_TIPS, false); return value != null && value; } else if (type == TYPE_KICK_DOWN_MIC) { - Boolean value = (Boolean) SharedPreferenceUtils.get(KEY_KICK_DOWN_MIC_NEED_DIALOG_TIPS, true); + Boolean value = (Boolean) SharedPreferenceUtils.get(KEY_KICK_DOWN_MIC_NEED_DIALOG_TIPS, false); return value != null && value; } else if (type == TYPE_CHANGE_MIC) { - Boolean value = (Boolean) SharedPreferenceUtils.get(KEY_CHANGE_MIC_NEED_DIALOG_TIPS, true); + Boolean value = (Boolean) SharedPreferenceUtils.get(KEY_CHANGE_MIC_NEED_DIALOG_TIPS, false); return value != null && value; } return true; diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/UserModifyPhotosActivity.java b/app/src/main/java/com/yizhuan/erban/ui/user/UserModifyPhotosActivity.java index c02542891..99012fc89 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/UserModifyPhotosActivity.java +++ b/app/src/main/java/com/yizhuan/erban/ui/user/UserModifyPhotosActivity.java @@ -70,7 +70,7 @@ public class UserModifyPhotosActivity extends TakePhotoActivity implements UserM private void initView() { initTitleBar("我的相册"); TitleBar titleBar = findViewById(R.id.title_bar); - titleBar.addAction(new TitleBar.TextAction("编辑") { + titleBar.addAction(new TitleBar.TextAction("编辑",getResources().getColor(R.color.color_666666)) { @Override public void performAction(View view) { notifyEditMode(); diff --git a/app/src/module_community/java/com/yizhuan/erban/community/square/SquareDynamicFragment.java b/app/src/module_community/java/com/yizhuan/erban/community/square/SquareDynamicFragment.java index b57ce3815..980f0d06d 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/square/SquareDynamicFragment.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/square/SquareDynamicFragment.java @@ -195,6 +195,9 @@ public class SquareDynamicFragment extends BaseMvpFragment upMic(long micUid, int position) { + public Single upMic(long micUid, int position) { return api.upMic(AvRoomDataManager.get().getRoomUid(), micUid, position,AvRoomDataManager.get().isShowGiftValue()) - .compose(RxHelper.handleIgnoreData()); + .compose(RxHelper.handleBeanData()); } /** @@ -117,10 +120,10 @@ public class GiftValueModel extends BaseModel implements IGiftValueModel { */ @FormUrlEncoded @POST("/room/gift/value/up/mic") - Single> upMic(@Field("roomUid") long roomUid, - @Field("micUid") long micUid, - @Field("position") int position, - @Field("showGiftValue") boolean showGiftValue); + Single> upMic(@Field("roomUid") long roomUid, + @Field("micUid") long micUid, + @Field("position") int position, + @Field("showGiftValue") boolean showGiftValue); /** * 下麦，通知缓存变更 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/IGiftValueModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/IGiftValueModel.java index a81d9a343..32219e0f2 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/IGiftValueModel.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/IGiftValueModel.java @@ -1,7 +1,10 @@ package com.yizhuan.xchat_android_core.room.giftvalue; +import com.yizhuan.xchat_android_core.room.giftvalue.bean.IndexGiftValue; import com.yizhuan.xchat_android_core.room.giftvalue.bean.RoomGiftValue; +import java.util.List; + import io.reactivex.Single; /** @@ -20,7 +23,7 @@ public interface IGiftValueModel { /** * 上麦 更新缓存 */ - Single upMic(long micUid, int position); + Single upMic(long micUid, int position); /** * 下麦 更新缓存 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/helper/GiftValueMrg.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/helper/GiftValueMrg.java index 43426b185..dfe28102a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/helper/GiftValueMrg.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/helper/GiftValueMrg.java @@ -245,7 +245,14 @@ public class GiftValueMrg { public void requestUpMic(int micPosition, String upMicUid) { if (!TextUtils.isEmpty(upMicUid)) { - GiftValueModel.get().upMic(JavaUtil.str2long(upMicUid), micPosition).subscribe(); + GiftValueModel.get().upMic(JavaUtil.str2long(upMicUid), micPosition) .subscribe(new DontWarnObserver() { + @Override + public void acceptThrowable(RoomGiftValue values, Throwable throwable) { + super.acceptThrowable(values, throwable); + sendRoomGiftValueMsg(values); + updateAllMicGiftValueByMsg(values); + } + }); } }