yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into yinyou_dating

Browse Source
This commit is contained in:
huangjian
2021-03-01 18:44:32 +08:00
parent f967925ff9 f4ecda99c0
commit aa981c32dc
3 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/com/yizhuan/erban/avroom/adapter/BaseMicroViewAdapter.java
View File

@@ -168,7 +168,6 @@ public abstract class BaseMicroViewAdapter extends RecyclerView.Adapter<Recycler
//显示，先展示人，无视坑的锁 //显示，先展示人，无视坑的锁
if (chatRoomMember != null) { if (chatRoomMember != null) {
LogUtils.d(chatRoomMember.toString());
ivLockImage.setVisibility(View.GONE); ivLockImage.setVisibility(View.GONE);
ivMuteImage.setVisibility(roomMicInfo.isMicMute() ? View.VISIBLE : View.GONE); ivMuteImage.setVisibility(roomMicInfo.isMicMute() ? View.VISIBLE : View.GONE);
@@ -180,7 +179,7 @@ public abstract class BaseMicroViewAdapter extends RecyclerView.Adapter<Recycler
// 加载贵族 // 加载贵族
updateNobleView(chatRoomMember); updateNobleView(chatRoomMember);
} else { } else {
ivHeadWear.setVisibility(View.GONE); clearHeadWear();
ivUpImage.setVisibility(View.VISIBLE); ivUpImage.setVisibility(View.VISIBLE);
ivAvatar.setVisibility(View.GONE); ivAvatar.setVisibility(View.GONE);
ivCharmLevelTag.setVisibility(View.GONE); ivCharmLevelTag.setVisibility(View.GONE);
@@ -191,10 +190,11 @@ public abstract class BaseMicroViewAdapter extends RecyclerView.Adapter<Recycler
ivHalo.setBackground(null); ivHalo.setBackground(null);
ivHalo.clearAnimation(); ivHalo.clearAnimation();
// 清除头饰 // 清除头饰
GlideApp.with(context).clear(ivHeadWear); clearHeadWear();
ivHeadWear.clearAnimation(); ivHeadWear.clearAnimation();
ivHeadWear.setImageDrawable(null); ivHeadWear.setImageDrawable(null);
ivHeadWear.setVisibility(View.GONE); ivHeadWear.setVisibility(View.GONE);
ivHeadWear.setTag(R.id.mic_item_head_wear, null);
//锁坑 //锁坑
ivMuteImage.setVisibility(roomMicInfo.isMicMute() ? View.VISIBLE : View.GONE); ivMuteImage.setVisibility(roomMicInfo.isMicMute() ? View.VISIBLE : View.GONE);
if (roomMicInfo.isMicLock()) { if (roomMicInfo.isMicLock()) {
@@ -212,6 +212,14 @@ public abstract class BaseMicroViewAdapter extends RecyclerView.Adapter<Recycler
} }
private void clearHeadWear() {
GlideApp.with(context).clear(ivHeadWear);
ivHeadWear.clearAnimation();
ivHeadWear.setImageDrawable(null);
ivHeadWear.setTag(R.id.mic_item_head_wear, null);
ivHeadWear.setVisibility(View.GONE);
}
protected void setDefalutText(int index) { protected void setDefalutText(int index) {
tvNick.setTextColor(context.getResources().getColor(R.color.white_transparent_30)); tvNick.setTextColor(context.getResources().getColor(R.color.white_transparent_30));
tvNick.setText("号麦位"); tvNick.setText("号麦位");
@@ -261,9 +269,8 @@ public abstract class BaseMicroViewAdapter extends RecyclerView.Adapter<Recycler
// 头饰 // 头饰
ivHeadWear.setVisibility(View.VISIBLE); ivHeadWear.setVisibility(View.VISIBLE);
NobleUtil.loadResource(nobleHeadWear, ivHeadWear); NobleUtil.loadResource(nobleHeadWear, ivHeadWear);
} } else {
else { clearHeadWear();
ivHeadWear.setVisibility(View.GONE);
} }
} }

1
core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/PaymentActivity.java
View File

@@ -366,6 +366,7 @@ public class PaymentActivity extends Activity
} }
} }
}) })
.compose(RxHelper.handleSchedulers())
.subscribe((stringStringMap, throwable) -> { .subscribe((stringStringMap, throwable) -> {
if (throwable == null) { if (throwable == null) {
AliPayResult aliPayResult = new AliPayResult(stringStringMap); AliPayResult aliPayResult = new AliPayResult(stringStringMap);

3
core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/model/alipay/AliPayModel.java
View File

@@ -55,8 +55,7 @@ public class AliPayModel extends BaseModel implements IAliPayModel {
chargeProdId, chargeProdId,
Constants.CHARGE_ALIPAY, Constants.CHARGE_ALIPAY,
NetworkUtils.getIPAddress(context), NetworkUtils.getIPAddress(context),
AuthModel.get().getTicket()) AuthModel.get().getTicket());
.compose(RxHelper.handleSchedulers());
} }