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

1：修改排行榜展示心动榜

Browse Source
This commit is contained in:
梁小江
2025-12-06 15:00:14 +08:00
parent e4122ef8e6
commit c44ae5bc48
6 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
BaseModule/src/main/java/com/xscm/moduleutil/rtc/AgoraManager.java
View File

@@ -718,6 +718,7 @@ public class AgoraManager {
};
}
public void potexao(String page) {
ClientRole(true);
rtcEngine.playEffect(1, page, 0, 1, 0, 100, true);
}

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

@@ -78,7 +78,7 @@
<string name="wealth_rank">财富榜</string>
<string name="charm_rank">魅力榜</string>
<string name="guild_rank">公会榜</string>
<string name="true_love_rank">真爱榜</string>
<string name="true_love_rank">心动榜</string>
<string name="avatar_change_info">尊敬的用户，每月可修改2次，剩余<font color="#FF0000">%1$d</font>次；使用头像卡不限更换次数，还剩<font color="#FF0000">%2$d</font>张</string>
<string name="nickname">昵称</string>

1
MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt
View File

@@ -263,7 +263,6 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
taskId = intent.getStringExtra("taskId")
}
@SuppressLint("MissingSuperCall")
override fun onNewIntent(intent: Intent) {
super.onNewIntent(intent)

14
MainModule/src/main/java/com/xscm/modulemain/adapter/PlaceholderFragment.java
View File

@@ -146,6 +146,7 @@ public class PlaceholderFragment extends BaseMvpFragment<PlaceholderPresenter,
rlMy.setVisibility(View.VISIBLE);
rlMyCp.setVisibility(View.GONE);
setVisdisplay( true);
mBinding.llTitle.setVisibility(View.VISIBLE);
} else if (index == 1) {
// r11.setVisibility(View.VISIBLE);
// r12.setVisibility(View.GONE);
@@ -156,6 +157,7 @@ public class PlaceholderFragment extends BaseMvpFragment<PlaceholderPresenter,
rlMy.setVisibility(View.VISIBLE);
rlMyCp.setVisibility(View.GONE);
setVisdisplay( true);
mBinding.llTitle.setVisibility(View.VISIBLE);
// slMy.setShadowColor(Color.parseColor("#70F7B500"));
} else if (index == 2) {
// r11.setVisibility(View.VISIBLE);
@@ -167,6 +169,7 @@ public class PlaceholderFragment extends BaseMvpFragment<PlaceholderPresenter,
rlMy.setVisibility(View.VISIBLE);
rlMyCp.setVisibility(View.GONE);
setVisdisplay( true);
mBinding.llTitle.setVisibility(View.VISIBLE);
// slMy.setShadowColor(Color.parseColor("#7AFE969D"));
}else if (index == 3){
// r11.setVisibility(View.GONE);
@@ -178,6 +181,7 @@ public class PlaceholderFragment extends BaseMvpFragment<PlaceholderPresenter,
rlMy.setVisibility(View.GONE);
rlMyCp.setVisibility(View.VISIBLE);
setVisdisplay(false);
mBinding.llTitle.setVisibility(View.GONE);
}
// else if (index == 3) {
@@ -452,7 +456,7 @@ public class PlaceholderFragment extends BaseMvpFragment<PlaceholderPresenter,
ImageUtils.loadHeadCC(data.getUser_avatar1(), ivOneCp2Hhead);
tvUsername1.setText(data.getNickname());
tvId1.setText(data.getNickname1());
tv_cp_xing1.setText(StringUtil.toWan2(data.getTotal(),1));
tv_cp_xing1.setText("Lv "+StringUtil.toWan2(data.getTotal(),1));
tv_cp_name1.setText(data.getNickname());
tv_cp_name2.setText(data.getNickname1());
@@ -511,11 +515,11 @@ public class PlaceholderFragment extends BaseMvpFragment<PlaceholderPresenter,
// tvId2.setText(data.getGuild_special_id() != null ? "ID:" + data.getGuild_special_id() : "");
// }
else {
ImageUtils.loadHeadCC(data.getUser_avatar1(), ivOneCp1Hhead);
ImageUtils.loadHeadCC(data.getUser_avatar(), ivOneCp1Hhead);
ImageUtils.loadHeadCC(data.getUser_avatar1(), ivOneCp2Hhead);
tvUsername2.setText(data.getNickname());
tvId2.setText(data.getNickname1());
tv_cp_xing1.setText(StringUtil.toWan2(data.getTotal(),1));
tv_cp_xing1.setText("Lv "+StringUtil.toWan2(data.getTotal(),1));
tv_cp_name1.setText(data.getNickname());
tv_cp_name2.setText(data.getNickname1());
}
@@ -575,10 +579,10 @@ public class PlaceholderFragment extends BaseMvpFragment<PlaceholderPresenter,
// }
else {
ImageUtils.loadHeadCC(data.getUser_avatar(), ivOneCp1Hhead);
ImageUtils.loadHeadCC(data.getUser_avatar(), ivOneCp2Hhead);
ImageUtils.loadHeadCC(data.getUser_avatar1(), ivOneCp2Hhead);
tvUsername3.setText(data.getNickname());
tvId3.setText(data.getNickname1());
tv_cp_xing1.setText(StringUtil.toWan2(data.getTotal(),1));
tv_cp_xing1.setText("Lv "+StringUtil.toWan2(data.getTotal(),1));
tv_cp_name1.setText(data.getNickname());
tv_cp_name2.setText(data.getNickname1());
}

7
MainModule/src/main/res/layout/fragment_ranking_list.xml
View File

@@ -23,6 +23,7 @@
app:layout_constraintTop_toTopOf="parent" />
<LinearLayout
android:id="@+id/ll_title"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginTop="@dimen/dp_35"
@@ -44,7 +45,7 @@
android:gravity="center"
android:background="@mipmap/text_ranking_sele"
android:text="日榜"
android:textColor="@color/black"
android:textColor="@color/white"
android:textStyle="bold"
android:textSize="@dimen/sp_13" />
@@ -59,7 +60,7 @@
android:layout_marginEnd="@dimen/dp_20"
android:text="周榜"
android:textStyle="bold"
android:textColor="@color/black"
android:textColor="@color/white"
android:textSize="@dimen/sp_13" />
<TextView
@@ -73,7 +74,7 @@
android:gravity="center"
android:text="月榜"
android:textStyle="bold"
android:textColor="@color/black"
android:textColor="@color/white"
android:textSize="@dimen/sp_13" />
</LinearLayout>

2
MainModule/src/main/res/layout/fragment_room_ktv.xml
View File

@@ -355,7 +355,7 @@
android:layout_width="@dimen/dp_58"
android:layout_height="0dp"
android:paddingEnd="@dimen/dp_5"
android:layout_marginBottom="-100dp"
android:nestedScrollingEnabled="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/cl_bj"
app:layout_constraintTop_toBottomOf="@+id/mu_jb"