在线用户弹窗粉丝牌修改，我的等级页面边距修改

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<UserBean> {
                         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<UserBean> {
                 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

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" />
 
                 </LinearLayout>
             </LinearLayout>
@@ -155,34 +155,35 @@
                     android:layout_marginRight="35dp">
 
 
-
-
-
                 </FrameLayout>
 
-                <ImageView
+                <RelativeLayout
-                    android:id="@+id/ivIcon"
-                    android:layout_alignParentRight="true"
-                    android:layout_width="60dp"
-                    android:layout_height="30dp"
-                    android:paddingLeft="13dp"
-                    android:layout_marginTop="25dp"
-                    android:layout_marginEnd="20dp"
-                    android:layout_marginBottom="26dp"
-                    android:layout_gravity="center" />
-
-                <TextView
-                    android:id="@+id/tvName"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
-                    android:layout_gravity="center"
+                    android:layout_marginEnd="25dp">
-                    android:layout_marginTop="25dp"
+
-                    android:layout_marginEnd="25dp"
+                    <ImageView
-                    android:paddingLeft="13dp"
+                        android:id="@+id/ivIcon"
-                    android:text="主播"
+                        android:layout_width="60dp"
-                    android:textColor="@color/white"
+                        android:layout_height="40dp"
-                    android:textSize="10sp" />
+                        android:layout_alignParentEnd="true"
+                        android:layout_gravity="center"
+                        android:paddingLeft="13dp" />
+
+                    <TextView
+                        android:id="@+id/tvName"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:text="主播"
+                        android:layout_alignParentEnd="true"
+                        android:layout_marginEnd="8dp"
+                        android:layout_centerVertical="true"
+                        android:textColor="@color/white"
+                        android:textSize="10sp" />
+                </RelativeLayout>
+
 
             </RelativeLayout>
 

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);

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);
                 }