diff --git a/common/src/main/res/layout/dialog_live_interaction.xml b/common/src/main/res/layout/dialog_live_interaction.xml
index b5711499a..9ab43f338 100644
--- a/common/src/main/res/layout/dialog_live_interaction.xml
+++ b/common/src/main/res/layout/dialog_live_interaction.xml
@@ -270,7 +270,7 @@
+ android:src="@mipmap/icon_interaction_beauty" />
{
} else {
mRanksIcon.addView(rankImage, 0);
}
+ }else if(type.equals("6")){
+ L.e("type==6");
}
if (bean.getDress() != null && bean.getDress().getAvatar_frame() != null) {
diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveInteractionDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveInteractionDialogFragment.java
index 0e609ddb9..3810f3063 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveInteractionDialogFragment.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveInteractionDialogFragment.java
@@ -130,10 +130,10 @@ public class LiveInteractionDialogFragment extends AbsDialogFragment implements
findViewById(R.id.live_tool_game).setOnClickListener(this);
if (leave == 0) {
- ((ImageView) mLeaveView.findViewById(R.id.live_tool_leave_img)).setImageResource(R.mipmap.icon_leave);
+ ((ImageView) mLeaveView.findViewById(R.id.live_tool_leave_img)).setImageResource(R.mipmap.icon_interaction_leave);
((TextView) mLeaveView.findViewById(R.id.live_tool_leave_text)).setText(mContext.getString(R.string.live_zslk));
} else {
- ((ImageView) mLeaveView.findViewById(R.id.live_tool_leave_img)).setImageResource(R.mipmap.icon_leave_p);
+ ((ImageView) mLeaveView.findViewById(R.id.live_tool_leave_img)).setImageResource(R.mipmap.icon_interaction_leave_p);
((TextView) mLeaveView.findViewById(R.id.live_tool_leave_text)).setText(mContext.getString(R.string.live_zslk1));
}
mLiveRoomHandler = new LiveRoomHandler();
diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveUserMoreDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveUserMoreDialogFragment.java
index cc589f42e..2f3294c59 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveUserMoreDialogFragment.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveUserMoreDialogFragment.java
@@ -61,7 +61,7 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie
private LiveGuardInfo mLiveGuardInfo;
public eightbitlab.com.blurview.BlurView blurView;
- public TextView audience_btn, guard_btn, fans_btn, tags, btn, gz_view, dayRank, weekRank, title;
+ public TextView audience_btn,guard_btn, fans_btn, tags, btn, gz_view, dayRank, weekRank, title;
private LinearLayout tabs;
private ConstraintLayout noMoreLayout;
private TextView noMoreText;
@@ -155,6 +155,7 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie
audience_btn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
+ noble = false;
Tips = "1";
Up();
type = "guanzhong";
@@ -198,7 +199,17 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie
type = "weekRank";
mRefreshView.initData();
});
-
+ gz_view.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ noble = true;
+ Tips = "1";
+ Up();
+ userMoreInfoAdapter.setNoble(true);
+ type = "guanzhong";
+ mRefreshView.initData();
+ }
+ });
mRefreshView = mRootView.findViewById(R.id.refreshView);
view_no = mRootView.findViewById(R.id.view_no);
userMoreInfoAdapter = new UserMoreInfoAdapter(mContext, LiveUserMoreDialogFragment.this);
@@ -237,7 +248,6 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie
mRefreshView.setVisibility(View.GONE);
}
}
-
}
@Override
@@ -335,18 +345,13 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie
});
mRefreshView.initData();
if (noble) {
- tabs.setVisibility(View.GONE);
- title.setVisibility(View.VISIBLE);
- title.setText(R.string.noble);
userMoreInfoAdapter.setNoble(true);
- } else {
+ } else {
if (isOnly) {
tabs.setVisibility(View.GONE);
title.setVisibility(View.GONE);
}
}
-
-
}
@Override
@@ -372,20 +377,25 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie
noMoreText.setVisibility(View.GONE);
LinearLayout.LayoutParams params = (LinearLayout.LayoutParams) mRefreshView.getLayoutParams();
params.bottomMargin = DpUtil.dp2px(65);
- if (Tips.equals("1")) {
+ if(noble){
tags.setText(R.string.enjoy_a_lot);
btn.setBackgroundResource(R.mipmap.btn_openvip);
btn.setText(R.string.live_ktgz);
- setTextColor(audience_btn, guard_btn, fans_btn, weekRank, dayRank);
- gz_view.setVisibility(View.GONE);
+ setTextColor(gz_view,audience_btn, guard_btn, fans_btn, weekRank, dayRank);
+ userMoreInfoAdapter.type = "1";
+ type = "guanzhong";
+ }else if (Tips.equals("1")) {
+ tags.setText(R.string.enjoy_a_lot);
+ btn.setBackgroundResource(R.mipmap.btn_openvip);
+ btn.setText(R.string.live_ktgz);
+ setTextColor(audience_btn, guard_btn, fans_btn, weekRank, dayRank,gz_view);
userMoreInfoAdapter.type = "1";
type = "guanzhong";
} else if (Tips.equals("2")) {
tags.setText(R.string.guard_for_your);
btn.setBackgroundResource(R.mipmap.btn_openprotection);
btn.setText(R.string.daemon_list);
- setTextColor(guard_btn, audience_btn, fans_btn, dayRank, weekRank);
- gz_view.setVisibility(View.GONE);
+ setTextColor(guard_btn, audience_btn, fans_btn, dayRank, weekRank,gz_view);
userMoreInfoAdapter.type = "2";
no_more.setImageResource(R.mipmap.ic_guard_not);
noMoreText.setText(R.string.waiting_for_you);
@@ -395,8 +405,7 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie
tags.setText(R.string.favorite_host_fan);
btn.setText(R.string.Join_a_fan_club);
btn.setBackgroundResource(R.mipmap.btn_joinfans);
- setTextColor(fans_btn, audience_btn, guard_btn, dayRank, weekRank);
- gz_view.setVisibility(View.GONE);
+ setTextColor(fans_btn, audience_btn, guard_btn, dayRank, weekRank,gz_view);
userMoreInfoAdapter.type = "3";
type = "fans";
no_more.setImageResource(R.mipmap.bixin);
@@ -406,7 +415,6 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie
bottom_msg.setVisibility(View.GONE);
type = "dayRank";
setTextColor(dayRank, audience_btn, guard_btn, fans_btn, gz_view, weekRank);
- gz_view.setVisibility(View.GONE);
no_more.setImageResource(R.drawable.img_rank_empty);
noMoreText.setText(R.string.no_more_day_rank);
noMoreText.setVisibility(View.VISIBLE);
@@ -415,7 +423,6 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie
userMoreInfoAdapter.type = "5";
bottom_msg.setVisibility(View.GONE);
type = "weekRank";
- gz_view.setVisibility(View.GONE);
no_more.setImageResource(R.drawable.img_rank_empty);
noMoreText.setText(R.string.no_more_day_rank);
setTextColor(weekRank, audience_btn, guard_btn, fans_btn, gz_view, dayRank);
diff --git a/live/src/main/res/drawable/bg_live_push_time.xml b/live/src/main/res/drawable/bg_live_push_time.xml
index 0147b988e..4fda455a2 100644
--- a/live/src/main/res/drawable/bg_live_push_time.xml
+++ b/live/src/main/res/drawable/bg_live_push_time.xml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/live/src/main/res/layout/dialog_user_more_list.xml b/live/src/main/res/layout/dialog_user_more_list.xml
index 1b39eafbf..ed4733010 100644
--- a/live/src/main/res/layout/dialog_user_more_list.xml
+++ b/live/src/main/res/layout/dialog_user_more_list.xml
@@ -42,7 +42,7 @@
android:layout_weight="1"
android:gravity="center"
android:text="@string/day_rank"
- android:textColor="#fff6f7fb"
+ android:textColor="#ff646464"
android:textSize="16sp" />
+
+
-
-
-
+
+ android:layout_width="match_parent"
+ android:orientation="vertical"
+ android:gravity="bottom"
+ android:layout_height="match_parent">
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:layout_height="40dp"
+ android:background="@mipmap/btn_big_blue"
+ android:gravity="center"
+ android:orientation="vertical">
-
-
-
-
-
-
+ android:layout_height="wrap_content"
+ android:text="@string/start_pk"
+ android:textColor="#ffffffff"
+ android:textSize="12sp" />
+ android:id="@+id/btn_dr_pk_nub"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/number_of_remaining_times"
+ android:textColor="#ffe1e1e1"
+ android:textSize="8sp" />
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file