diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/adapter/GiftTwoAdapter.java b/BaseModule/src/main/java/com/xscm/moduleutil/adapter/GiftTwoAdapter.java index 24472f5f..3c2d34be 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/adapter/GiftTwoAdapter.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/adapter/GiftTwoAdapter.java @@ -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())); //设置 diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/adapter/GiftTwoDetailsFragment.java b/BaseModule/src/main/java/com/xscm/moduleutil/adapter/GiftTwoDetailsFragment.java index f82b9d8e..3762e84b 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/adapter/GiftTwoDetailsFragment.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/adapter/GiftTwoDetailsFragment.java @@ -293,7 +293,7 @@ public class GiftTwoDetailsFragment extends BaseMvpFragment= 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(); } diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/base/ExternalResConstants.kt b/BaseModule/src/main/java/com/xscm/moduleutil/base/ExternalResConstants.kt new file mode 100644 index 00000000..a839a14f --- /dev/null +++ b/BaseModule/src/main/java/com/xscm/moduleutil/base/ExternalResConstants.kt @@ -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====================================================================================== +} \ No newline at end of file diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/base/WebUrlConstants.kt b/BaseModule/src/main/java/com/xscm/moduleutil/base/WebUrlConstants.kt new file mode 100644 index 00000000..706379aa --- /dev/null +++ b/BaseModule/src/main/java/com/xscm/moduleutil/base/WebUrlConstants.kt @@ -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" + +} \ No newline at end of file diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/bean/RoonGiftModel.java b/BaseModule/src/main/java/com/xscm/moduleutil/bean/RoonGiftModel.java index 75200f02..68471956 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/bean/RoonGiftModel.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/bean/RoonGiftModel.java @@ -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：锁 diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/dialog/FirstChargeDialog.java b/BaseModule/src/main/java/com/xscm/moduleutil/dialog/FirstChargeDialog.java index d5441b58..c351c943 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/dialog/FirstChargeDialog.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/dialog/FirstChargeDialog.java @@ -191,7 +191,8 @@ public class FirstChargeDialog extends BaseDialog { // 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()); diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/interfaces/SoundLevelUpdateListener.java b/BaseModule/src/main/java/com/xscm/moduleutil/interfaces/SoundLevelUpdateListener.java index d0c0a255..4250b6c0 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/interfaces/SoundLevelUpdateListener.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/interfaces/SoundLevelUpdateListener.java @@ -10,4 +10,6 @@ public interface SoundLevelUpdateListener { void userJoined(int userId,int elapsd); void userOffline(int userId,int reason); + + void pkOffSide(int userId); } diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/rtc/AgoraManager.java b/BaseModule/src/main/java/com/xscm/moduleutil/rtc/AgoraManager.java index 4e932288..942524ac 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/rtc/AgoraManager.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/rtc/AgoraManager.java @@ -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 } } diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/rtc/AgoraManagerEx.java b/BaseModule/src/main/java/com/xscm/moduleutil/rtc/AgoraManagerEx.java index 7d41c1b9..44b49a21 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/rtc/AgoraManagerEx.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/rtc/AgoraManagerEx.java @@ -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()); } diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/utils/ImageUtils.java b/BaseModule/src/main/java/com/xscm/moduleutil/utils/ImageUtils.java index 68988f01..8d0b3cc7 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/utils/ImageUtils.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/utils/ImageUtils.java @@ -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) { diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/utils/MeHeadView.java b/BaseModule/src/main/java/com/xscm/moduleutil/utils/MeHeadView.java index b68dbb3b..473aff9f 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/utils/MeHeadView.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/utils/MeHeadView.java @@ -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); diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java b/BaseModule/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java index 4a6dd906..2c5db5f9 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java @@ -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;//服务器地址 diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/widget/BaseWheatView.java b/BaseModule/src/main/java/com/xscm/moduleutil/widget/BaseWheatView.java index aeff15c4..9dda3b28 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/widget/BaseWheatView.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/widget/BaseWheatView.java @@ -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); + } + } }); } diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomDefaultWheatView.java b/BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomDefaultWheatView.java index 2807a5fa..41ad3b55 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomDefaultWheatView.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomDefaultWheatView.java @@ -263,6 +263,11 @@ public class RoomDefaultWheatView extends BaseWheatView { } + @Override + public void pkOffSide(int uid) { + + } + @Override public void unRegister(Object obj) { diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomFriendshipWheatView.java b/BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomFriendshipWheatView.java index 6e3da279..72f35229 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomFriendshipWheatView.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomFriendshipWheatView.java @@ -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())) { diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomKtvWheatView.java b/BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomKtvWheatView.java index 459f8c20..300c6f21 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomKtvWheatView.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomKtvWheatView.java @@ -270,6 +270,11 @@ public class RoomKtvWheatView extends BaseWheatView { } } + @Override + public void pkOffSide(int uid) { + + } + @Override public void unRegister(Object obj) { diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomMakeWheatView.java b/BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomMakeWheatView.java index d2877a3f..f6270749 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomMakeWheatView.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomMakeWheatView.java @@ -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())) { diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomSingSongWheat2View.java b/BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomSingSongWheat2View.java index 81c1a153..12ae4b30 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomSingSongWheat2View.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomSingSongWheat2View.java @@ -290,6 +290,11 @@ public class RoomSingSongWheat2View extends BaseWheatView { // 暂无实现 } + @Override + public void pkOffSide(int uid) { + + } + @Override public void unRegister(Object obj) { diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomSingSongWheatView.java b/BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomSingSongWheatView.java index cca454c6..651efa20 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomSingSongWheatView.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomSingSongWheatView.java @@ -281,4 +281,9 @@ public class RoomSingSongWheatView extends BaseWheatView { public void userOffline(int userId, int reason) { } + + @Override + public void pkOffSide(int uid) { + + } } diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/widget/ShineTextView.kt b/BaseModule/src/main/java/com/xscm/moduleutil/widget/ShineTextView.kt index fac5d00b..7792bc02 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/widget/ShineTextView.kt +++ b/BaseModule/src/main/java/com/xscm/moduleutil/widget/ShineTextView.kt @@ -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 diff --git a/BaseModule/src/main/res/layout/room_gv_gift_item.xml b/BaseModule/src/main/res/layout/room_gv_gift_item.xml index 3c32cbfb..be923d12 100644 --- a/BaseModule/src/main/res/layout/room_gv_gift_item.xml +++ b/BaseModule/src/main/res/layout/room_gv_gift_item.xml @@ -20,11 +20,9 @@ diff --git a/MainModule/build.gradle b/MainModule/build.gradle index b44aa45b..1c1c881c 100644 --- a/MainModule/build.gradle +++ b/MainModule/build.gradle @@ -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' // ⚠️ 添加这一行 \ No newline at end of file diff --git a/MainModule/src/main/java/com/xscm/modulemain/BaseMvpActivity.java b/MainModule/src/main/java/com/xscm/modulemain/BaseMvpActivity.java index 5937ca3c..7b3bdf90 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/BaseMvpActivity.java +++ b/MainModule/src/main/java/com/xscm/modulemain/BaseMvpActivity.java @@ -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

