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

fix bugs.

Browse Source
This commit is contained in:
骆召亮
2025-11-18 18:28:16 +08:00
parent 3322cfeb22
commit 18bd2d3ba0
44 changed files with 400 additions and 517 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BaseModule/src/main/java/com/xscm/moduleutil/adapter/GiftTwoAdapter.java
View File

@@ -158,10 +158,10 @@ public class GiftTwoAdapter extends BaseAdapter {
viewHolder.ivDownOn.setVisibility(View.GONE);
viewHolder.cl_iv_down_on.setBackgroundResource(0);
}
if (giftModel.getNum()==0){
if (giftModel.getNum().isEmpty()){
viewHolder.tv_gift_num.setVisibility(View.GONE);
}
viewHolder.tv_gift_num.setText(String.format("x%s", (giftModel.getNum()!=0?giftModel.getNum():"")));
viewHolder.tv_gift_num.setText(String.format("x%s", giftModel.getNum()));
//设置

4
BaseModule/src/main/java/com/xscm/moduleutil/adapter/GiftTwoDetailsFragment.java
View File

@@ -293,7 +293,7 @@ public class GiftTwoDetailsFragment extends BaseMvpFragment<RewardGiftPresenter,
roonGiftModel.setGift_name(giftModel.getGift_name());
roonGiftModel.setGift_price(giftModel.getGift_price());
roonGiftModel.setBase_image(giftModel.getBase_image());
roonGiftModel.setNum(Integer.parseInt(giftModel.getNum()));
roonGiftModel.setNum(giftModel.getNum());
if (giftModel.getGift_id().equals(id)) {
if (!giftModel.isChecked()) {
EventBus.getDefault().post(new GiftUserRefreshEvent(true, event.type, roonGiftModel));
@@ -316,7 +316,7 @@ public class GiftTwoDetailsFragment extends BaseMvpFragment<RewardGiftPresenter,
roonGiftModel.setGift_name(giftModel.getGift_name());
roonGiftModel.setGift_price(giftModel.getGift_price());
roonGiftModel.setBase_image(giftModel.getBase_image());
roonGiftModel.setNum(Integer.parseInt(giftModel.getNum()));
roonGiftModel.setNum(giftModel.getNum());
if (giftModel.getGift_id().equals(id)) {
selGift = giftModel;
if (!giftModel.isChecked()) {

45
BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java
View File

@@ -32,12 +32,15 @@ import com.blankj.utilcode.util.LogUtils;
import com.blankj.utilcode.util.ProcessUtils;
import com.lahm.library.EasyProtectorLib;
import com.lahm.library.EmulatorCheckCallback;
import com.tencent.bugly.crashreport.CrashReport;
import com.tencent.imsdk.v2.V2TIMAdvancedMsgListener;
import com.tencent.imsdk.v2.V2TIMManager;
import com.tencent.imsdk.v2.V2TIMMessage;
import com.tencent.imsdk.v2.V2TIMMessageManager;
import com.tencent.imsdk.v2.V2TIMMessageReceipt;
import com.tencent.imsdk.v2.V2TIMValueCallback;
import com.tencent.qcloud.tuicore.TUILogin;
import com.tencent.qcloud.tuicore.interfaces.TUICallback;
import com.xscm.moduleutil.bean.UserBean;
import com.xscm.moduleutil.bean.UserInfo;
import com.xscm.moduleutil.event.AppLifecycleEvent;
@@ -52,20 +55,8 @@ import com.xscm.moduleutil.utils.CrashHandler;
import com.xscm.moduleutil.utils.SpUtil;
import com.xscm.moduleutil.utils.UtilConfig;
import com.xscm.moduleutil.utils.config.EnvironmentEnum;
import com.xscm.moduleutil.utils.config.EnvironmentPrefs;
import com.xscm.moduleutil.utils.cos.CosUploadManager;
import com.xscm.moduleutil.widget.CommonAppConfig;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.scwang.smartrefresh.layout.api.DefaultRefreshFooterCreator;
import com.scwang.smartrefresh.layout.api.DefaultRefreshHeaderCreator;
import com.scwang.smartrefresh.layout.api.RefreshFooter;
import com.scwang.smartrefresh.layout.api.RefreshHeader;
import com.scwang.smartrefresh.layout.api.RefreshLayout;
import com.scwang.smartrefresh.layout.footer.ClassicsFooter;
import com.scwang.smartrefresh.layout.header.ClassicsHeader;
import com.tencent.bugly.crashreport.CrashReport;
import com.tencent.qcloud.tuicore.TUILogin;
import com.tencent.qcloud.tuicore.interfaces.TUICallback;
import org.eclipse.paho.client.mqttv3.MqttClient;
import org.greenrobot.eventbus.EventBus;
@@ -92,7 +83,7 @@ public class CommonAppContext extends MultiDexApplication implements Applicatio
private boolean mFront;//是否前台
public String emulator = "0";
@Getter
private EnvironmentEnum currentEnvironment;
public EnvironmentEnum currentEnvironment;
public UserBean mUserBean;
public boolean isShow;
@@ -147,21 +138,34 @@ public class CommonAppContext extends MultiDexApplication implements Applicatio
super.onCreate();
sInstance = this;
sMainThreadHandler = new Handler();
EnvironmentPrefs prefs = new EnvironmentPrefs(this);
// 添加内存优化配置
optimizeMemorySettings();
currentEnvironment = prefs.getSelectedEnvironment();
initialization();
// EnvironmentPrefs prefs = new EnvironmentPrefs(this);
// currentEnvironment = prefs.getSelectedEnvironment();
registerActivityLifecycleCallbacks(this);
appStateListener = AppStateManager.getInstance();
startListeningUnreadMessageCount();
// 全局设置字体不缩放
adjustFontScale(getResources().getConfiguration());
CrashHandler.init(this);
if (SpUtil.getShelf()!=0) {
SpUtil.setShelf(1);
}
//设置mqtt环境 false 测试环境 true 正式环境
// ExternalResConstants.INSTANCE.setIS_MQTT_RELEASE(false);
//设置http环境 false 测试环境 true 正式环境
ExternalResConstants.INSTANCE.setIS_HTTP_RELEASE(true);
currentEnvironment = ExternalResConstants.INSTANCE.HTTP_PATH();
initialization();
}
public void adjustFontScale(Configuration configuration) {
@@ -446,7 +450,7 @@ public class CommonAppContext extends MultiDexApplication implements Applicatio
// startService(mqttServiceIntent);
// }
mqttConnect=MqttConnect.getInstance(this,"tcp://1.13.181.248","android-"+ MqttClient.generateClientId());
mqttConnect=MqttConnect.getInstance(this, currentEnvironment.getMqttUrl(),"android-"+ MqttClient.generateClientId());
// mqttConnect=MqttConnect.getInstance(this,"tcp://1.13.101.98","android-"+ MqttClient.generateClientId());
mqttConnect.mqttClient();
@@ -455,11 +459,8 @@ public class CommonAppContext extends MultiDexApplication implements Applicatio
startInitSdk();
// 初始化（通常在Application或Activity的onCreate中）
CosUploadManager.getInstance(CommonAppContext.getInstance());
// 启动IM连接服务
// IMServiceManager.getInstance().startIMService(this);
}
}
// piaoPingManager = PiaoPingManager.getInstance(this);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
if (!Settings.canDrawOverlays(this)) {
@@ -525,8 +526,8 @@ public class CommonAppContext extends MultiDexApplication implements Applicatio
}
public void upMqtt(){
if (mqttConnect==null){
mqttConnect=MqttConnect.getInstance(this,"tcp://1.13.181.248","android-"+ MqttClient.generateClientId());
if (mqttConnect == null){
mqttConnect=MqttConnect.getInstance(this, currentEnvironment.getMqttUrl(),"android-"+ MqttClient.generateClientId());
// mqttConnect=MqttConnect.getInstance(this,"tcp://1.13.101.98","android-"+ MqttClient.generateClientId());
mqttConnect.mqttClient();
}

31
BaseModule/src/main/java/com/xscm/moduleutil/base/ExternalResConstants.kt Normal file
View File

@@ -0,0 +1,31 @@
package com.xscm.moduleutil.base
import com.xscm.moduleutil.utils.config.EnvironmentEnum
object ExternalResConstants {
//================================================================================MQTT======================================================================================
// var IS_MQTT_RELEASE = true
// val MQTT_PATH_DEBUG = "tcp://1.13.181.248"
// val MQTT_PATH_RELEASE = "tcp://1.13.101.98"
//
// fun MQTT_PATH(): String {
// return if (IS_MQTT_RELEASE) {
// MQTT_PATH_RELEASE
// } else {
// MQTT_PATH_DEBUG
// }
// }
//================================================================================HTTP======================================================================================
var IS_HTTP_RELEASE = true
val HTTP_PATH_DEBUG:EnvironmentEnum = EnvironmentEnum.TEST
val HTTP_PATH_RELEASE:EnvironmentEnum = EnvironmentEnum.PRODUCTION
fun HTTP_PATH(): EnvironmentEnum {
return if (IS_HTTP_RELEASE) {
HTTP_PATH_RELEASE
} else {
HTTP_PATH_DEBUG
}
}
//================================================================================END======================================================================================
}

37
BaseModule/src/main/java/com/xscm/moduleutil/base/WebUrlConstants.kt Normal file
View File

@@ -0,0 +1,37 @@
package com.xscm.moduleutil.base
/**
* Created by xscm on 2020/7/23.
* 描述：web url 常量
*/
object WebUrlConstants {
val BASE_URL = CommonAppContext.getInstance().currentEnvironment.h5Url
/**青少年模式*/
val WEB_ADOLESCENT_URL = BASE_URL + "/web/index.html#/pages/feedback/teenage?id=%s"
val WEB_SET_GROUP_URL = BASE_URL + "/web/index.html#/pages/union/setGroup?id=%s&guildId=%s"
/**举报*/
val WEB_REPORT_URL =
BASE_URL + "/web/index.html#/pages/feedback/report?id=%s&fromType=%d&fromId=%s"
/**规则*/
val WEB_RULES_URL = BASE_URL + "/web/index.html#/pages/other/taskDesc"
/**道具商城*/
val WEB_PROP_MALL_URL = BASE_URL + "/web/index.html#/pages/prop/propMall?id=%s"
/**公会*/
val WEB_GUILD_URL = BASE_URL + "/web/index.html#/pages/union/index?id=%s"
/**等级*/
val WEB_GRADE_URL = BASE_URL + "/web/index.html#/pages/other/grade?id=%s"
/**反馈*/
val WEB_HELP_URL = BASE_URL + "/web/index.html#/pages/feedback/help?id=%s"
/**邀请*/
val WEB_INVITATION_URL = BASE_URL + "/web/index.html#/pages/other/income?id=%s"
}

2
BaseModule/src/main/java/com/xscm/moduleutil/bean/RoonGiftModel.java
View File

@@ -30,7 +30,7 @@ public class RoonGiftModel {
private boolean isChecked;
private boolean isSelected;
private boolean can_send_self;//是否能送自己
private int num;//礼物数量
private String num = "";//礼物数量
private int activities_id;//4：盲盒 ；5：天空之境；
private int gift_bag;//10：天空之境 11：岁月之城 12：时空之巅
private int is_lock;//爵位礼物 0：不锁 1：锁

3
BaseModule/src/main/java/com/xscm/moduleutil/dialog/FirstChargeDialog.java
View File

@@ -191,7 +191,8 @@ public class FirstChargeDialog extends BaseDialog<DialogFirstChargeBinding> {
// mBinding.tvTitle2.setText(firstChargeGiftBean.getGift_bag().get(0).getTitle2());
// mBinding.btn0.setText(firstChargeGiftBean.getGift_bag().get(0).getName());
list.addAll(firstChargeGiftBean.getGift_bag().get(0).getGift_list());
mBinding.tvTitle22.setText("充值"+firstChargeGiftBean.getGift_bag().get(0).getName()+"即可获得"+firstChargeGiftBean.getGift_bag().get(0).getTitle2()+"的道具或装扮");
// mBinding.tvTitle22.setText("充值"+firstChargeGiftBean.getGift_bag().get(0).getName()+"即可获得"+firstChargeGiftBean.getGift_bag().get(0).getTitle2()+"的道具或装扮");
mBinding.tvTitle22.setText(firstChargeGiftBean.getGift_bag().get(0).getTitle2());
mBinding.bannerViewPager.create(baseListData(list, 4));
// mBinding.btn1.setText(firstChargeGiftBean.getGift_bag().get(1).getName());

2
BaseModule/src/main/java/com/xscm/moduleutil/interfaces/SoundLevelUpdateListener.java
View File

@@ -10,4 +10,6 @@ public interface SoundLevelUpdateListener {
void userJoined(int userId,int elapsd);
void userOffline(int userId,int reason);
void pkOffSide(int userId);
}

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

@@ -382,6 +382,14 @@ public class AgoraManager {
public void onRemoteAudioStateChanged(int uid, int state, int reason, int elapsed) {
super.onRemoteAudioStateChanged(uid, state, reason, elapsed);
LogUtils.e("onRemoteAudioStateChanged", "uid------>" + uid, "state------>" + state, "reason------>" + reason, "elapsed------>" + elapsed);
if (state == 0){
for (SoundLevelUpdateListener listener : soundLevelUpdateListeners) {
if (listener != null) {
// Pk 关闭远端推流
listener.pkOffSide(uid);
}
}
}
}
@Override
@@ -1189,7 +1197,6 @@ public class AgoraManager {
public void setMusicVolume(int volume) {
if (rtcEngine != null) {
rtcEngine.adjustRecordingSignalVolume(volume);//调整采集信号音量
// musicPlayer.adjustPublishSignalVolume(volume);//调节远端用户听到的音量。 参数是0-400
}
}

16
BaseModule/src/main/java/com/xscm/moduleutil/rtc/AgoraManagerEx.java
View File

@@ -239,8 +239,24 @@ public class AgoraManagerEx {
}
}
/**
* 打开声音关闭声音
*
* @param b
*/
public void muteSpeaker(boolean b) {
if (rtcEngineEx == null) {
init(CommonAppContext.getInstance().getCurrentEnvironment().getSwSdkAppId());
}
if (rtcEngineEx != null) {
rtcEngineEx.muteAllRemoteAudioStreamsEx(b, connection);
}
}
// 检查rtcEngineEx对象是否已初始化
public void muteAllRemoteAudioStreamsEx(boolean enabled) {
// 调用rtcEngineEx的方法来控制所有远程音频流的开关状态
if (rtcEngineEx == null) {
init(CommonAppContext.getInstance().getCurrentEnvironment().getSwSdkAppId());
}

2
BaseModule/src/main/java/com/xscm/moduleutil/utils/ImageUtils.java
View File

@@ -235,7 +235,7 @@ public class ImageUtils {
return;
}
}
Glide.with(mImageView).load(path).error(R.mipmap.default_avatar).placeholder(R.mipmap.default_avatar).diskCacheStrategy(DiskCacheStrategy.ALL).into(mImageView);
Glide.with(mImageView).load(path).diskCacheStrategy(DiskCacheStrategy.ALL).into(mImageView);
}
public static void loadHeadCC(String path, ImageView mImageView, LinearLayout.LayoutParams params) {

12
BaseModule/src/main/java/com/xscm/moduleutil/utils/MeHeadView.java
View File

@@ -58,18 +58,6 @@ public class MeHeadView extends ConstraintLayout {
mIvFrame.setVisibility(VISIBLE);
mIvFrame.setSource(framePicture, 1);
}
// if (!TextUtils.isEmpty(sex)) {
// mIvSex.setVisibility(GONE);
// if (sex.equals("1")){
// mIvSex.setBackgroundResource(R.mipmap.nan);
// }else {
// mIvSex.setBackgroundResource(R.mipmap.nv);
// }
//
// } else {
// mIvSex.setVisibility(GONE);
// }
// ImageUtils.loadImageView(framePicture, mIvFrame);
if (nobilityImage!=null && !TextUtils.isEmpty(nobilityImage)){
iv_frame_bg.setVisibility(VISIBLE);

10
BaseModule/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java
View File

@@ -3,7 +3,7 @@ package com.xscm.moduleutil.utils.config;
public enum EnvironmentEnum {
// "https://vespa.qxyushen.top/",
PRODUCTION(//生产环境
"https://1.13.101.98/",
"https://vespa.qxyushen.top/",
"KvNmqZc+VMzO4CfGMd5zmG6w6OFwpFO/19TwXUWfHDOBgmnl9DgIuE+kbrjNNnxqhtP3pH7bBrnSaSeFtunr72q6sgpLsfuswcUroMvz2slaTBcNzCaLi+GSnM3gB/GdO47mwLdk+iYBTvPUOCIuT608Z29z09w+vPeUDoMCHJBGXu6uh7Nj6PtV1dfGoUvByk1ZF0WYVjIqKDcb3tXY4jonFh3XAWhzMy8xKwN6F2nuK2IcdIwaSPsvuMZmhatP6f9kOE+vnfweyCHS3RxiG474WIoZGJM8omrl3/pOVqE=",
"https://oss-cn-beijing.aliyuncs.com/",
"LTAI5tKgrfcFQxH46ZwWYgFW",
@@ -13,11 +13,11 @@ public enum EnvironmentEnum {
"wxc7681513be9f926b",
1600096860,
"3e8f3add448d4692bc1d04c75ffe801b",
"tcp://81.70.45.221",
"http://1.13.101.98/h5",
"tcp://1.13.101.98",
"https://vespa.qxyushen.top/h5",
0),
TEST(//测试环境
"http://test.vespa.xscmmidi.site/",
"https://test.vespa.qxyushen.top/",
"6rdWuz058oq5OahdbFiGEybUcdahd12J83L34Uc7MrPIrxtFG+rXiwDvRcqNvjwbClbbmvMrmxKVkIysFByBsl0Qe9kqd2w8T/nhK5G6eXXlk2V9AjYCieIU+jRnjZBB+Cfechr6rCGJ2aeBARIsXcRPW7wm9WFK9euh5T+v6Pyte68yNaNdcYCll3+U4/uCEog7HygCnMIbAU+kqoPdmn2H+51YOHW+VsnsHd4w1+I3f8Tt0xLIXGM4GWnQueZ5GR46GTWiSYMy8dCIh9SPIMRyC91GosVcfGPMJSdcXqc=",
"https://oss-cn-beijing.aliyuncs.com/",
"LTAI5tKgrfcFQxH46ZwWYgFW",
@@ -28,7 +28,7 @@ public enum EnvironmentEnum {
1600096890,
"02f7339ec98947deaeab173599891932",
"tcp://1.13.181.248",
"https://test.vespa.xscmmidi.site/h5",
"https://test.vespa.qxyushen.top/h5",
1);
private final String serverUrl;//服务器地址

6
BaseModule/src/main/java/com/xscm/moduleutil/widget/BaseWheatView.java
View File

@@ -351,6 +351,12 @@ public abstract class BaseWheatView extends ConstraintLayout implements IBaseWhe
}
@Override
public void pkOffSide(int uid) {
if (String.valueOf(uid).equals(pitBean.getUser_id())) {
mIvRipple.setVisibility(GONE);
}
}
});
}

5
BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomDefaultWheatView.java
View File

@@ -263,6 +263,11 @@ public class RoomDefaultWheatView extends BaseWheatView {
}
@Override
public void pkOffSide(int uid) {
}
@Override
public void unRegister(Object obj) {

5
BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomFriendshipWheatView.java
View File

@@ -298,6 +298,11 @@ public class RoomFriendshipWheatView extends BaseWheatView {
}
@Override
public void pkOffSide(int uid) {
}
// public void setOnlineStatus(UserOnlineStatusBean isOnline) {
// if (pitBean.getUser_id() != null && !pitBean.getUser_id().equals("0") && !pitBean.getUser_id().isEmpty()) {
// if (pitBean.getUser_id().equals(isOnline.getUser_id())) {

5
BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomKtvWheatView.java
View File

@@ -270,6 +270,11 @@ public class RoomKtvWheatView extends BaseWheatView {
}
}
@Override
public void pkOffSide(int uid) {
}
@Override
public void unRegister(Object obj) {

5
BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomMakeWheatView.java
View File

@@ -259,6 +259,11 @@ public class RoomMakeWheatView extends BaseWheatView {
}
@Override
public void pkOffSide(int uid) {
}
public void setOnlineStatus(UserOnlineStatusBean isOnline) {
if (pitBean.getUser_id() != null && !pitBean.getUser_id().equals("0") && !pitBean.getUser_id().isEmpty()) {
if (pitBean.getUser_id().equals(isOnline.getUser_id())) {

5
BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomSingSongWheat2View.java
View File

@@ -290,6 +290,11 @@ public class RoomSingSongWheat2View extends BaseWheatView {
// 暂无实现
}
@Override
public void pkOffSide(int uid) {
}
@Override
public void unRegister(Object obj) {

5
BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomSingSongWheatView.java
View File

@@ -281,4 +281,9 @@ public class RoomSingSongWheatView extends BaseWheatView {
public void userOffline(int userId, int reason) {
}
@Override
public void pkOffSide(int uid) {
}
}

12
BaseModule/src/main/java/com/xscm/moduleutil/widget/ShineTextView.kt
View File

@@ -98,13 +98,23 @@ class ShineTextView : AppCompatTextView {
}
}
paint.shader = mLinearGradient
}else {
mLinearGradient = LinearGradient(
0f,
0f,
0f,
0f,
intArrayOf(Color.TRANSPARENT,Color.TRANSPARENT),
null,
Shader.TileMode.CLAMP
)
}
}
override fun onDraw(canvas: Canvas) {
super.onDraw(canvas)
if (!isShine || !::mLinearGradient.isLateinit) return
if (!isShine) return
mTranslate += mViewWidth / (shineDuration / 50)
if (mTranslate > 1.2 * mViewWidth) {
mTranslate = -mViewWidth / 5

16
BaseModule/src/main/res/layout/room_gv_gift_item.xml
View File

@@ -20,11 +20,9 @@
<ImageView
android:id="@+id/iv_gift_pic"
android:layout_width="35dp"
android:layout_height="35dp"
android:layout_marginLeft="5dp"
android:layout_width="45dp"
android:layout_height="45dp"
android:layout_marginTop="5dp"
android:layout_marginRight="5dp"
android:src="@mipmap/default_image"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
@@ -51,7 +49,6 @@
android:id="@+id/tv_gift_name"
android:layout_width="wrap_content"
android:layout_height="10dp"
android:layout_marginTop="1dp"
android:singleLine="true"
android:text="甜蜜奶酪"
android:textColor="@color/color_FF333333"
@@ -63,8 +60,7 @@
<TextView
android:id="@+id/tv_gift_price"
android:layout_width="wrap_content"
android:layout_height="12dp"
android:layout_marginTop="1dp"
android:layout_height="10dp"
android:text="1"
android:drawableLeft="@mipmap/jinb"
android:drawablePadding="@dimen/dp_3"
@@ -80,14 +76,14 @@
<TextView
android:id="@+id/tv_number"
android:layout_width="@dimen/dp_22"
android:layout_height="@dimen/dp_9"
android:layout_width="@dimen/dp_26"
android:layout_height="@dimen/dp_12"
android:background="@mipmap/text_bj"
android:gravity="center"
android:paddingLeft="3dp"
android:paddingRight="3dp"
android:textColor="@color/black"
android:textSize="5sp"
android:textSize="@dimen/sp_7"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="x100"/>

6
MainModule/build.gradle
View File

@@ -51,11 +51,6 @@ dependencies {
implementation libs.activity
implementation libs.constraintlayout
implementation project(':locktableview')
// implementation project(':modulevoice')
// implementation project(':modulecircle')
// implementation project(':modulevocal')
// implementation project(':modulenews')
// implementation project(':moduleroom')
testImplementation libs.junit
androidTestImplementation libs.ext.junit
@@ -73,6 +68,5 @@ dependencies {
api project(':tuichat')
api project(':BaseModule')
}
apply plugin: 'com.alibaba.arouter' // ⚠️ 添加这一行

3
MainModule/src/main/java/com/xscm/modulemain/BaseMvpActivity.java
View File

@@ -42,6 +42,7 @@ import com.xscm.moduleutil.activity.IPresenter;
import com.xscm.moduleutil.activity.IView;
import com.xscm.modulemain.activity.WebViewActivity;
import com.xscm.moduleutil.base.CommonAppContext;
import com.xscm.moduleutil.base.WebUrlConstants;
import com.xscm.moduleutil.bean.UserBean;
import com.xscm.moduleutil.bean.XLHBean;
import com.xscm.moduleutil.dialog.ConfirmDialog;
@@ -1007,7 +1008,7 @@ public abstract class BaseMvpActivity<P extends IPresenter, VDB extends ViewData
public void onEvent(ChatInfo event) {
String id = event.getId().replace("g", "");
Intent intent = new Intent(this, WebViewActivity.class);
intent.putExtra("url", CommonAppContext.getInstance().getCurrentEnvironment().getH5Url() + "/web/index.html#/pages/union/setGroup?id=" + SpUtil.getToken() + "&guildId=" + id);
intent.putExtra("url", String.format(WebUrlConstants.INSTANCE.getWEB_SET_GROUP_URL(), SpUtil.getToken(),id));
startActivity(intent);
}

4
MainModule/src/main/java/com/xscm/modulemain/activity/main/activity/MainActivity.java
View File

@@ -30,6 +30,7 @@ import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat;
import androidx.fragment.app.Fragment;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.blankj.utilcode.util.ActivityUtils;
import com.blankj.utilcode.util.FragmentUtils;
import com.blankj.utilcode.util.LogUtils;
@@ -68,6 +69,7 @@ import com.xscm.moduleutil.dialog.NewPeopleDialog;
import com.xscm.moduleutil.dialog.RechargeDialogFragment;
import com.xscm.moduleutil.event.RoomOutEvent;
import com.xscm.moduleutil.event.UnreadCountEvent;
import com.xscm.moduleutil.utils.ARouteConstants;
import com.xscm.moduleutil.utils.BackgroundManager;
import com.xscm.moduleutil.utils.ColorManager;
import com.xscm.moduleutil.utils.ImageLoader;
@@ -89,7 +91,7 @@ import java.util.concurrent.TimeUnit;
import io.reactivex.Observable;
import io.reactivex.android.schedulers.AndroidSchedulers;
@Route(path = ARouteConstants.ME)
public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBinding>
implements HomeContacts.View, View.OnClickListener, LocationProvider.LocationCallback {
private static int index = -1;

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

@@ -888,7 +888,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
override fun onSelfInfoUpdated(info: V2TIMUserFullInfo?) {}
}
private fun setView(resp: RoomInfoResp?) {
private fun setView(resp: RoomInfoResp?,isSwitchRoomType:Boolean = false) {
if (resp == null)
return
AppStateManager.getInstance().roomInfo = resp
@@ -959,13 +959,13 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
if (mRoomInfoResp!!.user_info.pit_number == 9 && mRoomInfoResp!!.user_info.user_id == SpUtil.getUserId()) {
mBinding!!.roomTop.rl.visibility = View.VISIBLE
ivSoundEffects(true)
} else {
mBinding!!.roomTop.rl.visibility = View.GONE
ivSoundEffects(false)
}
userPermissionChange()
if (resp.room_info.type_id == "7" || resp.room_info.type_id == "2") {
mBinding!!.rlMore.visibility = View.GONE
mBinding!!.rlMisc.visibility = View.GONE
@@ -990,7 +990,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
publicScreenFragment!!.upRoomInfo(resp)
}
AgoraManager.stopMuisc()
initializeAudio()
initializeAudio(isSwitchRoomType)
toutiao()
upRoomInfo(resp)
instView()
@@ -1565,7 +1565,6 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
if ("9" == toPitNumber && messageEvent.text.fromUserInfo.user_id == SpUtil.getUserId()) {
mRoomInfoResp!!.user_info.pit_number = Integer.parseInt(toPitNumber)
mBinding!!.roomTop.rl.visibility = View.VISIBLE
ivSoundEffects(true)
setRoleType(3, mRoomInfoResp!!.user_info.pit_number)
} else {
@@ -1575,14 +1574,16 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
isMusic = false
}
mBinding!!.roomTop.rl.visibility = View.GONE
ivSoundEffects(false)
}
roomFragment!!.handleRoomMessage(messageEvent)
userPermissionChange()
if (mRoomInfoResp!!.user_info.pit_number == 9) {
mBinding!!.roomTop.rl.visibility = View.VISIBLE
ivSoundEffects(true)
}
}
@@ -1601,10 +1602,8 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
roomSettingEvent.room_up_pit_type = text.room_up_pit_type
roomSettingEvent.type = messageEvent.msgType
if (mRoomBean != null) {
mRoomBean!!.room_up_pit_type = text.room_up_pit_type.toString() + ""
EventBus.getDefault().post(mRoomBean)
}
mRoomBean?.room_up_pit_type = text.room_up_pit_type.toString() + ""
EventBus.getDefault().post(mRoomBean)
EventBus.getDefault().post(roomSettingEvent)
}
@@ -1676,7 +1675,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
val currentUserId = SpUtil.getUserId()
if ("9" == pitNumber && userId == currentUserId) {
mBinding!!.roomTop.rl.visibility = View.VISIBLE
// mBinding!!.roomTop.rl.visibility = View.VISIBLE
ivSoundEffects(true)
}
@@ -1747,9 +1746,13 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
AgoraManager.getInstance().desMusic()
isMusic = false
}
mBinding!!.roomTop.rl.visibility = View.GONE
aBoolean = true
ivWheatFeeding(com.xscm.moduleutil.R.mipmap.room_wheat_feeding)
setBoolean(aBoolean)
// mBinding!!.roomTop.rl.visibility = View.GONE
mRoomInfoResp?.user_info?.pit_number = 0
ivSoundEffects(false)
setRoleType(0, 0)
} else if (userId == currentUserId) {
aBoolean = true
ivWheatFeeding(com.xscm.moduleutil.R.mipmap.room_wheat_feeding)
@@ -2220,6 +2223,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
} else {
AgoraManagerEx.getInstance().muteLocalAudioStreamEx(false)
}
} catch (e: Exception) {
// Handle exception
LogUtils.e("handleMsgType125: " + e.message)
@@ -2229,6 +2233,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
private fun handleMsgType1007() {
if (mRoomInfoResp != null && mRoomInfoResp!!.user_info != null) {
mRoomInfoResp!!.user_info.is_host = 1
userPermissionChange()
roomFragment!!.upRoomInfoData(mRoomInfoResp)
}
}
@@ -2236,6 +2241,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
private fun handleMsgType1006() {
if (mRoomInfoResp != null && mRoomInfoResp!!.user_info != null) {
mRoomInfoResp!!.user_info.is_management = 1
userPermissionChange()
roomFragment!!.upRoomInfoData(mRoomInfoResp)
}
}
@@ -2243,6 +2249,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
private fun handleMsgType1018() {
if (mRoomInfoResp != null && mRoomInfoResp!!.user_info != null) {
mRoomInfoResp!!.user_info.is_host = 0
userPermissionChange()
roomFragment!!.upRoomInfoData(mRoomInfoResp)
}
}
@@ -2250,6 +2257,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
private fun handleMsgType1017() {
if (mRoomInfoResp != null && mRoomInfoResp!!.user_info != null) {
mRoomInfoResp!!.user_info.is_management = 0
userPermissionChange()
roomFragment!!.upRoomInfoData(mRoomInfoResp)
}
}
@@ -2370,7 +2378,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
private var isSwith = false
private var voive = false //声音开关
private var voive = false //声音开关 false 静音关闭 true 静音开启
private var canSend = true
private var aBoolean = true //上下麦按钮
private var mCountDownTimer: CountDownTimer? = null
@@ -2446,14 +2454,18 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
addActiveDialogFragment(fragment) // 添加到管理列表
}
} else if (id == R.id.rl_voive) {
voive = !voive
if (voive) {
mBinding!!.imVoive.setImageResource(com.xscm.moduleutil.R.mipmap.room_voice_g)
voive = false
} else {
mBinding!!.imVoive.setImageResource(com.xscm.moduleutil.R.mipmap.room_voice_kg)
voive = true
}
AgoraManager.getInstance().muteSpeaker(!voive)
AgoraManager.getInstance().muteSpeaker(voive)
if(mRoomInfoResp?.pk_info != null) {
if (!roomFragment?.singSongFragment?.pkMicIsOn!!){
AgoraManagerEx.getInstance().muteSpeaker(voive)
}
}
} else if (id == R.id.rl_more) { //点击PK
val fragment = RoomPkDialogFragment.newInstance(
roomId,
@@ -2541,28 +2553,37 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
}
fun getHostUser(): Int {
if (mRoomInfoResp?.getUser_info()?.getPit_number() == 9) {
return if (mRoomInfoResp?.getUser_info()?.getIs_room_owner() == 1) {
1
} else if (mRoomInfoResp?.getUser_info()?.getIs_management() == 1) {
2
} else if (mRoomInfoResp?.getUser_info()?.getIs_host() == 1) {
3
} else {
4
}
return if (mRoomInfoResp?.user_info?.is_room_owner == 1) {
1
} else if (mRoomInfoResp?.user_info?.is_management == 1) {
2
} else if (mRoomInfoResp?.user_info?.is_host == 1) {
3
} else {
if (mRoomInfoResp?.getUser_info()?.getIs_room_owner() == 1) {
return 1
}
if (mRoomInfoResp?.getUser_info()?.getIs_management() == 1) {
return 2
}
if (mRoomInfoResp?.getUser_info()?.getIs_host() == 1) {
return 3
}
return 4
4
}
// if (mRoomInfoResp?.getUser_info()?.getPit_number() == 9) {
// return if (mRoomInfoResp?.getUser_info()?.getIs_room_owner() == 1) {
// 1
// } else if (mRoomInfoResp?.getUser_info()?.getIs_management() == 1) {
// 2
// } else if (mRoomInfoResp?.getUser_info()?.getIs_host() == 1) {
// 3
// } else {
// 4
// }
// } else {
// if (mRoomInfoResp?.getUser_info()?.getIs_room_owner() == 1) {
// return 1
// }
// if (mRoomInfoResp?.getUser_info()?.getIs_management() == 1) {
// return 2
// }
// if (mRoomInfoResp?.getUser_info()?.getIs_host() == 1) {
// return 3
// }
// return 4
// }
}
@@ -3024,11 +3045,12 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
fun upRoomInfo(resp: RoomInfoResp?) {
this.mRoomInfoResp = resp
userPermissionChange()
if (mRoomInfoResp!!.user_info.pit_number == 9 && mRoomInfoResp!!.user_info.user_id == SpUtil.getUserId()) {
mBinding!!.roomTop.rl.visibility = View.VISIBLE
ivSoundEffects(true)
} else {
mBinding!!.roomTop.rl.visibility = View.GONE
ivSoundEffects(false)
}
}
@@ -3220,16 +3242,20 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
* @data 2025/6/27
* @description: 初始化音频，初始的时候，当是在麦上，将用户设置为主持，在麦下，设置为观众， 默认关闭麦克风
*/
fun initializeAudio() {
if (mRoomUserBean!!.pit_number != 0) {
AgoraManager.getInstance().ClientRole(true)
AgoraManager.getInstance().muteLocalAudioStream(false)
} else {
AgoraManager.getInstance().ClientRole(false)
AgoraManager.getInstance().muteLocalAudioStream(true)
fun initializeAudio(isSwitchRoomType: Boolean) {
if (isSwitchRoomType){
AgoraManager.getInstance().muteSpeaker(voive)
}else{
if (mRoomUserBean!!.pit_number != 0) {
AgoraManager.getInstance().ClientRole(true)
AgoraManager.getInstance().muteLocalAudioStream(false)
} else {
AgoraManager.getInstance().ClientRole(false)
AgoraManager.getInstance().muteLocalAudioStream(true)
}
AgoraManager.getInstance()
.setLocalAudioEnabled(false, SpUtil.getUserId().toString() + "")
}
AgoraManager.getInstance()
.setLocalAudioEnabled(false, SpUtil.getUserId().toString() + "")
}
override fun showPasswordDialog() {
@@ -3392,6 +3418,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
}
is RoomHourBean.RoomListBean -> {
ClickUtils.clearAllClickRecords()
AgoraManager.getInstance().cleanup()
roomId = event.room_id
isSwitchRoom = true
@@ -3502,45 +3529,8 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
override fun onResume() {
super.onResume()
// GiftDisplayManager.getInstance().setupDisplayView(mBinding?.giftContainer)
// CommonAppContext.getInstance().isShow = true
// CommonAppContext.getInstance().isPlaying = true
// CommonAppContext.getInstance().isRoomJoininj = false
// // 当Activity恢复时，重置标记
// userLeaving = true
//
// MvpPre!!.roomRedPackets(roomId);
// LogUtils.e("RoomActivity", "onResume")
//
// if ((mRoomInfoResp?.room_info?.type_id.equals("1") || mRoomInfoResp?.room_info?.type_id.equals(
// "8"
// ) || mRoomInfoResp?.room_info?.type_id.equals(
// "3"
// )
// || mRoomInfoResp?.room_info?.type_id.equals("4")) && mRoomInfoResp?.room_info?.label_id.equals(
// "2"
// )
// ) {
// return
// }
// if (isInBackground) {
// isInBackground = false
// MvpPre!!.postRoomInfo(CommonAppContext.getInstance().playId)
// }
//
// // 检查是否从最小化状态恢复
// if (isMinimized) {
// isMinimized = false
// clearMinimizeState()
// // 恢复房间状态
// resumeRoomState()
// setupEffectView()
//
// MvpPre?.postRoomInfo(CommonAppContext.getInstance().playId)
// }
//
// // 延迟调整布局，确保视图已经完全加载
// mBinding?.mainContentContainer?.post { this.adjustLayoutHeights() }
//在后台关闭礼物弹出，前台恢复礼物弹出
GiftDisplayManager.getInstance().setupDisplayView(mBinding?.giftContainer)
}
// 添加检查房间连接状态的方法
@@ -3704,7 +3694,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
}
this.mRoomInfoResp = resp
setView(resp)
setView(resp,true)
}
fun upHeight() {
@@ -4324,6 +4314,14 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
}
}
private fun userPermissionChange(){
if (getHostUser() < 4){
mBinding?.roomTop?.rl?.visibility = View.VISIBLE
}else{
mBinding?.roomTop?.rl?.visibility = View.GONE
}
}
private val CLICK_INTERVAL: Long = 500 // 500ms内不允许重复点击
private var lastClickTime: Long = 0

24
MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomFragment.java
View File

@@ -15,6 +15,7 @@ import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import com.blankj.utilcode.util.ActivityUtils;
import com.blankj.utilcode.util.LogUtils;
import com.blankj.utilcode.util.TimeUtils;
import com.xscm.modulemain.R;
@@ -85,7 +86,7 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
String[] permissions = {Manifest.permission.RECORD_AUDIO};
private WheatFeedingDialogFragment wheatFeedingDialogFragment;
private SingSongFragment singSongFragment;
public SingSongFragment singSongFragment;
/// 二卡八 --pk
private RoomKtvFragment ktvFragment;
/// KTV
@@ -416,12 +417,12 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
setView();
if (mRoomInfoResp.getUser_info().getPit_number() != 0) {
mRoomActivity.switchMic(CommonAppContext.getInstance().isMai?1:2);
AgoraManager.getInstance().muteLocalAudioStream(CommonAppContext.getInstance().isMai);
} else {
AgoraManager.getInstance().muteLocalAudioStream(true);
}
// if (mRoomInfoResp.getUser_info().getPit_number() != 0) {
// mRoomActivity.switchMic(CommonAppContext.getInstance().isMai?1:2);
// AgoraManager.getInstance().muteLocalAudioStream(CommonAppContext.getInstance().isMai);
// } else {
// AgoraManager.getInstance().muteLocalAudioStream(true);
// }
}
/// 这是在进入电影放的时候，隐藏下面的和排麦视图
@@ -461,10 +462,9 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
if (existingFragment != null) {
transaction.show(existingFragment);
} else {
// callSpecificDestroyMethod(newFragment);
transaction.add(containerId, newFragment, tag);
}
transaction.commitAllowingStateLoss();
transaction.commitNowAllowingStateLoss();
}
@@ -527,11 +527,11 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
public void setView() {//这里是当进入电影放房的时候，如果是排麦模式，并且不是电影放的时候，就隐藏排麦视图
if (getActivity() instanceof RoomActivity) {
if (ActivityUtils.getTopActivity() instanceof RoomActivity) {
if (mRoomInfoResp.getRoom_info().getRoom_up_pit_type().equals("1") && !mRoomInfoResp.getRoom_info().getType_id().equals("6")) {
((RoomActivity) getActivity()).clFirstCharge(true);
((RoomActivity)ActivityUtils.getTopActivity()).clFirstCharge(true);
} else {
((RoomActivity) getActivity()).clFirstCharge(false);
((RoomActivity)ActivityUtils.getTopActivity()).clFirstCharge(false);
}
}
}

92
MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomKtvFragment.java
View File

@@ -23,6 +23,7 @@ import com.xscm.modulemain.dialog.RoomGiftDialogFragment;
import com.xscm.modulemain.dialog.RoomOnlineDialogFragment;
import com.xscm.modulemain.dialog.RoomUserInfoFragment;
import com.xscm.modulemain.dialog.TunerDialogFragment;
import com.xscm.modulemain.generated.callback.OnClickListener;
import com.xscm.moduleutil.base.BaseMvpFragment;
import com.xscm.moduleutil.bean.MusicSongBean;
import com.xscm.moduleutil.bean.RedPacketInfo;
@@ -81,11 +82,10 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
return fragment;
}
public void roomInfoUpdate(RoomInfoResp resp) {
roomInfoResp = resp;
initView();
initData();
}
private void upData() {
@@ -165,7 +165,7 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
if (getActivity() instanceof RoomActivity) {
((RoomActivity) getActivity()).setRoleType(2, 9);
((RoomActivity) getActivity()).switchMic(2);
// ((RoomActivity) getActivity()).switchMic(2);
}
}
} else if (roomPitBean.getPit_number().equals("10")) {
@@ -175,7 +175,7 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
if (getActivity() instanceof RoomActivity) {
((RoomActivity) getActivity()).setRoleType(2, 10);
((RoomActivity) getActivity()).switchMic(2);
// ((RoomActivity) getActivity()).switchMic(2);
}
}
}
@@ -276,40 +276,24 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
private void sv() {
RoomKtvWheatView roomDefaultWheatView = mBinding.muZc;
// 缓存 userId 字符串，避免重复拼接
String userIdStr = SpUtil.getUserId() + "";
// 提前获取相关对象引用，避免多次调用 getter
MusicSongBean songUserInfo = roomInfoResp.getSong_user_info();
RoomUserBean userInfo = roomInfoResp.getUser_info();
if (songUserInfo != null) {
if (userInfo != null && userInfo.getIs_host() == 1 && userInfo.getPit_number() == 9) {
//演唱者and主持
if (songUserInfo.getUser_id().equals(userIdStr) && roomDefaultWheatView.getUserId().equals(userIdStr)){
setVisibilityView(1);
} else if (songUserInfo.getIs_hot() == 1) {
setVisibilityView(1);
} else if (songUserInfo.getUser_id().equals(userIdStr) && roomDefaultWheatView.getUserId().equals(userIdStr)) {
setVisibilityView(4);
} else if (songUserInfo.getUser_id().equals(userIdStr)) {
}else if(roomDefaultWheatView.getUserId().equals(userIdStr)){//主持 非演唱者
setVisibilityView(2);
} else {
}else if (songUserInfo.getUser_id().equals(userIdStr)){//演唱者
setVisibilityView(3);
}else {//观众
setVisibilityView(4);
}
} else {
if (userInfo != null && userInfo.getIs_host() == 1 && userInfo.getPit_number() == 9) {
setVisibilityView(1);
} else {
setVisibilityView(3);
}
}
if (roomDefaultWheatView.getUserId().equals(userIdStr)) {
if (mBinding.muYc.getUserId().equals(userIdStr)) {
setVisibilityView(4);
} else {
setVisibilityView(1);
}
setVisibilityView(5);
}
}
@@ -388,6 +372,20 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
});
RoomKtvWheatView muZc = mBinding.muZc;
muZc.mIvFace.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (ClickUtils.isFastDoubleClick(muZc.mRiv)) {
return;
}
if (!muZc.getUserId().equals("")) {
RoomUserInfoFragment.show(roomInfoResp.getRoom_info().getRoom_id(), muZc.getUserId(), muZc.pitNumber, getHostUser(), false, 2, isNumberWhether(), getChildFragmentManager());
} else {
MvpPre.applyPit(roomInfoResp.getRoom_info().getRoom_id(), "9");
}
}
});
muZc.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -424,9 +422,6 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
} else {
if (ActivityUtils.getTopActivity() instanceof RoomActivity){
if (((RoomActivity) ActivityUtils.getTopActivity()).getHostUser() < 4){
if (ClickUtils.isFastDoubleClick(v)) {
return;
}
RoomOnlineDialogFragment.show(roomInfoResp.getRoom_info().getRoom_id(), "10", roomInfoResp.getUser_info(), roomInfoResp, getChildFragmentManager());
}else {
com.hjq.toast.ToastUtils.show("请等待主持抱麦");
@@ -486,32 +481,45 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
}
}
/**
* 设置布局的显示和隐藏
* @param type 1: 主持 and 演唱者
* 2：主持 非 演唱者
* 3：演唱者 非 主持
* 4：观众
*/
private void setVisibilityView(int type) {
// 当类型为1时，显示"订单"和"调运图"布局，隐藏其他布局
if (type == 1) {
mBinding.llBz.setVisibility(View.VISIBLE); // 隐藏布局Bz
mBinding.llDs.setVisibility(View.GONE); // 显示布局Ds
mBinding.llTiaoyt.setVisibility(View.VISIBLE); // 显示布局Tiaoyt
mBinding.llQg.setVisibility(View.VISIBLE); // 显示布局Qg
mBinding.llSz.setVisibility(View.GONE); // 隐藏布局Sz
} else if (type == 2) {
mBinding.llBz.setVisibility(View.GONE);
mBinding.llDs.setVisibility(View.VISIBLE);
mBinding.llTiaoyt.setVisibility(View.VISIBLE);
mBinding.llQg.setVisibility(View.VISIBLE);
mBinding.llSz.setVisibility(View.GONE);
} else if (type == 2) {
mBinding.llBz.setVisibility(View.VISIBLE);
mBinding.llDs.setVisibility(View.GONE);
mBinding.llTiaoyt.setVisibility(View.GONE);
mBinding.llQg.setVisibility(View.VISIBLE);
mBinding.llSz.setVisibility(View.GONE);
} else if (type == 3) {
mBinding.llBz.setVisibility(View.VISIBLE);
mBinding.llDs.setVisibility(View.GONE);
mBinding.llTiaoyt.setVisibility(View.VISIBLE);
mBinding.llQg.setVisibility(View.VISIBLE);
mBinding.llSz.setVisibility(View.GONE);
} else if (type == 4) {
mBinding.llBz.setVisibility(View.GONE);
mBinding.llDs.setVisibility(View.VISIBLE);
mBinding.llTiaoyt.setVisibility(View.GONE);
mBinding.llQg.setVisibility(View.GONE);
mBinding.llSz.setVisibility(View.GONE);
} else if (type == 4) {
mBinding.llBz.setVisibility(View.VISIBLE);
} else if (type == 5) {
mBinding.llBz.setVisibility(View.GONE);
mBinding.llDs.setVisibility(View.GONE);
mBinding.llTiaoyt.setVisibility(View.VISIBLE);
mBinding.llQg.setVisibility(View.VISIBLE);
mBinding.llTiaoyt.setVisibility(View.GONE);
mBinding.llQg.setVisibility(View.GONE);
mBinding.llSz.setVisibility(View.GONE);
}
}

13
MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/SingSongFragment.java
View File

@@ -32,7 +32,6 @@ import androidx.constraintlayout.widget.ConstraintLayout;
import com.blankj.utilcode.util.ActivityUtils;
import com.blankj.utilcode.util.LogUtils;
import com.blankj.utilcode.util.ObjectUtils;
import com.blankj.utilcode.util.ToastUtils;
import com.google.android.flexbox.FlexboxLayout;
import com.xscm.modulemain.R;
import com.xscm.modulemain.activity.room.activity.RoomActivity;
@@ -546,7 +545,7 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
updateWheatData();
}
private boolean aBoolean = true;
public boolean pkMicIsOn = false;
private int is_mute;
@Override
@@ -568,16 +567,16 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
MvpPre.endPk(roomInfoRespPk.getPk_info().getPk_id(), "3", SpUtil.getUserId() + "");
}
} else if (id == R.id.im_mkf) {
if (aBoolean) {
if (pkMicIsOn) {
mBinding.imMkf.setImageResource(com.xscm.moduleutil.R.mipmap.room_microphone);
is_mute = 0;
aBoolean = false;
AgoraManager.getInstance().muteAllRemoteAudioStreamsExUserId(false);
pkMicIsOn = false;
AgoraManagerEx.getInstance().muteAllRemoteAudioStreamsEx(false);
} else {
mBinding.imMkf.setImageResource(com.xscm.moduleutil.R.mipmap.room_microphone_off);
is_mute = 1;
aBoolean = true;
AgoraManager.getInstance().muteAllRemoteAudioStreamsExUserId(true);
pkMicIsOn = true;
AgoraManagerEx.getInstance().muteAllRemoteAudioStreamsEx(true);
}
RoomMessageEvent.text text = new RoomMessageEvent.text();
text.setIs_mute(is_mute);

7
MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/DailyTasksActivity.java
View File

@@ -20,6 +20,7 @@ import com.xscm.modulemain.BaseMvpActivity;
import com.xscm.modulemain.activity.WebViewActivity;
import com.xscm.modulemain.manager.RoomManager;
import com.xscm.moduleutil.base.CommonAppContext;
import com.xscm.moduleutil.base.WebUrlConstants;
import com.xscm.moduleutil.bean.GiftBoxBean;
import com.xscm.moduleutil.bean.GiftName;
import com.xscm.moduleutil.bean.TaskItem;
@@ -81,13 +82,9 @@ public class DailyTasksActivity extends BaseMvpActivity<DailyTasksPresenter, Act
mBinding.imGz.setOnClickListener(v -> {
Intent intent = new Intent(this, WebViewActivity.class);
intent.putExtra("url", CommonAppContext.getInstance().getCurrentEnvironment().getH5Url()+"/web/index.html#/pages/other/taskDesc");
intent.putExtra("url", WebUrlConstants.INSTANCE.getWEB_RULES_URL());
intent.putExtra("title", "规则 ");
startActivity(intent);
// WebViewDialog webViewDialog=new WebViewDialog(this,"https://vespa.qxmier.com/web/index.html#/pages/other/taskDesc");
// webViewDialog.show();
});
mTaskBoxAdapter.setOnItemClickListener(position -> {

3
MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/PersonalityActivity.java
View File

@@ -18,6 +18,7 @@ import com.xscm.modulemain.BaseMvpActivity;
import com.xscm.modulemain.activity.WebViewActivity;
import com.xscm.moduleutil.adapter.MyPagerAdapter;
import com.xscm.moduleutil.base.CommonAppContext;
import com.xscm.moduleutil.base.WebUrlConstants;
import com.xscm.moduleutil.bean.PersonaltyBean;
import com.xscm.moduleutil.utils.ColorManager;
import com.xscm.moduleutil.utils.SpUtil;
@@ -124,7 +125,7 @@ public class PersonalityActivity extends BaseMvpActivity<PersonalityPresenter, A
mBinding.topBar.setRightColor(ColorManager.getInstance().getPrimaryColorInt());
mBinding.topBar.getTvRight().setOnClickListener(v -> {
Intent intent=new Intent(this, WebViewActivity.class);
intent.putExtra("url", CommonAppContext.getInstance().getCurrentEnvironment().getH5Url()+"/web/index.html#/pages/prop/propMall?id="+SpUtil.getToken());
intent.putExtra("url", String.format(WebUrlConstants.INSTANCE.getWEB_PROP_MALL_URL(),SpUtil.getToken()));
intent.putExtra("title", "道具商城");
startActivity(intent);
});

18
MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/SettingActivity.java
View File

@@ -16,29 +16,20 @@ import com.blankj.utilcode.util.ToastUtils;
import com.blankj.utilcode.util.ZipUtils;
import com.tencent.qcloud.tuikit.timcommon.util.FileProvider;
import com.xscm.modulemain.Application;
import com.xscm.modulemain.BaseMvpActivity;
import com.xscm.modulemain.R;
import com.xscm.modulemain.databinding.ActivitySettingBinding;
import com.xscm.modulemain.activity.user.conacts.SettingConacts;
import com.xscm.modulemain.activity.user.presenter.SettingPresenter;
import com.xscm.modulemain.BaseMvpActivity;
import com.xscm.modulemain.databinding.ActivitySettingBinding;
import com.xscm.modulemain.dialog.YouthModelDialog;
import com.xscm.moduleutil.base.CommonAppContext;
import com.xscm.moduleutil.bean.UserInfo;
import com.xscm.moduleutil.dialog.RealNameDialog;
import com.xscm.moduleutil.utils.ARouteConstants;
import com.xscm.moduleutil.utils.Md5Utils;
import com.xscm.moduleutil.utils.SpUtil;
import com.xscm.moduleutil.utils.TimeUtils;
import com.xscm.moduleutil.utils.config.ConfigManager;
import com.xscm.moduleutil.utils.config.EnvironmentEnum;
import com.xscm.moduleutil.utils.config.EnvironmentPrefs;
import com.xscm.moduleutil.utils.cos.CosUploadManager;
import com.xscm.moduleutil.widget.CommonAppConfig;
import java.io.File;
import java.util.Objects;
import java.util.Set;
import java.util.UUID;
import io.reactivex.Observable;
import io.reactivex.ObservableEmitter;
@@ -214,12 +205,7 @@ public class SettingActivity extends BaseMvpActivity<SettingPresenter, ActivityS
})
.setNegativeButton("取消", null).create().show();
}else if (view.getId() == R.id.ll_gywm){
// Intent intent = new Intent(this, WebViewActivity.class);
// intent.putExtra("url", "https://vespa.qxmier.com/web/index.html#/pages/other/aboutUs?id=" + SpUtil.getToken());
// startActivity(intent);
startActivity(new Intent(this, AboutUsActivity.class));
} else if (view.getId() == R.id.ll_bbh) {
if (SpUtil.getShelf()==1) {
// 移除之前的重置任务

3
MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/UnderageActivity.java
View File

@@ -15,6 +15,7 @@ import com.xscm.modulemain.activity.user.presenter.UnderagePresenter;
import com.xscm.modulemain.BaseMvpActivity;
import com.xscm.modulemain.activity.WebViewActivity;
import com.xscm.moduleutil.base.CommonAppContext;
import com.xscm.moduleutil.base.WebUrlConstants;
import com.xscm.moduleutil.utils.ARouteConstants;
import com.xscm.moduleutil.utils.ColorManager;
import com.xscm.moduleutil.utils.SpUtil;
@@ -194,7 +195,7 @@ public class UnderageActivity extends BaseMvpActivity<UnderagePresenter, Activit
private void navigateToNextPage() {
Intent intent = new Intent(UnderageActivity.this, WebViewActivity.class);
intent.putExtra("type", "1");
intent.putExtra("url", CommonAppContext.getInstance().getCurrentEnvironment().getH5Url() + "/web/index.html#/pages/feedback/teenage?id=" + SpUtil.getToken());
intent.putExtra("url", String.format(WebUrlConstants.INSTANCE.getWEB_ADOLESCENT_URL(),SpUtil.getToken()));
startActivity(intent);

12
MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/VocalRangeFragment.java
View File

@@ -37,6 +37,7 @@ import com.xscm.modulemain.activity.user.activity.UserHomepageActivity;
import com.xscm.modulemain.activity.user.conacts.MeConacts;
import com.xscm.modulemain.activity.user.presenter.MePresenter;
import com.xscm.modulemain.activity.WebViewActivity;
import com.xscm.moduleutil.base.WebUrlConstants;
import com.xscm.moduleutil.widget.ShineTextView;
import com.xscm.moduleutil.base.BaseMvpFragment;
import com.xscm.moduleutil.base.CommonAppContext;
@@ -176,12 +177,12 @@ public class VocalRangeFragment extends BaseMvpFragment<MePresenter, FragmentVoc
startActivity(intent);
}else if (id==R.id.ll_me_guild){
Intent intent=new Intent(getContext(), WebViewActivity.class);
intent.putExtra("url", CommonAppContext.getInstance().getCurrentEnvironment().getH5Url()+"/web/index.html#/pages/union/index?id="+SpUtil.getToken());
intent.putExtra("url", String.format(WebUrlConstants.INSTANCE.getWEB_GUILD_URL(),SpUtil.getToken()));
intent.putExtra("title", "公会");
startActivity(intent);
}else if (id==R.id.ll_my_shopping){
Intent intent=new Intent(getContext(), WebViewActivity.class);
intent.putExtra("url", CommonAppContext.getInstance().getCurrentEnvironment().getH5Url()+"/web/index.html#/pages/prop/propMall?id="+SpUtil.getToken());
intent.putExtra("url", String.format(WebUrlConstants.INSTANCE.getWEB_PROP_MALL_URL(),SpUtil.getToken()));
intent.putExtra("title", "道具商城");
startActivity(intent);
}
@@ -237,18 +238,17 @@ public class VocalRangeFragment extends BaseMvpFragment<MePresenter, FragmentVoc
startActivity(intent);
}else if (id == R.id.me_my_dan){//等级
Intent intent = new Intent(getContext(), WebViewActivity.class);
intent.putExtra("url", CommonAppContext.getInstance().getCurrentEnvironment().getH5Url()+"/web/index.html#/pages/other/grade?id=" + SpUtil.getToken());
intent.putExtra("url", String.format(WebUrlConstants.INSTANCE.getWEB_GRADE_URL(),SpUtil.getToken()));
intent.putExtra("title", "等级");
startActivity(intent);
}else if (id == R.id.ll_me_help){//反馈
Intent intent = new Intent(getContext(), WebViewActivity.class);
intent.putExtra("url", CommonAppContext.getInstance().getCurrentEnvironment().getH5Url()+"/web/index.html#/pages/feedback/help?id=" + SpUtil.getToken());
// intent.putExtra("url", "http://192.168.110.17:8080/web/index.html#/pages/feedback/help?id=" + SpUtil.getToken());
intent.putExtra("url", String.format(WebUrlConstants.INSTANCE.getWEB_HELP_URL(), SpUtil.getToken()));
intent.putExtra("title", "反馈");
startActivity(intent);
}else if (id == R.id.iv_hb){//邀请
Intent intent = new Intent(getContext(), WebViewActivity.class);
intent.putExtra("url", CommonAppContext.getInstance().getCurrentEnvironment().getH5Url()+"/web/index.html#/pages/other/income?id=" + SpUtil.getToken());
intent.putExtra("url", String.format(WebUrlConstants.INSTANCE.getWEB_INVITATION_URL(),SpUtil.getToken()));
intent.putExtra("title", "邀请");
startActivity(intent);
}else if (id==R.id.tv_copy){

219
MainModule/src/main/java/com/xscm/modulemain/adapter/EaseChatAdapter.java
View File

@@ -202,8 +202,6 @@ public class EaseChatAdapter extends BaseMultiItemQuickAdapter<EMMessageInfo, Ba
helper.getView(com.xscm.moduleutil.R.id.tv_content).setVisibility(View.VISIBLE);
helper.setText(com.xscm.moduleutil.R.id.tv_content, getSpannable(emMessage));
// helper.setText(com.xscm.moduleutil.R.id.tv_content, emMessage.getText().getText());
// tv_content.setTextColor(ColorManager.getInstance().getPrimaryColorInt());
break;
case 2:
AdaptiveImageView emojiImageView = helper.getView(com.xscm.moduleutil.R.id.im_emj);
@@ -292,8 +290,6 @@ public class EaseChatAdapter extends BaseMultiItemQuickAdapter<EMMessageInfo, Ba
.map(EmotionDeatils::getAnimate_image)
.orElse("");
// if (Objects.equals(emMessage.getText().getEmoji().getAnimate_image(), "") ||
// emMessage.getText().getEmoji().getAnimate_image().isEmpty()) {
if (!animateImage.isEmpty()) {
// 检查视图是否仍属于当前数据项
if (uniqueId.equals(emojiImageView.getTag())) {
@@ -344,224 +340,9 @@ public class EaseChatAdapter extends BaseMultiItemQuickAdapter<EMMessageInfo, Ba
}
break;
case 3:
// if (emMessage.getText().getFromUserInfo().getChat_bubble() != null && !emMessage.getText().getFromUserInfo().getChat_bubble().isEmpty()) {
//// helper.getView(com.xscm.moduleutil.R.id.bubble).setBackgroundResource(R.mipmap.qipaokang);
//// ImageUtils.loadHeadCC(emMessage.getText().getFromUserInfo().getChat_bubble(), helper.getView(com.xscm.moduleutil.R.id.network_background));
//
// // 使用 Glide 加载图片并设置名称
// String imageUrl = emMessage.getText().getFromUserInfo().getChat_bubble();
//
// Glide.with(mContext)
// .load(imageUrl)
// .into(new SimpleTarget<Drawable>() {
// @Override
// public void onResourceReady(@NonNull Drawable resource, @Nullable Transition<? super Drawable> transition) {
// // 将资源转换为 Bitmap
// if (resource instanceof BitmapDrawable) {
// Bitmap bitmap = ((BitmapDrawable) resource).getBitmap();
// // 创建新的文件名
// Drawable fakeNinePatch = new FakeNinePatchDrawable(bitmap, 0.4f, 0.4f, 0.6f, 0.5f);
//
// // 保存图片到本地
// helper.getView(com.xscm.moduleutil.R.id.bubble).setBackground(fakeNinePatch);
// }
// }
//
// @Override
// public void onLoadFailed(@Nullable Drawable errorDrawable) {
// // 加载失败处理
// }
// });
// } else {
// helper.getView(com.xscm.moduleutil.R.id.bubble1).setBackgroundResource(R.drawable.ease_row_pubilc_user_bg);
// }
// if (emMessage.getText().getFromUserInfo() != null && emMessage.getText().getFromUserInfo().getAvatar() != null) {
// ImageUtils.loadHeadCC(emMessage.getText().getFromUserInfo().getAvatar(), helper.getView(com.xscm.moduleutil.R.id.avatar));
// }
// helper.setText(com.xscm.moduleutil.R.id.tv_name, emMessage.getText().getFromUserInfo().getNickname());
// helper.setText(com.xscm.moduleutil.R.id.tv_content, emMessage.getText().getText());
helper.getView(com.xscm.moduleutil.R.id.tv_content).setVisibility(View.VISIBLE);
helper.setText(com.xscm.moduleutil.R.id.tv_content, getSpannable(emMessage));
// List<String> images1 = emMessage.getText().getFromUserInfo().getIcon();
// LinearLayout ll_images1 = helper.getView(com.xscm.moduleutil.R.id.line);
// ll_images1.removeAllViews();
// if (images1 == null) {
// return;
// }
// for (String url : images1) {
// if (url.contains("http")) {
// ImageView imageView = new ImageView(helper.itemView.getContext());
// LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
// helper.itemView.getContext().getResources().getDimensionPixelSize(R.dimen.dp_57),
// helper.itemView.getContext().getResources().getDimensionPixelSize(R.dimen.dp_15)
// );
// params.setMargins(0, 0, helper.itemView.getContext().getResources().getDimensionPixelSize(R.dimen.dp_5), 0); // 右边距
// imageView.setLayoutParams(params);
// imageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
// // 使用 Glide 加载图片
// ImageUtils.loadHeadCC(url, imageView);
// ll_images1.addView(imageView);
// }
// }
break;
// case 4:
// TextView tvContent7 = helper.getView(com.xscm.moduleutil.R.id.tv_content);
// ivNew = helper.getView(com.xscm.moduleutil.R.id.new_view);
// ivNew.setNew(1);
// tvContent7.setText(new SpanUtils().append(spanned).create());
// break;
// //抽签
// case 5:
// String number = emMessage.getStringAttribute("number", "");
// ivRole = helper.getView(com.xscm.moduleutil.R.id.iv_role);
// ivNew = helper.getView(com.xscm.moduleutil.R.id.iv_new);
// ivGrade = helper.getView(com.xscm.moduleutil.R.id.iv_grade);
// ivTitle = helper.getView(com.xscm.moduleutil.R.id.iv_title_label);
// ivNHobility = helper.getView(com.xscm.moduleutil.R.id.iv_nobility);
// tvName = helper.getView(com.xscm.moduleutil.R.id.tv_name);
// TextView tvContent5 = helper.getView(com.xscm.moduleutil.R.id.tv_content);
// ivRole.setRole(Integer.parseInt(role));
// ivNew.setNew(Integer.parseInt(userIsNew));
// ivGrade.setGrade(rankIcon);
// //称号图标
// try {
// String s = user_title.substring(user_title.lastIndexOf("=") + 1);
// int mWidth = (int) (Float.parseFloat(s) * 20);
// int mHeight = 20;
// ViewGroup.LayoutParams layoutParams = ivTitle.getLayoutParams();
// layoutParams.width = ConvertUtils.dp2px(mWidth);
// layoutParams.height = ConvertUtils.dp2px(mHeight);
// ivTitle.setLayoutParams(layoutParams);
// } catch (Exception e) {
// e.printStackTrace();
// }
// ivTitle.setLabelView(user_title);
// ivNHobility.setNobility(nobilityIcon);
// ImageUtils.loadIcon(charmIcon, helper.getView(com.xscm.moduleutil.R.id.iv_charm));
// tvName.setText(String.format("%s:", nickname));
// tvContent5.setText(new SpanUtils().append(spanned).create());
// GlideApp.with(mContext).load(String.format("http://soundriver.oss-cn-hangzhou.aliyuncs.com/custom/random%ss.webp", number)).into(new SimpleTarget<Drawable>() {
// @Override
// public void onResourceReady(@NonNull Drawable drawable, @Nullable Transition<? super Drawable> transition) {
// if (drawable instanceof WebpDrawable) {
// AppCompatImageView imageView = helper.getView(com.xscm.moduleutil.R.id.iv_wagginh);
// imageView.setImageDrawable(drawable);
// ((WebpDrawable) drawable).start();
// ((WebpDrawable) drawable).setLoopCount(1);
// ((WebpDrawable) drawable).registerAnimationCallback(new Animatable2Compat.AnimationCallback() {
// @Override
// public void onAnimationEnd(Drawable drawable) {
// super.onAnimationEnd(drawable);
// helper.setImageResource(com.xscm.moduleutil.R.id.iv_wagginh, a[Integer.parseInt(number)]);
// }
// });
// }
// }
// });
// break;
// //表情
// case 6:
// ivRole = helper.getView(com.xscm.moduleutil.R.id.iv_role);
// ivNew = helper.getView(com.xscm.moduleutil.R.id.iv_new);
// ivGrade = helper.getView(com.xscm.moduleutil.R.id.iv_grade);
// ivTitle = helper.getView(com.xscm.moduleutil.R.id.iv_title_label);
// ivNHobility = helper.getView(com.xscm.moduleutil.R.id.iv_nobility);
// tvName = helper.getView(com.xscm.moduleutil.R.id.tv_name);
// ivRole.setRole(Integer.parseInt(role));
// ivNew.setNew(Integer.parseInt(userIsNew));
// ivGrade.setGrade(rankIcon);
// ivTitle.setLabelView(user_title);
// ivNHobility.setNobility(nobilityIcon);
// tvName.setText(Html.fromHtml(nickname));
// ImageUtils.loadIcon(charmIcon, helper.getView(com.xscm.moduleutil.R.id.iv_charm));
// ImageLoader.loadIcon(mContext, helper.getView(com.xscm.moduleutil.R.id.iv_expression), emoji_special);
//
// //称号图标
// try {
// String s = user_title.substring(user_title.lastIndexOf("=") + 1);
// int mWidth = (int) (Float.parseFloat(s) * 20);
// int mHeight = 20;
// ViewGroup.LayoutParams layoutParams = ivTitle.getLayoutParams();
// layoutParams.width = ConvertUtils.dp2px(mWidth);
// layoutParams.height = ConvertUtils.dp2px(mHeight);
// ivTitle.setLayoutParams(layoutParams);
// } catch (Exception e) {
// e.printStackTrace();
// }
// break;
// //球球大作战
// case 8:
// String first = emMessage.getStringAttribute("first", "");
// String second = emMessage.getStringAttribute("second", "");
// String third = emMessage.getStringAttribute("third", "");
//
// ivRole = helper.getView(com.xscm.moduleutil.R.id.iv_role);
// ivNew = helper.getView(com.xscm.moduleutil.R.id.iv_new);
// ivGrade = helper.getView(com.xscm.moduleutil.R.id.iv_grade);
// ivTitle = helper.getView(com.xscm.moduleutil.R.id.iv_title_label);
// ivNHobility = helper.getView(com.xscm.moduleutil.R.id.iv_nobility);
// tvName = helper.getView(com.xscm.moduleutil.R.id.tv_name);
// TextView tvContent8 = helper.getView(com.xscm.moduleutil.R.id.tv_content);
//
// ivRole.setRole(Integer.parseInt(role));
// ivNew.setNew(Integer.parseInt(userIsNew));
// ivGrade.setGrade(rankIcon);
// ivTitle.setLabelView(user_title);
// ivNHobility.setNobility(nobilityIcon);
// ImageUtils.loadIcon(charmIcon, helper.getView(com.xscm.moduleutil.R.id.iv_charm));
// tvName.setText(Html.fromHtml(nickname));
// if (emMessage.getIntAttribute("type", 0) == 6019) {//亮球
// helper.setVisible(com.xscm.moduleutil.R.id.iv_qiu1, true);
// helper.setVisible(com.xscm.moduleutil.R.id.iv_qiu2, true);
// helper.setVisible(com.xscm.moduleutil.R.id.iv_qiu3, true);
//
// try {
// helper.setImageResource(com.xscm.moduleutil.R.id.iv_qiu1, mContext.getResources().getIdentifier(first, "mipmap", mContext.getPackageName()));
// helper.setImageResource(com.xscm.moduleutil.R.id.iv_qiu2, mContext.getResources().getIdentifier(second, "mipmap", mContext.getPackageName()));
// helper.setImageResource(com.xscm.moduleutil.R.id.iv_qiu3, mContext.getResources().getIdentifier(third, "mipmap", mContext.getPackageName()));
// } catch (Exception e) {
// e.printStackTrace();
// }
//
// } else {
// helper.setVisible(com.xscm.moduleutil.R.id.iv_qiu1, false);
// helper.setVisible(com.xscm.moduleutil.R.id.iv_qiu2, false);
// helper.setVisible(com.xscm.moduleutil.R.id.iv_qiu3, false);
// }
// spanUtils.append(spanned);
// tvContent8.setText(spanUtils.create());
// break;
// case 10:
// TextView tv = helper.getView(com.xscm.moduleutil.R.id.tv_content);
// float height = tv.getTextSize();//获取字体高度
// String bell = "<img src=\"" + R.drawable.ease_message_bell + "\"/>"; //前面加一个铃铛
// Spanned sp = Html.fromHtml(bell + txtBody.getMessage(), source -> {
// Drawable drawable;
// drawable = mContext.getResources().getDrawable(Integer.parseInt(source));
// drawable.setBounds(0, 0, (int) (height * 36f / 42f), (int) height); //等比例设置铃铛大小
// return drawable;
// }, null);
// tv.setText(sp);
// helper.setGone(com.xscm.moduleutil.R.id.tv_red_rain_detail, false);
// break;
// case 11:
// TextView tv11 = helper.getView(com.xscm.moduleutil.R.id.tv_content);
// float height11 = tv11.getTextSize();//获取字体高度
// String bell11 = "<img src=\"" + R.drawable.ease_message_bell + "\"/>"; //前面加一个铃铛
// Spanned sp11 = Html.fromHtml(bell11 + txtBody.getMessage(), source -> {
// Drawable drawable;
// drawable = mContext.getResources().getDrawable(Integer.parseInt(source));
// drawable.setBounds(0, 0, (int) (height11 * 36f / 42f), (int) height11); //等比例设置铃铛大小
// return drawable;
// }, null);
// tv11.setText(sp11);
// helper.setGone(com.xscm.moduleutil.R.id.tv_red_rain_detail, true);
// helper.addOnClickListener(com.xscm.moduleutil.R.id.tv_red_rain_detail);
// break;
// default:
// helper.setText(com.xscm.moduleutil.R.id.tv_content, Html.fromHtml(txtBody.getMessage()));
// break;
}
}

7
MainModule/src/main/java/com/xscm/modulemain/adapter/RoomOnlineAdapter.java
View File

@@ -102,8 +102,11 @@ public class RoomOnlineAdapter extends BaseMultiItemQuickAdapter<RoomOnlineBean,
// }else if (item.getType() == 1 && item.getType_pit() == 0){
// textView.setVisibility(GONE);
// }
textView.setText(item.getPit_number() != 0 ? (item.getPit_number() == 9 ? "主持" : (item.getPit_number() == 10 ? "嘉宾" : item.getPit_number()+ "号麦")) : "抱麦");
if(item.getType() == 1) {
textView.setText(item.getPit_number() != 0 ? (item.getPit_number() == 9 ? "主持" : (item.getPit_number() == 10 ? "嘉宾" : item.getPit_number() + "号麦")) : "");
}else {
textView.setText("抱麦");
}
textView.setTextColor(ColorManager.getInstance().getPrimaryColorInt());

6
MainModule/src/main/java/com/xscm/modulemain/dialog/RoomSettingFragment.java
View File

@@ -25,6 +25,7 @@ import com.xscm.modulemain.adapter.RoomSettingAdapter;
import com.xscm.modulemain.databinding.DialogRoomSettingFragmentBinding;
import com.xscm.modulemain.activity.WebViewActivity;
import com.xscm.moduleutil.base.CommonAppContext;
import com.xscm.moduleutil.base.WebUrlConstants;
import com.xscm.moduleutil.dialog.ConfirmDialog;
import com.xscm.moduleutil.event.EffectEvent;
import com.xscm.moduleutil.event.FloatingScreenEvent;
@@ -290,10 +291,8 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
}
} else if (bean.getType() == RoomSettingBean.QXRoomSettingTypeRoomReport) {
if (roomId != null) {
// ARouter.getInstance().build(ARouteConstants.H5).withString("url", CommonAppContext.getInstance().getCurrentEnvironment().getH5Url() + "/web/index.html#/pages/feedback/report?id=" + SpUtil.getToken() + "&fromType=" + 2 + "&fromId=" + roomId).navigation();
Intent intent = new Intent(getActivity(), WebViewActivity.class);
intent.putExtra("url", CommonAppContext.getInstance().getCurrentEnvironment().getH5Url() + "/web/index.html#/pages/feedback/report?id=" + SpUtil.getToken() + "&fromType=" + 2 + "&fromId=" + roomId);
intent.putExtra("url", String.format(WebUrlConstants.INSTANCE.getWEB_REPORT_URL(),SpUtil.getToken(),2, roomId));
startActivity(intent);
}else {
com.blankj.utilcode.util.ToastUtils.showShort("数据错误，请关闭重试");
@@ -468,6 +467,7 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
bean.setStatus(false);
adapter.notifyItemChanged(i);
}
return;
}
}
}

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

