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

bugfix

Browse Source
This commit is contained in:
oujunhui
2020-06-12 15:13:07 +08:00
parent 48f56d5d56
commit 130e5839f8
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/com/yizhuan/erban/avroom/adapter/OnlineUserAdapter.java
View File

@@ -194,18 +194,18 @@ public class OnlineUserAdapter extends BaseMultiItemQuickAdapter<OnlineChatMembe
View inNamePlate = baseViewHolder.getView(R.id.in_nameplate); View inNamePlate = baseViewHolder.getView(R.id.in_nameplate);
if (!TextUtils.isEmpty(namePlateWord) && !TextUtils.isEmpty(namePlatePic)) { if (!TextUtils.isEmpty(namePlateWord) && !TextUtils.isEmpty(namePlatePic)) {
inNamePlate.setVisibility(View.VISIBLE); inNamePlate.setVisibility(View.VISIBLE);
TextView tvOfficialMask = inNamePlate.findViewById(R.id.tv_official_mask); TextView tvNamePlate = inNamePlate.findViewById(R.id.tv_official_mask);
if (tvOfficialMask != null) { if (tvNamePlate != null) {
tvOfficialMask.setText(namePlateWord); tvNamePlate.setText(namePlateWord);
} }
ImageView ivOfficialMask = inNamePlate.findViewById(R.id.iv_official_mask); ImageView ivNamePlate = inNamePlate.findViewById(R.id.iv_official_mask);
if (ivOfficialMask != null) { if (ivNamePlate != null) {
ImageLoadUtils.loadImage(mContext, namePlatePic, ivOfficialMask); ImageLoadUtils.loadImage(mContext, namePlatePic, ivNamePlate);
} }
} else { } else {
inOfficialMask.setVisibility(View.GONE); inNamePlate.setVisibility(View.GONE);
} }
AppCompatImageView ivUserLevel = baseViewHolder.getView(R.id.iv_noble_level); AppCompatImageView ivUserLevel = baseViewHolder.getView(R.id.iv_noble_level);

2
app/src/main/res/values/strings.xml
View File

@@ -92,7 +92,7 @@
<string name="menu_my_wallet">我的钱包</string> <string name="menu_my_wallet">我的钱包</string>
<string name="menu_my_income">我的礼物票</string> <string name="menu_my_income">我的礼物票</string>
<string name="menu_my_level">我的等级</string> <string name="menu_my_level">我的等级</string>
<string name="menu_my_decoration">我的装饰</string> <string name="menu_my_decoration">我的装扮</string>
<string name="menu_my_union">我的公会</string> <string name="menu_my_union">我的公会</string>
<string name="menu_my_gold_charge">钻石/充值</string> <string name="menu_my_gold_charge">钻石/充值</string>
<string name="menu_my_auction">竞拍记录</string> <string name="menu_my_auction">竞拍记录</string>

3
app/src/module_quick_pass/java/com/yizhuan/erban/quick_pass/QuickPassLoginAct.java
View File

@@ -32,6 +32,7 @@ import com.yizhuan.xchat_android_core.auth.exception.IsSuperAdminException;
import com.yizhuan.xchat_android_core.initial.InitialModel; import com.yizhuan.xchat_android_core.initial.InitialModel;
import com.yizhuan.xchat_android_core.statistic.StatisticManager; import com.yizhuan.xchat_android_core.statistic.StatisticManager;
import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil;
import com.yizhuan.xchat_android_library.utils.TelephonyUtils; import com.yizhuan.xchat_android_library.utils.TelephonyUtils;
import com.yizhuan.xchat_android_library.utils.codec.MD5Utils; import com.yizhuan.xchat_android_library.utils.codec.MD5Utils;
import com.yizhuan.xchat_android_library.utils.config.BasicConfig; import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
@@ -73,7 +74,7 @@ public class QuickPassLoginAct extends BaseLoginAct implements View.OnClickListe
imeiMd5 = MD5Utils.getMD5String(imei); imeiMd5 = MD5Utils.getMD5String(imei);
} }
if (TextUtils.isEmpty(oaid) && TextUtils.isEmpty(imeiMd5)){ if (TextUtils.isEmpty(oaid) && TextUtils.isEmpty(imeiMd5) && !"bilibili2".equals(AppMetaDataUtil.getChannelID()) ){
return; return;
} }
InitialModel.get().reportAdv(oaid,imeiMd5).subscribe(); InitialModel.get().reportAdv(oaid,imeiMd5).subscribe();