implements HomeContacts.View, View.OnClickListener, LocationProvider.LocationCallback { private static int index = -1; diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt index 57749eee..9e7c3c12 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt @@ -888,7 +888,7 @@ class RoomActivity : BaseMvpActivity(), 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(), 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(), publicScreenFragment!!.upRoomInfo(resp) } AgoraManager.stopMuisc() - initializeAudio() + initializeAudio(isSwitchRoomType) toutiao() upRoomInfo(resp) instView() @@ -1565,7 +1565,6 @@ class RoomActivity : BaseMvpActivity(), 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(), 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(), 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(), 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(), 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(), } else { AgoraManagerEx.getInstance().muteLocalAudioStreamEx(false) } + } catch (e: Exception) { // Handle exception LogUtils.e("handleMsgType125: " + e.message) @@ -2229,6 +2233,7 @@ class RoomActivity : BaseMvpActivity(), 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(), 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(), 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(), 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(), 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(), 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(), } 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(), 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(), * @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(), } is RoomHourBean.RoomListBean -> { + ClickUtils.clearAllClickRecords() AgoraManager.getInstance().cleanup() roomId = event.room_id isSwitchRoom = true @@ -3502,45 +3529,8 @@ class RoomActivity : BaseMvpActivity(), 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(), } this.mRoomInfoResp = resp - setView(resp) + setView(resp,true) } fun upHeight() { @@ -4324,6 +4314,14 @@ class RoomActivity : BaseMvpActivity(), } } + 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 diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomFragment.java index 20b35ee3..a44c5c78 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomFragment.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomFragment.java @@ -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 { 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 -> { diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/PersonalityActivity.java b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/PersonalityActivity.java index 64b992ad..06fbf524 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/PersonalityActivity.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/PersonalityActivity.java @@ -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 { 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); }); diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/SettingActivity.java b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/SettingActivity.java index 02b68bbc..ea744250 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/SettingActivity.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/SettingActivity.java @@ -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() { -// @Override -// public void onResourceReady(@NonNull Drawable resource, @Nullable Transition 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 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() { -// @Override -// public void onResourceReady(@NonNull Drawable drawable, @Nullable Transition 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 = ""; //前面加一个铃铛 -// 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 = ""; //前面加一个铃铛 -// 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; } } diff --git a/MainModule/src/main/java/com/xscm/modulemain/adapter/RoomOnlineAdapter.java b/MainModule/src/main/java/com/xscm/modulemain/adapter/RoomOnlineAdapter.java index fcc919a0..fb9751c3 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/adapter/RoomOnlineAdapter.java +++ b/MainModule/src/main/java/com/xscm/modulemain/adapter/RoomOnlineAdapter.java @@ -102,8 +102,11 @@ public class RoomOnlineAdapter extends BaseMultiItemQuickAdapter { 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() ); diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/YouthModelDialog.java b/MainModule/src/main/java/com/xscm/modulemain/dialog/YouthModelDialog.java index 3b67eebf..424d684b 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/dialog/YouthModelDialog.java +++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/YouthModelDialog.java @@ -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 { 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(); }); diff --git a/MainModule/src/main/res/layout/fragment_room_ktv.xml b/MainModule/src/main/res/layout/fragment_room_ktv.xml index 2fce8a88..f5a9ac62 100644 --- a/MainModule/src/main/res/layout/fragment_room_ktv.xml +++ b/MainModule/src/main/res/layout/fragment_room_ktv.xml @@ -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" diff --git a/MainModule/src/main/res/layout/fragment_vocal_range.xml b/MainModule/src/main/res/layout/fragment_vocal_range.xml index 8cf589ef..29b97210 100644 --- a/MainModule/src/main/res/layout/fragment_vocal_range.xml +++ b/MainModule/src/main/res/layout/fragment_vocal_range.xml @@ -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"> diff --git a/app/build.gradle b/app/build.gradle index ddd021e9..9ddbd701 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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') diff --git a/app/src/main/java/com/qxcm/qxlive/LaunchPageActivity.java b/app/src/main/java/com/qxcm/qxlive/LaunchPageActivity.java index 163e95ff..017610e1 100644 --- a/app/src/main/java/com/qxcm/qxlive/LaunchPageActivity.java +++ b/app/src/main/java/com/qxcm/qxlive/LaunchPageActivity.java @@ -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