From 73684b996221f55386b503c92b46904b630027b8 Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Thu, 1 Dec 2022 14:51:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=94=A8=E6=88=B7=E5=BC=B9?= =?UTF-8?q?=E7=AA=97=E7=B2=89=E4=B8=9D=E7=89=8C=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E6=88=91=E7=9A=84=E7=AD=89=E7=BA=A7=E9=A1=B5=E9=9D=A2=E8=BE=B9?= =?UTF-8?q?=E8=B7=9D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../live/adapter/UserMoreInfoAdapter.java | 9 +++- .../main/res/layout/item_user_more_info.xml | 51 ++++++++++--------- .../main/activity/ZhuangBanActivity.java | 10 +++- .../yunbao/main/views/MainMeViewHolder.java | 3 +- 4 files changed, 43 insertions(+), 30 deletions(-) diff --git a/live/src/main/java/com/yunbao/live/adapter/UserMoreInfoAdapter.java b/live/src/main/java/com/yunbao/live/adapter/UserMoreInfoAdapter.java index e0b750606..933a78efb 100644 --- a/live/src/main/java/com/yunbao/live/adapter/UserMoreInfoAdapter.java +++ b/live/src/main/java/com/yunbao/live/adapter/UserMoreInfoAdapter.java @@ -25,6 +25,7 @@ import com.yunbao.common.CommonAppConfig; import com.yunbao.common.Constants; import com.yunbao.common.adapter.RefreshAdapter; import com.yunbao.common.bean.LevelBean; +import com.yunbao.common.bean.LiveUserGiftBean; import com.yunbao.common.bean.LiveUserRankBean; import com.yunbao.common.bean.UserBean; import com.yunbao.common.glide.ImgLoader; @@ -35,7 +36,6 @@ import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.views.weight.ClipPathCircleImage; import com.yunbao.live.R; import com.yunbao.live.activity.LiveActivity; -import com.yunbao.common.bean.LiveUserGiftBean; import com.yunbao.live.dialog.LiveUserMoreDialogFragment; import com.yunbao.live.utils.LiveTextRender; @@ -175,7 +175,7 @@ public class UserMoreInfoAdapter extends RefreshAdapter { if (guardType == Constants.GUARD_TYPE_DAY) { mIcon.setImageDrawable(mGuardDrawable0); } else if (guardType == Constants.GUARD_TYPE_MONTH) { - // mIcon.setImageDrawable(mGuardDrawable1); //观众列表不显示粉丝牌 + // mIcon.setImageDrawable(mGuardDrawable1); //观众列表不显示粉丝牌 } else if (guardType == Constants.GUARD_TYPE_YEAR) { mIcon.setImageDrawable(mGuardDrawable2); } @@ -206,8 +206,13 @@ public class UserMoreInfoAdapter extends RefreshAdapter { ImgLoader.displayDrawable(mContext, bean.getFans_pic(), new ImgLoader.DrawableCallback() { @Override public void onLoadSuccess(Drawable drawable) { + RelativeLayout.LayoutParams ivLayoutParams = (RelativeLayout.LayoutParams) ivIcon.getLayoutParams(); + ivLayoutParams.height = DpUtil.dp2px(40); + ivLayoutParams.width = DpUtil.dp2px(70); + ivIcon.setLayoutParams(ivLayoutParams); ivIcon.setImageDrawable(drawable); tvName.setText(bean.getMedal_name()); + tvName.setTextSize(9); } @Override diff --git a/live/src/main/res/layout/item_user_more_info.xml b/live/src/main/res/layout/item_user_more_info.xml index 818097dba..e66ba2f1c 100644 --- a/live/src/main/res/layout/item_user_more_info.xml +++ b/live/src/main/res/layout/item_user_more_info.xml @@ -127,8 +127,8 @@ android:id="@+id/level" android:layout_width="42dp" android:layout_height="wrap_content" - android:scaleType="fitXY" - android:layout_marginLeft="5dp" /> + android:layout_marginLeft="5dp" + android:scaleType="fitXY" /> @@ -155,34 +155,35 @@ android:layout_marginRight="35dp"> - - - - - - + android:layout_marginEnd="25dp"> + + + + + + diff --git a/main/src/main/java/com/yunbao/main/activity/ZhuangBanActivity.java b/main/src/main/java/com/yunbao/main/activity/ZhuangBanActivity.java index 8cebe26f2..d91d3f819 100644 --- a/main/src/main/java/com/yunbao/main/activity/ZhuangBanActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/ZhuangBanActivity.java @@ -23,6 +23,7 @@ import android.widget.LinearLayout; import android.widget.ProgressBar; import androidx.annotation.RequiresApi; + import com.alibaba.android.arouter.facade.annotation.Route; import com.opensource.svgaplayer.SVGACallback; import com.opensource.svgaplayer.SVGADrawable; @@ -269,12 +270,17 @@ public class ZhuangBanActivity extends AbsActivity { public static void forward(Context context, String url, boolean addArgs) { if (addArgs) { - url += "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken(); + if (url.contains("?")) { + url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken(); + } else { + url += "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken(); + } + } Intent intent = new Intent(context, ZhuangBanActivity.class); Log.i("tag1212", url); intent.putExtra(Constants.URL, url); - if (url.contains("Noble/index.html")) { + if (url.contains("Noble/index.html") || url.contains("Grade/index.html")) { intent.putExtra("title", ""); } context.startActivity(intent); diff --git a/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java index ecf43084b..ef3083fba 100644 --- a/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java @@ -443,7 +443,8 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi WebViewActivity.forward(mContext, url); } else if(bean.getId() == 3) {//我的等级 Constants.myIntoIndex=2; - WebViewActivity.forward(mContext, url); + Constants.isTitle = false; + ZhuangBanActivity.forward(mContext, url); }else{ WebViewActivity.forward(mContext, url); }