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

去掉全部消息的性别年龄，修改私聊发送礼物的字体颜色

Browse Source
This commit is contained in:
oujunhui
2020-05-13 22:19:30 +08:00
parent 548a8486d8
commit a3f0b6d472
6 changed files with 11 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/yizhuan/erban/MainActivity.java
View File

@@ -856,7 +856,7 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
@Override
public void accept(UserInfo userInfo) throws Exception {
if (userInfo != null) {
displayAvatarLayout(userInfo.getAvatar(), userInfo.getNick(), userInfo.getErbanNo());
displayAvatarLayout(userInfo.getAvatar(), roomInfo.getTitle(), userInfo.getErbanNo());
} else {
NimUserInfo nimUserInfo = NimUserInfoCache.getInstance().getUserInfo(roomInfo.getUid() + "");
if (nimUserInfo == null) {
@@ -864,12 +864,12 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
@Override
public void onResult(int i, NimUserInfo nimUserInfo, Throwable throwable) {
if (nimUserInfo != null) {
displayAvatarLayout(nimUserInfo.getAvatar(), userInfo.getNick(), userInfo.getUid());
displayAvatarLayout(nimUserInfo.getAvatar(),roomInfo.getTitle(), userInfo.getUid());
}
}
});
} else {
displayAvatarLayout(nimUserInfo.getAvatar(), userInfo.getNick(), userInfo.getUid());
displayAvatarLayout(nimUserInfo.getAvatar(), roomInfo.getTitle(), userInfo.getUid());
}
}
}

13
app/src/main/java/com/yizhuan/erban/home/adapter/CommunityNoticeAdapter.java
View File

@@ -33,19 +33,10 @@ public class CommunityNoticeAdapter extends BaseQuickAdapter<CommunityNoticeInfo
helper.setText(R.id.tv_name_mini_world, "#" + worldName)
.setGone(R.id.tv_name_mini_world, !TextUtils.isEmpty(worldName));
helper.setText(R.id.tv_name_community_notice_list, item.getNick());
helper.setText(R.id.tv_age_community_notice_list, String.valueOf(item.getAge()));
helper.setGone(R.id.tv_age_community_notice_list, false)
.setGone(R.id.iv_gender, false);
if (item.isShowAge()) {
helper.setBackgroundRes(R.id.tv_age_community_notice_list,
item.isMale() ? R.drawable.ic_male_community_notice : R.drawable.ic_female_age_community_notice)
.setGone(R.id.tv_age_community_notice_list, true);
} else {
helper.setGone(R.id.iv_gender, true)
helper.setGone(R.id.iv_gender, true)
.setImageResource(R.id.iv_gender, item.isMale() ? R.drawable.ic_gender_male : R.drawable.ic_gender_female);
}
helper.setGone(R.id.tv_right_content, false)
.setGone(R.id.rriv_right_content, false);
DynamicMedia dynamicMedia = item.getDynamicRes();

2
app/src/main/java/com/yizhuan/erban/home/fragment/HomeTabHomeFragment.java
View File

@@ -30,7 +30,7 @@ import java.util.Random;
import java.util.concurrent.CancellationException;
/**
* 语音排队 没用下拉式的tab
*
*/
public class HomeTabHomeFragment extends LazyLoadFragment {
public static final int ROWS = 3;

6
app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderGift.java
View File

@@ -55,9 +55,9 @@ public class MsgViewHolderGift extends MsgViewHolderBase {
GiftModel.get().findGiftInfoById(attachment.getGiftReceiveInfo().getGiftId()) : giftInfo;
boolean isSelf = attachment.getGiftReceiveInfo().getUid() == AuthModel.get().getCurrentUid();
giftName.setTextColor(isSelf ? ContextCompat.getColor(context, R.color.white) : ContextCompat.getColor(context, R.color.color_333333));
number.setTextColor(isSelf ? ContextCompat.getColor(context, R.color.white) : ContextCompat.getColor(context, R.color.color_333333));
tvTargetNick.setTextColor(isSelf ? ContextCompat.getColor(context, R.color.white_transparent_80) : ContextCompat.getColor(context, R.color.color_999999));
giftName.setTextColor(isSelf ? ContextCompat.getColor(context, R.color.color_333333) : ContextCompat.getColor(context, R.color.color_333333));
number.setTextColor(isSelf ? ContextCompat.getColor(context, R.color.color_333333) : ContextCompat.getColor(context, R.color.color_333333));
tvTargetNick.setTextColor(isSelf ? ContextCompat.getColor(context, R.color.color_999999) : ContextCompat.getColor(context, R.color.color_999999));
flGiftImg.setBackgroundResource(isSelf ? R.drawable.bg_msg_gift_img : R.drawable.bg_msg_gift_img_normal);
if (giftInfo != null) {

13
app/src/module_community/res/layout/item_community_notice_list.xml
View File

@@ -71,18 +71,7 @@
tools:src="@drawable/ic_gender_female"
tools:visibility="visible" />
<TextView
android:id="@+id/tv_age_community_notice_list"
android:layout_width="30dp"
android:layout_height="14dp"
android:paddingEnd="5dp"
android:layout_marginStart="4dp"
android:includeFontPadding="false"
tools:background="@drawable/ic_female_age_community_notice"
tools:text="19"
android:textColor="@color/white"
android:gravity="center_vertical|end"
android:textSize="10sp"/>
<TextView
android:id="@+id/tv_label_community_notice_list"

2
core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java
View File

@@ -46,7 +46,7 @@ public class XChatConstants {
/**
* bugly key (RELEASE)
*/
public static final String BUGLY_KEY_RELEASE = "d2dec194c0";//已更改
public static final String BUGLY_KEY_RELEASE = "0797a01eba";//已更改
/**
* 云信 key (DEBUG)