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

合并2

Browse Source
This commit is contained in:
骆召亮
2025-11-12 16:42:51 +08:00
parent 8013268816
commit d80222afef
64 changed files with 1561 additions and 789 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
MainModule/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java
View File

@@ -6,6 +6,7 @@ import static android.view.View.VISIBLE;
import android.annotation.SuppressLint;
import android.content.Context;
import android.content.Intent;
import android.graphics.Color;
import android.os.Bundle;
import androidx.annotation.NonNull;
@@ -376,9 +377,12 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
@Override
public void getRoomUserInfo(UserInfo userInfo1) {
this.userInfo = userInfo1;
mBinding.ivAvatar.setData(userInfo.getAvatar(), "", userInfo.getSex() + "");
mBinding.ivAvatar.setData(userInfo.getAvatar(), "", userInfo.getNobility_image() + "");
String sex = userInfo.getSex()==1?"男":"女";
mBinding.tvId.setText(sex+" | ID:"+userInfo.getUser_code());
mBinding.tvName.setText(userInfo.getNickname());
mBinding.tvId.setText("ID:" + userInfo.getUser_code());
mBinding.tvName.setTextColor( (userInfo.getNickname_color()!=null && !userInfo.getNickname_color().equals(""))? Color.parseColor(userInfo.getNickname_color()):Color.parseColor("#333333"));
// mBinding.tvId.setText("ID:" + userInfo.getUser_code());
if (userInfo.getIs_in_pit() == 1) {
mBinding.roomMCz.setText("下麦");
} else {

10
MainModule/src/main/java/com/xscm/modulemain/dialog/SoundEffectsDialogFragment.java
View File

@@ -120,15 +120,15 @@ public class SoundEffectsDialogFragment extends BaseMvpDialogFragment<WheatPrese
mBinding.tvSure.setOnClickListener(v -> {
if (selectedPosition != -1){
if (selectedPosition == 0){
AgoraManager.getInstance(getActivity()).potexao(new File(getSavePath() + "xs.mp3").getPath());
AgoraManager.getInstance().potexao(new File(getSavePath() + "xs.mp3").getPath());
}else if (selectedPosition == 1){
AgoraManager.getInstance(getActivity()).potexao(new File(getSavePath() + "hh.mp3").getPath());
AgoraManager.getInstance().potexao(new File(getSavePath() + "hh.mp3").getPath());
}else if (selectedPosition == 2){
AgoraManager.getInstance(getActivity()).potexao(new File(getSavePath() + "gg.mp3").getPath());
AgoraManager.getInstance().potexao(new File(getSavePath() + "gg.mp3").getPath());
}else if (selectedPosition == 3){
AgoraManager.getInstance(getActivity()).potexao(new File(getSavePath() + "zs.mp3").getPath());
AgoraManager.getInstance().potexao(new File(getSavePath() + "zs.mp3").getPath());
}else if (selectedPosition == 4){
AgoraManager.getInstance(getActivity()).potexao(new File(getSavePath() + "mmd.mp3").getPath());
AgoraManager.getInstance().potexao(new File(getSavePath() + "mmd.mp3").getPath());
}
}

14
MainModule/src/main/java/com/xscm/modulemain/dialog/TunerDialogFragment.java
View File

@@ -105,7 +105,7 @@ public class TunerDialogFragment extends BaseMvpDialogFragment<WheatPresenter, R
mBinding.swMonitoring.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
AgoraManager.getInstance(getContext()).enableHeadphoneMonitor(b);
AgoraManager.getInstance().enableHeadphoneMonitor(b);
//耳返设置完保存本地
SpUtil.setAuricularBack(b ? 1 : 0);
}
@@ -135,7 +135,7 @@ public class TunerDialogFragment extends BaseMvpDialogFragment<WheatPresenter, R
int percentage = (int) ((progress / 200.0) * 100);
mBinding.tvSeekbarValue.setText("人声" + percentage + "%");
SpUtil.setMusicVolume(progress); // 保存原始值(0-200)
AgoraManager.getInstance(getContext()).setMusicVolume(progress); // 使用原始值(0-200)
AgoraManager.getInstance().setMusicVolume(progress); // 使用原始值(0-200)
// 保存当前用户的音量设置
volumeManager.saveCurrentVolumes(
mBinding.seekBar1.getProgress(),
@@ -167,7 +167,7 @@ public class TunerDialogFragment extends BaseMvpDialogFragment<WheatPresenter, R
public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
mBinding.tvSeekbarValue2.setText("伴奏" + progress + "%");
SpUtil.settPlayoutVolume(progress);
AgoraManager.getInstance(getContext()).setPlayoutVolume(progress);
AgoraManager.getInstance().setPlayoutVolume(progress);
// 保存当前用户的音量设置
volumeManager.saveCurrentVolumes(
mBinding.seekBar1.getProgress(),
@@ -204,7 +204,7 @@ public class TunerDialogFragment extends BaseMvpDialogFragment<WheatPresenter, R
MixerResp item = tunerAdapter.getItem(position);
// MvpPre.setUserMixer(roomId, item.getId());
// RtcManager.getInstance().setTone(item.getId());
AgoraManager.getInstance(mContext).setTone(item.getId());
AgoraManager.getInstance().setTone(item.getId());
}
});
@@ -225,7 +225,7 @@ public class TunerDialogFragment extends BaseMvpDialogFragment<WheatPresenter, R
// 执行选中项的操作
MixerResp item = tunerAdapter2.getItem(position);
AgoraManager.getInstance(mContext).setTone(item.getId());
AgoraManager.getInstance().setTone(item.getId());
// MvpPre.setUserMixer(roomId, item.getId());
// RtcManager.getInstance().setTone(item.getId());
}
@@ -245,12 +245,12 @@ public class TunerDialogFragment extends BaseMvpDialogFragment<WheatPresenter, R
mBinding.seekBar1.setMax(200);
mBinding.seekBar1.setProgress(musicVolume);
mBinding.tvSeekbarValue.setText("人声" + musicPercentage + "%");
AgoraManager.getInstance(getContext()).setMusicVolume(musicVolume); // 使用原始值(0-200)
AgoraManager.getInstance().setMusicVolume(musicVolume); // 使用原始值(0-200)
// 更新伴奏音量
mBinding.seekBar2.setProgress(playoutVolume);
// int playoutPercentage = (int) ((playoutVolume / 200.0) * 100);
mBinding.tvSeekbarValue2.setText("伴奏" + playoutVolume + "%");
AgoraManager.getInstance(getContext()).setPlayoutVolume(playoutVolume);
AgoraManager.getInstance().setPlayoutVolume(playoutVolume);
}
@Override