@@ -31,6 +31,7 @@ import com.xscm.modulemain.activity.WebViewActivity;
import com.xscm.modulemain.manager.RoomManager;
import com.xscm.moduleutil.base.BaseMvpDialogFragment;
import com.xscm.moduleutil.base.CommonAppContext;
import com.xscm.moduleutil.base.WebUrlConstants;
import com.xscm.moduleutil.bean.RelationCardBean;
import com.xscm.moduleutil.bean.UserInfo;
import com.xscm.moduleutil.color.ThemeableDrawableUtils;
@@ -225,12 +226,9 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
MvpPre.addBlackList(user_id);
} else if (id == R.id.room_rl_gift) {
ARouter.getInstance().build(ARouteConstants.USER_HOME_PAGE).withString("userId", userInfo.getUser_id() + "").withInt("type", 1).navigation();
// UserGiftWallRoomFragment.newInstance(Integer.parseInt(user_id)).show(getChildFragmentManager(), "UserGiftWallRoomFragment");
} else if (id == R.id.room_jb) {
// ARouter.getInstance().build(ARouteConstants.H5).withString("url", CommonAppContext.getInstance().getCurrentEnvironment().getH5Url()+ "/web/index.html#/pages/feedback/report?id="+SpUtil.getToken()+"&fromType=1&fromId="+user_id).withString("title", "举报").navigation();
Intent intent = new Intent(getActivity(), WebViewActivity.class);
intent.putExtra("url", CommonAppContext.getInstance().getCurrentEnvironment().getH5Url() + "/web/index.html#/pages/feedback/report?id=" + SpUtil.getToken() + "&fromType=1&fromId=" + user_id);
intent.putExtra("url", String.format(WebUrlConstants.INSTANCE.getWEB_REPORT_URL(),SpUtil.getToken(),1,user_id));
intent.putExtra("title", "举报");
startActivity(intent);
} else if (id == R.id.iv_avatar) {
@@ -302,9 +300,8 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
} else if (id == R.id.action_report) {
// showContent = "点击 Item菜单6";
//TODO 举报功能
// ARouter.getInstance().build(ARouteConstants.H5).withString("url",CommonAppContext.getInstance().getCurrentEnvironment().getH5Url()+ "/web/index.html#/pages/feedback/report?id="+SpUtil.getToken()+"&fromType=1&fromId="+user_id).withString("title", "举报").navigation();
Intent intent = new Intent(getActivity(), WebViewActivity.class);
intent.putExtra("url", CommonAppContext.getInstance().getCurrentEnvironment().getH5Url() + "/web/index.html#/pages/feedback/report?id=" + SpUtil.getToken() + "&fromType=1&fromId=" + user_id);
intent.putExtra("url", String.format(WebUrlConstants.INSTANCE.getWEB_REPORT_URL(), SpUtil.getToken(),1,user_id));
intent.putExtra("title", "举报");
startActivity(intent);
@@ -593,21 +590,21 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
mBinding.imQml.setVisibility(VISIBLE);
break;
case 4:
if (close_type == 1 || close_type == 2 || close_type == 3) {
mBinding.roomDian.setVisibility(GONE);
mBinding.roomJb.setVisibility(View.VISIBLE);
mBinding.roomLh.setVisibility(View.VISIBLE);
mBinding.roomMCz.setVisibility(GONE);
mBinding.roomBo.setVisibility(View.VISIBLE);
mBinding.imQml.setVisibility(VISIBLE);
} else {
// if (close_type == 1 || close_type == 2 || close_type == 3) {
// mBinding.roomDian.setVisibility(GONE);
// mBinding.roomJb.setVisibility(View.VISIBLE);
// mBinding.roomLh.setVisibility(View.VISIBLE);
// mBinding.roomMCz.setVisibility(GONE);
// mBinding.roomBo.setVisibility(View.VISIBLE);
// mBinding.imQml.setVisibility(VISIBLE);
// } else {
mBinding.roomDian.setVisibility(GONE);
mBinding.roomJb.setVisibility(View.VISIBLE);
mBinding.roomLh.setVisibility(View.VISIBLE);
mBinding.roomMCz.setVisibility(GONE);
mBinding.roomBo.setVisibility(View.VISIBLE);
mBinding.imQml.setVisibility(GONE);
}
// }
if (isSelf) {
mBinding.roomDian.setVisibility(GONE);
mBinding.roomJb.setVisibility(View.GONE);

17
MainModule/src/main/java/com/xscm/modulemain/dialog/ShareDialog.java
View File

@@ -20,6 +20,7 @@ import com.blankj.utilcode.util.ToastUtils;
import com.xscm.modulemain.activity.WebViewActivity;
import com.xscm.moduleutil.R;
import com.xscm.moduleutil.base.CommonAppContext;
import com.xscm.moduleutil.base.WebUrlConstants;
import com.xscm.moduleutil.bean.CircleListBean;
import com.xscm.moduleutil.databinding.RoomDialogShareBinding;
import com.xscm.moduleutil.utils.BaseBottomSheetDialog;
@@ -144,18 +145,16 @@ public class ShareDialog extends BaseBottomSheetDialog<RoomDialogShareBinding> {
listener.onShareDataLoaded(ids);
}
} else if (R.id.tv_jub == id) {
String fromId = "";
if (types == 3) {
Intent intent = new Intent(getContext(), WebViewActivity.class);
intent.putExtra("url", CommonAppContext.getInstance().getCurrentEnvironment().getH5Url()+"/web/index.html#/pages/feedback/report?id=" + SpUtil.getToken() + "&fromType=" + types + "&fromId=" + bean.getId());
intent.putExtra("title", "举报");
startActivity(intent);
fromId = bean.getId()+"";
}else if (types == 1){
Intent intent = new Intent(getContext(), WebViewActivity.class);
intent.putExtra("url", CommonAppContext.getInstance().getCurrentEnvironment().getH5Url()+"/web/index.html#/pages/feedback/report?id=" + SpUtil.getToken() + "&fromType=" + types + "&fromId=" + bean.getUser_id());
intent.putExtra("title", "举报");
startActivity(intent);
fromId = bean.getUser_id()+"";
}
Intent intent = new Intent(getContext(), WebViewActivity.class);
intent.putExtra("url", String.format(WebUrlConstants.INSTANCE.getWEB_REPORT_URL(), SpUtil.getToken(),types,fromId));
intent.putExtra("title", "举报");
startActivity(intent);
} else if (R.id.tv_copy == id) {
ClipboardManager clipboard = (ClipboardManager)mContext.getSystemService( Context.CLIPBOARD_SERVICE);
ClipData clip = ClipData.newPlainText("链接",bean.getShare_url() );

15
MainModule/src/main/java/com/xscm/modulemain/dialog/YouthModelDialog.java
View File

@@ -12,6 +12,7 @@ import com.blankj.utilcode.util.ScreenUtils;
import com.xscm.modulemain.activity.WebViewActivity;
import com.xscm.moduleutil.R;
import com.xscm.moduleutil.base.CommonAppContext;
import com.xscm.moduleutil.base.WebUrlConstants;
import com.xscm.moduleutil.bean.TeenagerInfo;
import com.xscm.moduleutil.color.ThemeableDrawableUtils;
import com.xscm.moduleutil.databinding.IndexDialogYouthModelBinding;
@@ -44,24 +45,12 @@ public class YouthModelDialog extends BaseDialog<IndexDialogYouthModelBinding> {
window.setLayout((int) (ScreenUtils.getScreenWidth() * 315.f / 375), WindowManager.LayoutParams.WRAP_CONTENT);
mBinding.ivClose.setOnClickListener(v -> dismiss());
mBinding.tvIKnow.setOnClickListener(v -> {
ARouter.getInstance().build(ARouteConstants.UNDERAGE_ACTIVITY).withInt("type", 0).navigation();
// ARouter.getInstance().build(ARouteConstants.H5).withString("url", CommonAppContext.getInstance().getCurrentEnvironment().getH5Url() + "/web/index.html#/pages/feedback/teenage?id=" + SpUtil.getToken()).navigation();
// dismiss();
});
mBinding.tvOpen.setOnClickListener(v -> {
// if (teenagerInfo.getHad_password() == 1) {
// ARouter.getInstance().build(ARouteConstants.SET_YOUTH_PWD_ACTIVITY).withInt("type", SetYouthPasswordActivity.TYPE_OPEN).navigation();
// } else {
// ARouter.getInstance().build(ARouteConstants.SET_YOUTH_PWD_ACTIVITY).withInt("type", SetYouthPasswordActivity.SET_TYPE).navigation();
// }
Intent intent = new Intent(getContext(), WebViewActivity.class);
intent.putExtra("url", CommonAppContext.getInstance().getCurrentEnvironment().getH5Url() + "/web/index.html#/pages/feedback/teenage?id=" + SpUtil.getToken());
intent.putExtra("url", String.format(WebUrlConstants.INSTANCE.getWEB_ADOLESCENT_URL(),SpUtil.getToken()));
getContext().startActivity(intent);
// ARouter.getInstance().build(ARouteConstants.H5).withString("url", CommonAppContext.getInstance().getCurrentEnvironment().getH5Url() + "/web/index.html#/pages/feedback/teenage?id=" + SpUtil.getToken()).navigation();
dismiss();
});

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

@@ -316,9 +316,6 @@
android:layout_height="@dimen/dp_88"
android:layout_marginTop="-25dp"
android:layout_marginEnd="@dimen/dp_5"
android:clickable="true"
android:elevation="9999dp"
android:focusable="true"
android:foreground="?android:attr/selectableItemBackground"
android:translationZ="30dp"
app:layout_constraintDimensionRatio="1:1"

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

@@ -67,7 +67,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/dp_76"
android:layout_gravity="center"
android:layout_marginTop="@dimen/dp_48"
android:layout_marginTop="@dimen/dp_60"
android:paddingStart="@dimen/dp_16"
android:layout_weight="1"
android:gravity="center|left"
@@ -444,6 +444,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:visibility="gone"
android:layout_weight="1"
android:gravity="center"
android:background="@color/transparent"
@@ -848,7 +849,7 @@
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical"
android:visibility="visible">
android:visibility="invisible">
<ImageView
android:layout_width="@dimen/dp_24"
@@ -869,6 +870,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:layout_marginTop="@dimen/dp_15"
android:orientation="horizontal">

10
app/build.gradle
View File

@@ -56,10 +56,10 @@ android {
applicationIdSuffix ""
// // 测试版包名：基础包名 + .beta（com.example.myapp.beta）
// applicationIdSuffix ".beta.b"
// // 测试版版本名：1.0-beta
// versionNameSuffix "-beta.b"
// 【正式版应用名称】通过resValue动态生成string资源
resValue "string", "app_name", "羽声语音"
// resValue "string", "app_name", "羽声语音APP"
// 【正式版图标】替换manifest中的占位符（使用main目录下的正式图标）
manifestPlaceholders = [
@@ -116,7 +116,10 @@ android {
if (outputFile != null && outputFile.name.endsWith('.apk')) {
def versionName = variant.versionName
def versionCode = variant.versionCode
def fileName = "羽声_${versionName}_${versionCode}.apk"
// 获取当前时间戳（格式：yyyyMMddHHmmss）
def buildTimes = new Date().format("yyyy-MM-dd_HH_mm_ss")
// def fileName = "羽声_${versionName}_${buildTimes}.apk"
def fileName = "羽声_${buildTimes}.apk"
output.outputFileName = fileName
}
}
@@ -176,6 +179,7 @@ android {
}
dependencies {
implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
// implementation fileTree(dir: '../LocalAar/aar_libs', include: ['*.jar', '*.aar'] dir: 'libs')

6
app/src/main/java/com/qxcm/qxlive/LaunchPageActivity.java
View File

@@ -20,6 +20,7 @@ import com.xscm.moduleutil.base.AppStateListener;
import com.xscm.moduleutil.base.AppStateManager;
import com.xscm.moduleutil.base.CommonAppContext;
import com.xscm.modulemain.dialog.PolicyDialog;
import com.xscm.moduleutil.base.WebUrlConstants;
import com.xscm.moduleutil.utils.ARouteConstants;
import com.xscm.moduleutil.utils.SpUtil;
/**
@@ -72,11 +73,8 @@ public class LaunchPageActivity extends BaseMvpActivity<IPresenter,ActivityLaunc
if (!isTaskRoot()) {
if (SpUtil.getUnderagePassword() != null && !SpUtil.getUnderagePassword().isEmpty()) {
// ARouter.getInstance().build(ARouteConstants.H5).withString("url", CommonAppContext.getInstance().getCurrentEnvironment().getH5Url() + "/web/index.html#/pages/feedback/teenage?id=" + SpUtil.getToken())
// .withString("type", "1").navigation();//type==1：青少年模式
Intent intent = new Intent(this, WebViewActivity.class);
intent.putExtra("url", CommonAppContext.getInstance().getCurrentEnvironment().getH5Url() + "/web/index.html#/pages/feedback/teenage?id=" + SpUtil.getToken());
intent.putExtra("url", String.format(WebUrlConstants.INSTANCE.getWEB_ADOLESCENT_URL(),SpUtil.getToken()));
intent.putExtra("title", "1");
startActivity(intent);
} else {