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

Compare commits

base: YUSHENG:96e3c86cd45f9736bef33da4ac1a7e4c5eb1eb6a
Branches Tags
YUSHENG:master YUSHENG:branch_new YUSHENG:branch_new_dev YUSHENG:dev-lxj YUSHENG:dev-lxj-beta
YUSHENG:1.0.0
...
compare: YUSHENG:8712d366d2a46ad6ae22931a0d1071cf5ecf1b18
Branches Tags
YUSHENG:branch_new YUSHENG:branch_new_dev YUSHENG:dev-lxj YUSHENG:dev-lxj-beta YUSHENG:master
YUSHENG:1.0.0

2 Commits
96e3c86cd4 ... 8712d366d2

Author SHA1 Message Date
梁小江
8712d366d2 添加了清除缓存，存在BUG 2025-08-20 21:36:54 +08:00
梁小江
ae088a1a7a 添加了清除缓存，存在BUG 2025-08-20 21:23:22 +08:00
94 changed files with 283919 additions and 281547 deletions
Expand all files Collapse all files

2
.idea/.name generated
View File

@@ -1 +1 @@
qxLive
羽声语音

4
.idea/deploymentTargetSelector.xml generated
View File

@@ -4,10 +4,10 @@
<selectionStates>
<SelectionState runConfigName="app">
<option name="selectionMode" value="DROPDOWN" />
<DropdownSelection timestamp="2025-08-08T09:42:40.742364300Z">
<DropdownSelection timestamp="2025-08-18T09:37:53.809482100Z">
<Target type="DEFAULT_BOOT">
<handle>
<DeviceId pluginId="PhysicalDevice" identifier="serial=6705124a" />
<DeviceId pluginId="PhysicalDevice" identifier="serial=88Y4C19912006888" />
</handle>
</Target>
</DropdownSelection>

22
app/build.gradle
View File

@@ -25,7 +25,8 @@ android {
javaCompileOptions {
annotationProcessorOptions {
arguments = [
AROUTER_MODULE_NAME: project.getName()
AROUTER_MODULE_NAME: project.getName(),
AROUTER_GENERATE_DOCUMENT: "disable" // 设置为"disable"可以减少日志
]
}
}
@@ -55,6 +56,10 @@ android {
}
buildTypes {
release {
packagingOptions {
jniLibs.useLegacyPackaging = false
}
debuggable false
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
signingConfig signingConfigs.release
@@ -76,8 +81,11 @@ android {
}
debug {
packagingOptions {
jniLibs.useLegacyPackaging = true
}
debuggable true
minifyEnabled true
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
signingConfig signingConfigs.debug
@@ -118,11 +126,11 @@ android {
kotlinOptions {
jvmTarget = '17'
}
dexOptions {
dexInProcess true
preDexLibraries true
javaMaxHeapSize "6g"
}
// dexOptions {
// dexInProcess true
// preDexLibraries true
// javaMaxHeapSize "6g"
// }
}

33731
app/proguard/mapping.txt
View File

File diff suppressed because it is too large Load Diff

528190
app/proguard/seeds.txt
View File

File diff suppressed because it is too large Load Diff

10
app/release/output-metadata.json
View File

@@ -11,9 +11,9 @@
"type": "SINGLE",
"filters": [],
"attributes": [],
"versionCode": 6,
"versionName": "1.0.5",
"outputFile": "羽声_1.0.5_6.apk"
"versionCode": 32,
"versionName": "1.0.4",
"outputFile": "羽声_1.0.4_32.apk"
}
],
"elementType": "File",
@@ -22,14 +22,14 @@
"minApi": 28,
"maxApi": 30,
"baselineProfiles": [
"baselineProfiles/1/羽声_1.0.5_6.dm"
"baselineProfiles/1/羽声_1.0.4_32.dm"
]
},
{
"minApi": 31,
"maxApi": 2147483647,
"baselineProfiles": [
"baselineProfiles/0/羽声_1.0.5_6.dm"
"baselineProfiles/0/羽声_1.0.4_32.dm"
]
}
],

37
app/release/release/output-metadata.json
View File

@@ -1,37 +0,0 @@
{
"version": 3,
"artifactType": {
"type": "APK",
"kind": "Directory"
},
"applicationId": "com.qxcm.qxlive",
"variantName": "release",
"elements": [
{
"type": "SINGLE",
"filters": [],
"attributes": [],
"versionCode": 20,
"versionName": "1.0.2.8",
"outputFile": "羽声_1.0.2.8_20.apk"
}
],
"elementType": "File",
"baselineProfiles": [
{
"minApi": 28,
"maxApi": 30,
"baselineProfiles": [
"baselineProfiles/1/羽声_1.0.2.8_20.dm"
]
},
{
"minApi": 31,
"maxApi": 2147483647,
"baselineProfiles": [
"baselineProfiles/0/羽声_1.0.2.8_20.dm"
]
}
],
"minSdkVersionForDexing": 24
}

17
app/src/main/AndroidManifest.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.qxcm.qxlive">
>
<!-- Features -->
<!-- Features -->
@@ -95,7 +95,6 @@
<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"
tools:ignore="ProtectedPermissions"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.CAMERA"/>
<!-- <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"-->
<!-- android:required="false"-->
<!-- android:maxSdkVersion="32"/>-->
@@ -119,7 +118,6 @@
<application
android:name="AppContext"
android:allowBackup="true"
android:extractNativeLibs="true"
android:largeHeap="true"
android:dataExtractionRules="@xml/data_extraction_rules"
android:fullBackupContent="@xml/backup_rules"
@@ -203,6 +201,19 @@
<activity
android:name=".PasswordLoginActivity"
android:exported="true" />
<!-- <service-->
<!-- android:name="leakcanary.internal.HeapAnalyzerService"-->
<!-- android:process=":leakcanary"-->
<!-- android:exported="false"/>-->
<!-- <provider-->
<!-- android:name="leakcanary.internal.PlumberInstaller"-->
<!-- android:authorities="${applicationId}.plumber-installer"-->
<!-- android:process=":leakcanary"-->
<!-- android:exported="false"/>-->
</application>
<!-- <queries>-->
<!-- &lt;!&ndash; 支付宝 scheme &ndash;&gt;-->

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

@@ -16,11 +16,8 @@ import com.qxcm.qxlive.databinding.ActivityLaunchPageBinding;
public class LaunchPageActivity extends BaseAppCompatActivity<ActivityLaunchPageBinding> {
private Handler handler;
// public PhoneNumberAuthHelper phoneNumberAuthHelper;
// private TokenResultListener tokenResultListener;
private boolean canOnePass;
private boolean isCanOnePass = true;
private String city1="";
private PolicyDialog policyDialog;
@Override
protected void initData() {
handler = new Handler();
@@ -35,7 +32,7 @@ public class LaunchPageActivity extends BaseAppCompatActivity<ActivityLaunchPage
// //延迟1.5秒执行
handler.postDelayed(runnable, 2500);
} else {
PolicyDialog policyDialog = new PolicyDialog(this);
policyDialog = new PolicyDialog(this);
policyDialog.setCancelable(false);
policyDialog.setCanceledOnTouchOutside(false);
policyDialog.setPolicyClickListener(new PolicyDialog.PolicyClickListener() {
@@ -56,14 +53,33 @@ public class LaunchPageActivity extends BaseAppCompatActivity<ActivityLaunchPage
}
// 添加 onDestroy 方法来处理对话框
@Override
protected void onDestroy() {
// 如果 PolicyDialog 仍在显示，则 dismiss 它
if (policyDialog != null && policyDialog.isShowing()) {
policyDialog.dismiss();
policyDialog = null;
}
// 移除所有待处理的回调以防止内存泄漏
if (handler != null) {
handler.removeCallbacksAndMessages(null);
}
super.onDestroy();
}
@Override
protected void initView() {
}
private void initLogin() {
// 在启动新 Activity 前先关闭对话框
if (policyDialog != null && policyDialog.isShowing()) {
policyDialog.dismiss();
policyDialog = null;
}
startActivity(new Intent(this, PasswordLoginActivity.class));
finish();
}
@@ -78,18 +94,11 @@ public class LaunchPageActivity extends BaseAppCompatActivity<ActivityLaunchPage
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (!this.isTaskRoot()) {
Intent intent = getIntent();
if (intent != null) {
String action = intent.getAction();
if (intent.hasCategory(Intent.CATEGORY_LAUNCHER) && Intent.ACTION_MAIN.equals(action)) {
finish();
return;
}
}
if (!isTaskRoot()) {
finish();
return;
}
}
}

35
app/src/main/java/com/qxcm/qxlive/PasswordLoginActivity.java
View File

@@ -2,6 +2,8 @@ package com.qxcm.qxlive;
import static android.view.View.VISIBLE;
import static com.liulishuo.okdownload.OkDownloadProvider.context;
import android.content.Intent;
import android.graphics.Color;
import android.os.Build;
@@ -16,6 +18,7 @@ import android.view.View;
import android.widget.ImageView;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import com.alibaba.fastjson.JSON;
import com.alipay.sdk.app.AuthTask;
@@ -350,8 +353,10 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
.setSwitchAccTextSize(12)
.setSwitchOffsetY(390)
//协议栏
.setAppPrivacyOne("《用户协议》", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl()+"/api/Page/page_show?id=6")
.setAppPrivacyTwo("《隐私协议》", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl()+"/api/Page/page_show?id=4")
.setAppPrivacyOne("《用户协议》", "file:///android_asset/page_yongh.html")
.setAppPrivacyTwo("《隐私协议》", "file:///android_asset/page_show.html")
// .setAppPrivacyOne("《用户协议》", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl()+"/api/Page/page_show?id=6")
// .setAppPrivacyTwo("《隐私协议》", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl()+"/api/Page/page_show?id=4")
.setAppPrivacyColor(Color.parseColor("#A8A8A8"), Color.parseColor("#FFBC00"))
.setPrivacyBefore("登录即代表同意")
.setPrivacyEnd("并授权获得号码")
@@ -464,15 +469,35 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
ToastUtils.show("请先勾选服务条款");
return;
}
MvpPre.authorization("zfb");
new AlertDialog.Builder(this)
.setTitle("提示")
.setMessage("即将打开支付宝，是否继续？")
.setPositiveButton("确定", (dialog, which) -> {
// 执行打开微信的操作
MvpPre.authorization("zfb");
})
.setNegativeButton("取消", null)
.show();
// MvpPre.authorization(SHARE_MEDIA.QQ);
} else if (id == R.id.iv_weixin) {
if (!mBinding.cbPrivacy.isChecked()) {
ToastUtils.show("请先勾选服务条款");
return;
}
// MvpPre.authorization("wx");
wcLogin();
// 在需要点击打开微信的事件中添加以下代码
new AlertDialog.Builder(this)
.setTitle("提示")
.setMessage("即将打开微信，是否继续？")
.setPositiveButton("确定", (dialog, which) -> {
// 执行打开微信的操作
wcLogin();
})
.setNegativeButton("取消", null)
.show();
} else if (id == R.id.tv_send_code) {
String phone = mBinding.edPhone.getText().toString().trim();
if (TextUtils.isEmpty(phone)) {

7
gradle.properties
View File

@@ -6,7 +6,8 @@
# http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx3072m -XX:MaxPermsize=512m -Xx:+HeapDumponOutofMemoryError -Dfile.encoding=UTF-8
#org.gradle.jvmargs=-Xmx3072m -XX:MaxPermsize=512m -Xx:+HeapDumponOutofMemoryError -Dfile.encoding=UTF-8
org.gradle.jvmargs=-Xmx3072m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. For more details, visit
# https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects
@@ -29,8 +30,8 @@ isBuildModule=false
#org.gradle.deamon=false
android.injected.testOnly=false
APP_VERSION_NAME=1.0.3
APP_VERSION_CODE=22
APP_VERSION_NAME=1.0.4
APP_VERSION_CODE=32
org.gradle.jvm.toolchain.useLegacyAdapters=false
#org.gradle.java.home=C\:\\Users\\qx\\.jdks\\ms-17.0.15

24
moduleLogin/src/main/java/com/qxcm/modulelogin/activity/SwitchAccountsActivity.java
View File

@@ -37,17 +37,23 @@ public class SwitchAccountsActivity extends BaseMvpActivity<LoginPresenter, Acti
protected void initData() {
mBinding.topBar.setTitle("选择账号");
Bundle bundle = getIntent().getExtras();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
if (bundle != null) {
Object serializable = bundle.getSerializable("userbean", null);
if (serializable instanceof List<?>) {
userBeanList = (List<UserBean>) serializable;
if (bundle != null) {
try {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
// 使用正确的类引用
userBeanList = (List<UserBean>) bundle.getSerializable("userBean");
} else {
// 可选：记录错误或提示
Log.e("UserBeanError", "Expected List<UserBean> but got: " + (serializable != null ? serializable.getClass().getName() : "null"));
Object serializable = bundle.getSerializable("userBean");
if (serializable instanceof List<?>) {
// 进一步检查列表元素类型（可选但更安全）
List<?> tempList = (List<?>) serializable;
if (tempList.isEmpty() || tempList.get(0) instanceof UserBean) {
userBeanList = (List<UserBean>) tempList;
}
}
}
} else {
Log.e("UserBeanError", "Bundle is null");
} catch (Exception e) {
Log.e("UserBeanError", "Failed to deserialize userBean list", e);
}
}
if (userBeanList!=null&&userBeanList.size()>0){

6
moduleLogin/src/main/java/com/qxcm/modulelogin/adapter/SwitchAccountsAdapter.java
View File

@@ -1,6 +1,7 @@
package com.qxcm.modulelogin.adapter;
import android.widget.ImageView;
import android.widget.TextView;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
@@ -33,12 +34,11 @@ public class SwitchAccountsAdapter extends BaseQuickAdapter<UserBean, BaseViewHo
@Override
protected void convert(BaseViewHolder helper, UserBean item) {
ImageUtils.loadHeadCC(item.getAvatar(), helper.getView(R.id.im_user));
ImageUtils.loadHeadCC(item.getAvatar(), helper.getView(R.id.im_user2));
helper.setText(R.id.tv_nick_name, item.getNickname());
ImageView imageView= helper.getView(R.id.im_g);
TextView imageView= helper.getView(R.id.im_g);
// 根据 type 设置图片资源
// 根据 type 和 status 设置图片资源
imageView.setImageResource(com.qxcm.moduleutil.R.mipmap.yigz);
// 设置点击事件
imageView.setOnClickListener(v -> {
if (onItemClickListener != null) {

13
moduleLogin/src/main/java/com/qxcm/modulelogin/present/LoginPresenter.java
View File

@@ -31,6 +31,8 @@ import com.tencent.mm.opensdk.openapi.IWXAPI;
import org.greenrobot.eventbus.EventBus;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -232,7 +234,8 @@ public class LoginPresenter extends BasePresenter<LoginContacter.View> implement
} else {
Intent intent = new Intent(com.blankj.utilcode.util.ActivityUtils.getTopActivity(), SwitchAccountsActivity.class);
Bundle bundle = new Bundle();
bundle.putSerializable("userBean", userBean.get(0));
// bundle.putSerializable("userBean", (Serializable) userBean);
intent.putExtra("userBean", (ArrayList<UserBean>) userBean);
intent.putExtras(bundle);
com.blankj.utilcode.util.ActivityUtils.startActivity(intent);
com.blankj.utilcode.util.ActivityUtils.getTopActivity().finish();
@@ -274,10 +277,14 @@ public class LoginPresenter extends BasePresenter<LoginContacter.View> implement
}
public void ysxl() {
ARouter.getInstance().build(ARouteConstants.H5).withString("url",CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl() + "/api/Page/page_show?id=4").withString("title", "隐私协议").navigation();
// ARouter.getInstance().build(ARouteConstants.H5).withString("url",CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl() + "/api/Page/page_show?id=4").withString("title", "隐私协议").navigation();
ARouter.getInstance().build(ARouteConstants.H5).withString("url", "file:///android_asset/page_show.html").withString("title", "隐私协议").navigation();
}
public void yhxy() {
ARouter.getInstance().build(ARouteConstants.H5).withString("url", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl() + "/api/Page/page_show?id=6").withString("title", "用户协议").navigation();
// ARouter.getInstance().build(ARouteConstants.H5).withString("url", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl() + "/api/Page/page_show?id=6").withString("title", "用户协议").navigation();
ARouter.getInstance().build(ARouteConstants.H5).withString("url", "file:///android_asset/page_yongh.html").withString("title", "用户协议").navigation();
}
}

39
moduleLogin/src/main/res/layout/item_switch_accounts.xml
View File

@@ -6,32 +6,49 @@
android:orientation="vertical">
<LinearLayout
<RelativeLayout
android:id="@+id/ll_szmm"
style="@style/My_Info_Item_LL_Style"
android:background="@drawable/bg_r15_white">
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/dp_5"
android:paddingBottom="@dimen/dp_5"
android:background="@drawable/bg_r15_white"
android:layout_gravity="center"
android:gravity="center"
android:layout_marginTop="@dimen/dp_10">
<com.qxcm.moduleutil.widget.GifAvatarOvalView
android:id="@+id/im_user"
android:id="@+id/im_user2"
android:layout_width="@dimen/dp_50"
android:layout_height="@dimen/dp_50"
android:layout_alignParentStart="true"
android:layout_centerInParent="true"
android:layout_gravity="center"
android:layout_marginRight="10dp"
android:layout_marginEnd="@dimen/dp_10"
android:layout_marginStart="@dimen/dp_10"
android:src="@mipmap/me_img_upld_head" />
<TextView
android:id="@+id/tv_nick_name"
style="@style/My_Info_Item_Title_Style"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/sp_14"
android:textColor="@color/color_text"
android:layout_toRightOf="@+id/im_user2"
android:layout_centerInParent="true"
tools:text="@string/set_password" />
<ImageView
<TextView
android:id="@+id/im_g"
android:layout_width="@dimen/dp_79"
android:layout_width="@dimen/dp_60"
android:layout_height="@dimen/dp_31"
android:layout_marginEnd="@dimen/dp_16"
android:layout_gravity="center"
android:background="@drawable/cs"
android:layout_centerInParent="true"
android:layout_alignParentEnd="true"
android:text="登录"
android:gravity="center"
/>
</LinearLayout>
</RelativeLayout>
</LinearLayout>

3
moduleUtil/build.gradle
View File

@@ -205,7 +205,8 @@ dependencies {
api 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5'
api 'io.github.mayzs:paho.mqtt.android:1.2.1'
// api project(':LocalAar')
/// 内存泄露的方法
// debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.14'
//2. 云normal SDK，
//aar的名称，例如：WbCloudNormal-v5.1.10-123456789.aar，填入 'WbCloudNormal-v5.1.10-123456789.aar'
}

18
moduleUtil/src/main/AndroidManifest.xml
View File

@@ -8,20 +8,12 @@
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<application android:allowBackup="true">
<service
android:name=".service.MyRoomService"
android:enabled="true"
android:exported="true"></service>
<activity
android:name=".activity.QxActivity"
android:exported="false" />
<service
android:name=".http.FloatingWindowService"
android:enabled="true"
android:exported="true"
android:foregroundServiceType="specialUse" />
<!-- <service-->
<!-- android:name=".http.FloatingWindowService"-->
<!-- android:enabled="true"-->
<!-- android:exported="true"-->
<!-- android:foregroundServiceType="specialUse" />-->
<activity
android:name=".activity.WebViewActivity"

4
moduleUtil/src/main/assets/page_show.html Normal file
View File

File diff suppressed because one or more lines are too long

3
moduleUtil/src/main/assets/page_yongh.html Normal file
View File

File diff suppressed because one or more lines are too long

42
moduleUtil/src/main/java/com/qxcm/moduleutil/activity/BaseAppCompatActivity.java
View File

@@ -2,8 +2,10 @@ package com.qxcm.moduleutil.activity;
import static com.liulishuo.okdownload.OkDownloadProvider.context;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.res.Resources;
import android.graphics.drawable.Drawable;
import android.net.Uri;
@@ -22,16 +24,21 @@ import androidx.databinding.DataBindingUtil;
import androidx.databinding.ViewDataBinding;
import com.alibaba.android.arouter.launcher.ARouter;
import com.blankj.utilcode.util.ActivityUtils;
import com.blankj.utilcode.util.BarUtils;
import com.petterp.floatingx.FloatingX;
import com.petterp.floatingx.assist.helper.FxAppHelper;
import com.qxcm.moduleutil.R;
import com.qxcm.moduleutil.base.CommonAppContext;
import com.qxcm.moduleutil.event.MqttBean;
import com.qxcm.moduleutil.utils.ARouteConstants;
import com.qxcm.moduleutil.utils.BackgroundManager;
import com.qxcm.moduleutil.utils.ColorManager;
import com.qxcm.moduleutil.utils.DisplayUtil;
import com.qxcm.moduleutil.utils.LanguageUtil;
import com.qxcm.moduleutil.utils.SpUtil;
import com.qxcm.moduleutil.widget.PiaoPingManager;
import com.tencent.qcloud.tuikit.tuichat.bean.ChatInfo;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
@@ -54,7 +61,26 @@ public abstract class BaseAppCompatActivity<VDB extends ViewDataBinding> extends
// private LoadingDialog mLoadingDialog;
// 添加广播接收器成员变量
private BroadcastReceiver mLogoutReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
if ("com.qxcm.moduleutil.ACTION_USER_LOGOUT".equals(intent.getAction())) {
// 在这里处理用户登出后的UI更新
// 例如：隐藏需要登录才能显示的控件
// 或者跳转到登录状态的页面
handleUserLogout();
}
}
};
// 处理用户登出的方法
protected void handleUserLogout() {
// 子类可以重写此方法处理具体的登出逻辑
// 例如：更新UI状态、清除本地数据等
ActivityUtils.finishAllActivities();
}
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -82,6 +108,9 @@ public abstract class BaseAppCompatActivity<VDB extends ViewDataBinding> extends
// 应用当前颜色
applyCurrentColors();
// 注册登出广播接收器
IntentFilter filter = new IntentFilter("com.qxcm.moduleutil.ACTION_USER_LOGOUT");
registerReceiver(mLogoutReceiver, filter);
// 动态判断是否包含 @Subscribe 注解的方法
boolean hasSubscribeMethods = false;
@@ -232,6 +261,13 @@ public abstract class BaseAppCompatActivity<VDB extends ViewDataBinding> extends
if (EventBus.getDefault().isRegistered(this)) {
EventBus.getDefault().unregister(this);
}
try {
unregisterReceiver(mLogoutReceiver);
} catch (Exception e) {
// 忽略异常
}
super.onDestroy();
}
@@ -304,4 +340,10 @@ public abstract class BaseAppCompatActivity<VDB extends ViewDataBinding> extends
// FxAppHelper fxAppHelper = FxAppHelper.builder().setContext(this).setLayout(R.layout.item_piaoping).build();
// FloatingX.install(fxAppHelper).show();
// }
@Subscribe(threadMode = ThreadMode.MAIN)
public void onEvent(ChatInfo event) {
String id= event.getId().replace("g", "");
ARouter.getInstance().build(ARouteConstants.H5).withString("url", CommonAppContext.getInstance().getCurrentEnvironment().getH5Url()+"/web/index.html#/pages/union/setGroup?id="+ SpUtil.getToken()+"&guildId="+id).navigation();
}
}

60
moduleUtil/src/main/java/com/qxcm/moduleutil/activity/BaseMvpActivity.java
View File

@@ -108,21 +108,21 @@ public abstract class BaseMvpActivity<P extends IPresenter, VDB extends ViewData
@Override
public void onSuccess() {
LogUtils.e("@@@","成功");
V2TIMUserFullInfo userFullInfo = new V2TIMUserFullInfo();
userFullInfo.setNickname(userBean.getNickname());
userFullInfo.setFaceUrl(userBean.getAvatar());
userFullInfo.setAllowType(userBean.getSex());
V2TIMManager.getInstance().setSelfInfo(userFullInfo, new V2TIMCallback() {
@Override
public void onSuccess() {
LogUtils.e("@@@", "成功");
}
@Override
public void onError(int code, String desc) {
LogUtils.e("@@@", "描述"+desc);
}
});
// V2TIMUserFullInfo userFullInfo = new V2TIMUserFullInfo();
// userFullInfo.setNickname(userBean.getNickname());
// userFullInfo.setFaceUrl(userBean.getAvatar());
// userFullInfo.setAllowType(userBean.getSex());
// V2TIMManager.getInstance().setSelfInfo(userFullInfo, new V2TIMCallback() {
// @Override
// public void onSuccess() {
// LogUtils.e("@@@", "成功");
// }
//
// @Override
// public void onError(int code, String desc) {
// LogUtils.e("@@@", "描述"+desc);
// }
// });
initLocation();
}
});
@@ -176,21 +176,21 @@ public abstract class BaseMvpActivity<P extends IPresenter, VDB extends ViewData
@Subscribe(threadMode = ThreadMode.MAIN)
public void userInfoEvent(UserInfo event) {
V2TIMUserFullInfo userFullInfo = new V2TIMUserFullInfo();
userFullInfo.setNickname(event.getNickname());
userFullInfo.setFaceUrl(event.getAvatar());
userFullInfo.setAllowType(event.getSex());
V2TIMManager.getInstance().setSelfInfo(userFullInfo, new V2TIMCallback() {
@Override
public void onSuccess() {
LogUtils.e("@@@", "成功");
}
@Override
public void onError(int code, String desc) {
LogUtils.e("@@@", "描述"+desc);
}
});
// V2TIMUserFullInfo userFullInfo = new V2TIMUserFullInfo();
// userFullInfo.setNickname(event.getNickname());
// userFullInfo.setFaceUrl(event.getAvatar());
// userFullInfo.setAllowType(event.getSex());
// V2TIMManager.getInstance().setSelfInfo(userFullInfo, new V2TIMCallback() {
// @Override
// public void onSuccess() {
// LogUtils.e("@@@", "成功");
// }
//
// @Override
// public void onError(int code, String desc) {
// LogUtils.e("@@@", "描述"+desc);
// }
// });
}
/**
* 显示全局飘屏消息（支持任意位置飘过）

102
moduleUtil/src/main/java/com/qxcm/moduleutil/activity/WebViewActivity.java
View File

@@ -13,6 +13,7 @@ import android.graphics.Color;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
@@ -68,6 +69,8 @@ public class WebViewActivity extends BaseAppCompatActivity<ActivityWebViewBindin
@Override
protected void initData() {
WebSettings webSettings = mBinding.webView.getSettings();
// 禁用水平滚动
webSettings.setUseWideViewPort(true);
webSettings.setLoadWithOverviewMode(true);
webSettings.setJavaScriptEnabled(true);
@@ -75,14 +78,40 @@ public class WebViewActivity extends BaseAppCompatActivity<ActivityWebViewBindin
//增加JSBridge
mBinding.webView.addJavascriptInterface(new WebAppInterface(this), "Android");
// mBinding.webView.addJavascriptInterface(new WebViewBridgeConfig(title), WebViewBridgeConfig.NAME);
webSettings.setBuiltInZoomControls(false);
webSettings.setSupportZoom(false);
if (title!=null && !title.isEmpty()){
if (title.contains("协议")) {
webSettings.setDisplayZoomControls(false); // 隐藏默认缩放控件
webSettings.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.NORMAL); // 使用正常布局算法
webSettings.setBuiltInZoomControls(false);
webSettings.setSupportZoom(false);
// 重要：设置布局算法为适应屏幕
webSettings.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.TEXT_AUTOSIZING);
// 设置初始缩放
mBinding.webView.setInitialScale(100);
mBinding.webView.getSettings().setUseWideViewPort(false);
}else {
webSettings.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.SINGLE_COLUMN);
}
}else {
webSettings.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.SINGLE_COLUMN);
}
webSettings.setBuiltInZoomControls(true);
webSettings.setSupportZoom(true);
webSettings.setDomStorageEnabled(true);
webSettings.setBlockNetworkImage(false);//解决图片不显示
webSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
webSettings.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.SINGLE_COLUMN);
// webSettings.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.SINGLE_COLUMN);
mBinding.webView.setHorizontalScrollBarEnabled(false);//水平不显示
mBinding.webView.setVerticalScrollBarEnabled(false); //垂直不显示
mBinding.webView.setScrollbarFadingEnabled(false);
mBinding.webView.setScrollContainer(true);
mBinding.webView.setWebViewClient(new WebViewClient());
mBinding.webView.setBackgroundColor(Color.TRANSPARENT);
mBinding.webView.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
@@ -98,6 +127,7 @@ public class WebViewActivity extends BaseAppCompatActivity<ActivityWebViewBindin
// }
// });
mBinding.webView.setWebChromeClient(new WebChromeClient() {
//配置权限（同样在WebChromeClient中实现）
@@ -109,7 +139,32 @@ public class WebViewActivity extends BaseAppCompatActivity<ActivityWebViewBindin
@Override
public void onProgressChanged(WebView view, int newProgress) {
if (title != null && !title.isEmpty()) {
if (title.contains("协议")) {
if (newProgress >= 100) {
// 页面加载完成后调整文本换行
new Handler().postDelayed(new Runnable() {
@Override
public void run() {
// 注入CSS确保文字自动换行
mBinding.webView.loadUrl("javascript:(function() {" +
"var sheets = document.styleSheets;" +
"for (var i = 0; i < sheets.length; i++) {" +
" try {" +
" sheets[i].addRule('*', 'word-wrap: break-word !important; white-space: normal !important; overflow-x: hidden !important;', 0);" +
" } catch(e) {" +
" try {" +
" sheets[i].insertRule('* { word-wrap: break-word !important; white-space: normal !important; overflow-x: hidden !important; }', 0);" +
" } catch(e2) {}" +
" }" +
"}" +
"})()");
}
}, 100);
}
}
}
}
// For Android < 3.0
@@ -142,6 +197,8 @@ public class WebViewActivity extends BaseAppCompatActivity<ActivityWebViewBindin
});
}
private void showFileChooser() {
@@ -190,7 +247,7 @@ public class WebViewActivity extends BaseAppCompatActivity<ActivityWebViewBindin
getWindow().getDecorView().setBackgroundResource(com.qxcm.moduleutil.R.color.white);
title = getIntent().getStringExtra("title");
url = getIntent().getStringExtra("url");
if (title!=null) {
if (title != null) {
if (title.equals("举报") || title.equals("等级") || title.equals("公会") || title.equals("邀请") || title.equals("反馈")) {
mBinding.topBar.setVisibility(GONE);
// mBinding.webView.setPadding(0,20,0,0);
@@ -198,20 +255,19 @@ public class WebViewActivity extends BaseAppCompatActivity<ActivityWebViewBindin
mBinding.topBar.setVisibility(VISIBLE);
mBinding.topBar.setTitle(title);
}
}else {
if (url.equals(CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl()+"/api/Page/page_show?id=6")){
} else {
if (url.equals("file:///android_asset/page_yongh.html")) {
mBinding.topBar.setVisibility(VISIBLE);
mBinding.topBar.setTitle("用户协议");
}else if (url.equals(CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl()+"/api/Page/page_show?id=4")){
} else if (url.equals("file:///android_asset/page_show.html")) {
mBinding.topBar.setVisibility(VISIBLE);
mBinding.topBar.setTitle("隐私协议");
}else {
} else {
mBinding.topBar.setVisibility(GONE);
}
}
}
@Override
@@ -226,6 +282,24 @@ public class WebViewActivity extends BaseAppCompatActivity<ActivityWebViewBindin
mContext = c;
}
@JavascriptInterface
public void adjustTextWrap() {
// 通过 JavaScript 注入 CSS 样式确保文字自动换行
final String javascript = "javascript:(function() {" +
"var style = document.createElement('style');" +
"style.type = 'text/css';" +
"style.innerHTML = '* { word-wrap: break-word; white-space: normal !important; overflow-x: hidden !important; } body { max-width: 100% !important; }';" +
"document.getElementsByTagName('head')[0].appendChild(style);" +
"})()";
((Activity) mContext).runOnUiThread(new Runnable() {
@Override
public void run() {
mBinding.webView.loadUrl(javascript);
}
});
}
// 被 H5 调用的方法
@JavascriptInterface
public void showToast(String toast) {
@@ -254,6 +328,7 @@ public class WebViewActivity extends BaseAppCompatActivity<ActivityWebViewBindin
public void jumpRoomPage(String room_id) {
ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页").withString("roomId", room_id).navigation();
}
@JavascriptInterface
public void jumpWebPage(String objects) {
// ARouter.getInstance().build(ARouteConstants.USER_HOME_PAGE).navigation();
@@ -261,7 +336,7 @@ public class WebViewActivity extends BaseAppCompatActivity<ActivityWebViewBindin
}
@JavascriptInterface
public void enterGroupChat(String group_id,String cover,String guild_name) {
public void enterGroupChat(String group_id, String cover, String guild_name) {
Intent intent = new Intent(mContext, TUIGroupChatActivity.class);
intent.putExtra(TUIConstants.TUIChat.CHAT_ID, group_id);
intent.putExtra(TUIConstants.TUIChat.CHAT_TYPE, V2TIMConversation.V2TIM_GROUP);
@@ -269,14 +344,15 @@ public class WebViewActivity extends BaseAppCompatActivity<ActivityWebViewBindin
}
@JavascriptInterface
public void chatWithUser(String user_id,String nickname) {
public void chatWithUser(String user_id, String nickname) {
Intent intent = new Intent(mContext, TUIC2CChatActivity.class);
intent.putExtra(TUIConstants.TUIChat.CHAT_ID, user_id);
intent.putExtra(TUIConstants.TUIChat.CHAT_TYPE, V2TIMConversation.V2TIM_C2C);
mContext.startActivity(intent);
}
@JavascriptInterface
public void exchange(){
public void exchange() {
ARouter.getInstance().build(ARouteConstants.CURRENCY).navigation();
}
@@ -292,7 +368,7 @@ public class WebViewActivity extends BaseAppCompatActivity<ActivityWebViewBindin
}
@JavascriptInterface
public void Recharge(){
public void Recharge() {
ARouter.getInstance().build(ARouteConstants.RECHARGE_ACTIVITY).navigation();
}
}

8
moduleUtil/src/main/java/com/qxcm/moduleutil/adapter/GiftPackAdapter.java
View File

@@ -123,6 +123,7 @@ public class GiftPackAdapter extends BaseAdapter {
viewHolder.item_layout = (ConstraintLayout) convertView.findViewById(R.id.cl_gift);
viewHolder.ivDownOn = (ImageView) convertView.findViewById(R.id.iv_down_on);
viewHolder.cl_iv_down_on = (ConstraintLayout) convertView.findViewById(R.id.cl_iv_down_on);
viewHolder.integral = (TextView) convertView.findViewById(R.id.integral);
convertView.setTag(viewHolder);
} else {
@@ -131,10 +132,11 @@ public class GiftPackAdapter extends BaseAdapter {
viewHolder.item_layout.setOnClickListener(v -> {
// RoonGiftModel clickedModel = (RoonGiftModel) v.getTag();
EventBus.getDefault().post(new RoomGiftPackToEvent(this, giftModel, 1));
EventBus.getDefault().post(new RoomGiftPackToEvent(this, giftModel, 2));
});
viewHolder.integral.setVisibility(View.VISIBLE);
viewHolder.integral.setText("x"+giftModel.getNum());
//设置礼物名字
viewHolder.tv_gift_name.setText(giftModel.getGift_name());
//设置礼物价格
@@ -164,7 +166,7 @@ public class GiftPackAdapter extends BaseAdapter {
static class ViewHolder {
public ConstraintLayout item_layout;
public TextView tv_gift_name, tv_gift_price, tv_gift_num;
public TextView tv_gift_name, tv_gift_price, integral;
public ImageView iv_gift_pic;
public TextView tv_gift_change_love_values;
public ImageView ivDownOn;

120
moduleUtil/src/main/java/com/qxcm/moduleutil/base/CommonAppContext.java
View File

@@ -40,21 +40,26 @@ import com.blankj.utilcode.util.FileUtils;
import com.blankj.utilcode.util.LogUtils;
import com.blankj.utilcode.util.ProcessUtils;
import com.blankj.utilcode.util.ServiceUtils;
import com.bumptech.glide.Glide;
import com.lahm.library.EasyProtectorLib;
import com.lahm.library.EmulatorCheckCallback;
import com.qxcm.moduleutil.R;
import com.qxcm.moduleutil.bean.UserBean;
import com.qxcm.moduleutil.event.AppLifecycleEvent;
import com.qxcm.moduleutil.event.RoomGiftRunable;
import com.qxcm.moduleutil.interfaces.AppLifecycleUtil;
import com.qxcm.moduleutil.listener.MessageListenerSingleton;
import com.qxcm.moduleutil.rtc.AgoraManager;
import com.qxcm.moduleutil.service.MyMqttService;
import com.qxcm.moduleutil.utils.ARouteConstants;
import com.qxcm.moduleutil.utils.FloatWindowHelper;
import com.qxcm.moduleutil.utils.ImageUtils;
import com.qxcm.moduleutil.utils.MemoryOptimizationUtils;
import com.qxcm.moduleutil.utils.SpUtil;
import com.qxcm.moduleutil.utils.UtilConfig;
import com.qxcm.moduleutil.utils.config.EnvironmentEnum;
import com.qxcm.moduleutil.utils.config.EnvironmentPrefs;
import com.qxcm.moduleutil.utils.location.SystemLocationProvider;
import com.qxcm.moduleutil.widget.CommonAppConfig;
import com.qxcm.moduleutil.widget.CustomRefreshHeader;
import com.qxcm.moduleutil.widget.PiaoPingManager;
@@ -69,6 +74,7 @@ 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 com.tencent.qcloud.tuikit.tuichat.bean.ChatInfo;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
@@ -116,26 +122,92 @@ public class CommonAppContext extends MultiDexApplication {
EnvironmentPrefs prefs = new EnvironmentPrefs(this);
currentEnvironment = prefs.getSelectedEnvironment();
initialization();
piaoPingManager = PiaoPingManager.getInstance(this);
// 在独立进程中运行 LeakCanary 分析
// leakcanary.LeakCanary.setConfig(new leakcanary.LeakCanary.Config());
// 禁用自动堆分析
}
public void initialization(){
UtilConfig.init(this);
registerActivityLifecycleCallbacks();
initWebView();
private void handleMemoryTrim(int level) {
LogUtils.w("MemoryTrim", "Memory trim level: " + level);
switch (level) {
case TRIM_MEMORY_RUNNING_MODERATE:
LogUtils.w("MemoryTrim", "Memory trim: moderate");
break;
case TRIM_MEMORY_RUNNING_LOW:
LogUtils.w("MemoryTrim", "Memory trim: low");
clearCaches();
break;
case TRIM_MEMORY_RUNNING_CRITICAL:
LogUtils.w("MemoryTrim", "Memory trim: critical");
clearCaches();
MemoryOptimizationUtils.forceGC();
break;
case TRIM_MEMORY_UI_HIDDEN:
LogUtils.w("MemoryTrim", "Memory trim: UI hidden");
clearCaches();
break;
case TRIM_MEMORY_BACKGROUND:
LogUtils.w("MemoryTrim", "Memory trim: background");
clearCaches();
break;
case TRIM_MEMORY_MODERATE:
LogUtils.w("MemoryTrim", "Memory trim: moderate background");
clearCaches();
break;
case TRIM_MEMORY_COMPLETE:
LogUtils.w("MemoryTrim", "Memory trim: complete");
clearCaches();
MemoryOptimizationUtils.forceGC();
break;
}
}
private void clearCaches() {
try {
// 清理图片缓存
MemoryOptimizationUtils.clearImageCache(this);
// 清理 Glide 内存缓存
Glide.get(this).clearMemory();
// 清理SVGA缓存
MemoryOptimizationUtils.clearSVGACache();
// 清理其他缓存
if (piaoPingManager != null) {
piaoPingManager.unsubscribe();
}
// 清理消息缓存
RoomGiftRunable.clearMqttCache();
} catch (Exception e) {
LogUtils.e("ClearCaches", "Error clearing caches: " + e.getMessage());
}
}
public void initialization() {
if (ProcessUtils.isMainProcess()) {
initARouter();
if (SpUtil.isAgreePolicy()) {
UtilConfig.init(this);
registerActivityLifecycleCallbacks();
initWebView();
checkInEmulator();
UtilConfig.checkInEmulator();
AgoraManager.getInstance(this).init(currentEnvironment.getSwSdkAppId());
MessageListenerSingleton.getInstance();
CrashReport.initCrashReport(this, "865cfe9555", true);/*bugly初始化*/
ServiceUtils.startService(MyMqttService.class);/*Mqtt初始化*/
// 每次启动应用时重置状态
SpUtil.getInstance().setBooleanValue("youth_model_shown", false);
}
}
piaoPingManager = PiaoPingManager.getInstance(this);
piaoPingManager.subscribe();
AgoraManager.getInstance(this).init(currentEnvironment.getSwSdkAppId());
MessageListenerSingleton.getInstance();
CrashReport.initCrashReport(this, "865cfe9555", true);/*bugly初始化*/
ServiceUtils.startService(MyMqttService.class);/*Mqtt初始化*/
}
private PiaoPingManager piaoPingManager;
@@ -234,7 +306,14 @@ public class CommonAppContext extends MultiDexApplication {
CommonAppConfig.getInstance().setFrontGround(true);
// FloatWindowHelper.setFloatWindowVisible(true);
AppLifecycleUtil.onAppFrontGround();
// 确保在主线程中订阅
if (activity != null && !activity.isFinishing()) {
activity.runOnUiThread(() -> {
if (piaoPingManager != null) {
piaoPingManager.subscribe();
}
});
}
}
}
@@ -258,6 +337,14 @@ public class CommonAppContext extends MultiDexApplication {
CommonAppConfig.getInstance().setFrontGround(false);
// FloatWindowHelper.setFloatWindowVisible(false);
AppLifecycleUtil.onAppBackGround();
// 确保在主线程中取消订阅
if (activity != null && !activity.isFinishing()) {
activity.runOnUiThread(() -> {
if (piaoPingManager != null) {
piaoPingManager.unsubscribe();
}
});
}
}
}
@@ -270,6 +357,7 @@ public class CommonAppContext extends MultiDexApplication {
public void onActivityDestroyed(Activity activity) {
}
});
}
@@ -369,6 +457,8 @@ public class CommonAppContext extends MultiDexApplication {
// SpUtil.getInstance().removeValue(
// SPConstants.USER_ID, SPConstants.TOKEN, SPConstants.USER_INFO
// );
isShow = false;
isPlaying = false;
mUserBean = null;
SpUtil.saveUserId(-1);
SpUtil.saveUserBean(new UserBean());
@@ -376,11 +466,16 @@ public class CommonAppContext extends MultiDexApplication {
Intent intent = new Intent("com.example.action.LAUNCH_PAGE");
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
getApplicationContext().startActivity(intent);
piaoPingManager.unsubscribe();
// piaoPingManager.unsubscribe();
FileUtils.deleteAllInDir(getCacheDir());
FileUtils.deleteAllInDir(getExternalCacheDir());
AgoraManager.getInstance(getApplicationContext()).destroy();
// 每次启动应用时重置状态
SpUtil.setBooleanValue("youth_model_shown", false);
// 发送广播通知所有Activity刷新状态
Intent refreshIntent = new Intent("com.qxcm.moduleutil.ACTION_USER_LOGOUT");
sendBroadcast(refreshIntent);
}
public static boolean isAlipayInstalled(Context context) {
@@ -417,4 +512,5 @@ public class CommonAppContext extends MultiDexApplication {
}
});
}
}

2
moduleUtil/src/main/java/com/qxcm/moduleutil/bean/UserInfo.java
View File

@@ -44,7 +44,7 @@ public class UserInfo implements Serializable {
private String dress;//头像框
private String charm;//魅力值
private String room_id;
private String guile;//公会名称
private String guild;//公会名称
private String is_mute;//禁言状态 0否 1是
private String is_mute_pit;//禁麦状态 0否 1是
private String is_manager;//是否是管理员 0否 1是

8
moduleUtil/src/main/java/com/qxcm/moduleutil/dialog/PolicyDialog.java
View File

@@ -42,7 +42,9 @@ public class PolicyDialog extends Dialog {
ClickableSpan clickSpan = new ClickableSpan() {
@Override
public void onClick(@NonNull View widget) {
ARouter.getInstance().build(ARouteConstants.H5).withString("url", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl()+"/api/Page/page_show?id=6" ).withString("title", "用户协议").navigation();
// ARouter.getInstance().build(ARouteConstants.H5).withString("url", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl()+"/api/Page/page_show?id=6" ).withString("title", "用户协议").navigation();
ARouter.getInstance().build(ARouteConstants.H5).withString("url", "file:///android_asset/page_yongh.html").withString("title", "用户协议").navigation();
}
@Override
@@ -54,7 +56,9 @@ public class PolicyDialog extends Dialog {
ClickableSpan ysClickSpan = new ClickableSpan() {
@Override
public void onClick(@NonNull View widget) {
ARouter.getInstance().build(ARouteConstants.H5).withString("url", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl()+"/api/Page/page_show?id=4").withString("title", "隐私协议").navigation();
// ARouter.getInstance().build(ARouteConstants.H5).withString("url", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl()+"/api/Page/page_show?id=4").withString("title", "隐私协议").navigation();
ARouter.getInstance().build(ARouteConstants.H5).withString("url", "file:///android_asset/page_show.html").withString("title", "隐私协议").navigation();
}
@Override

63
moduleUtil/src/main/java/com/qxcm/moduleutil/event/RoomGiftRunable.java
View File

@@ -1,15 +1,7 @@
package com.qxcm.moduleutil.event;
import android.content.Intent;
import android.os.Build;
import android.provider.Settings;
import com.blankj.utilcode.util.GsonUtils;
import com.blankj.utilcode.util.ServiceUtils;
import com.google.gson.Gson;
import com.qxcm.moduleutil.base.CommonAppContext;
import com.qxcm.moduleutil.service.FloatingWindow;
import com.qxcm.moduleutil.widget.PiaoPingManager;
import org.greenrobot.eventbus.EventBus;
@@ -27,6 +19,39 @@ public class RoomGiftRunable implements Runnable {
private static final List<MqttBean> mqttCache = new ArrayList<>();
private static final int MAX_CACHE_SIZE = 6;
private static final Object lock = new Object();
public static synchronized void addMqttCache(MqttBean mqttBean) {
if (mqttBean == null) return;
// 检查内存状态
if (isMemoryLow()) {
// 内存不足时清理缓存
clearMqttCache();
return;
}
// 限制缓存大小
if (mqttCache.size() >= MAX_CACHE_SIZE) {
mqttCache.remove(0); // 移除最旧的项
}
mqttCache.add(mqttBean);
}
public static synchronized void clearMqttCache() {
mqttCache.clear();
// 建议进行垃圾回收
// System.gc();
}
private static boolean isMemoryLow() {
Runtime runtime = Runtime.getRuntime();
long usedMemory = runtime.totalMemory() - runtime.freeMemory();
long maxMemory = runtime.maxMemory();
double memoryUsage = (double) usedMemory / maxMemory;
return memoryUsage > 0.8; // 内存使用超过80%认为是低内存
}
public RoomGiftRunable(String data) {
this.data = data;
}
@@ -36,10 +61,26 @@ public class RoomGiftRunable implements Runnable {
MqttBean mqttBean= GsonUtils.fromJson(data, MqttBean.class);
// 线程安全地添加到缓存
synchronized (lock) {
if (mqttCache.size() >= MAX_CACHE_SIZE) {
mqttCache.remove(0); // 移除第一条数据
if (mqttBean == null) return;
// 检查内存状态
if (isMemoryLow()) {
// 内存不足时清理缓存
clearMqttCache();
return;
}
mqttCache.add(mqttBean); // 添加新数据
// 限制缓存大小
if (mqttCache.size() >= MAX_CACHE_SIZE) {
mqttCache.remove(0); // 移除最旧的项
}
mqttCache.add(mqttBean);
// if (mqttCache.size() >= MAX_CACHE_SIZE) {
// mqttCache.remove(0); // 移除第一条数据
// }
// mqttCache.add(mqttBean); // 添加新数据
}
EventBus.getDefault().post(mqttBean);
// new FloatingWindow(CommonAppContext.getInstance(),mqttBean);

12
moduleUtil/src/main/java/com/qxcm/moduleutil/http/ApiServer.java
View File

@@ -84,6 +84,14 @@ public interface ApiServer {
@POST(Constants.SEND_CODE)
Observable<BaseModel<Object>> sendCode(@Field("mobile") String mobile, @Field("event") String event);
@FormUrlEncoded //手机换绑
@POST(Constants.MODIFY_MOBILE)
Call<BaseModel<String>> mobileView(@Field("mobile") String mobile, @Field("new_mobile") String new_mobile,@Field("sms_code") String sms_code);
@FormUrlEncoded //手机绑定
@POST(Constants.BIND_MOBILE)
Call<BaseModel<String>> mobileView2( @Field("new_mobile") String new_mobile,@Field("sms_code") String sms_code);
@FormUrlEncoded
@POST(Constants.LOGIN)
Observable<BaseModel<List<UserBean>>> login(@Field("user_login") String user_login, @Field("sms_code") String sms_code);
@@ -254,7 +262,7 @@ public interface ApiServer {
@FormUrlEncoded
@POST(Constants.GET_EXPAND_COLUMN)
Observable<BaseModel<List<ExpandColumnBean>>> getExpandColumn(@Field("type") String type);
Observable<BaseModel<List<ExpandColumnBean>>> getExpandColumn(@Field("type") String type,@Field("page") String page, @Field("page_limit") String page_limit);
@GET(Constants.GET_OFFICIAL_NOTICE)
Observable<BaseModel<NewsDataBean>> getOfficialNotice();
@@ -644,7 +652,7 @@ public interface ApiServer {
@FormUrlEncoded
@POST(Constants.POST_CHARM_LIST)
Observable<BaseModel<RoomDetails>> getCharmList(@Field("room_id") String room_id, @Field("start_time") String start_time, @Field("end_time") String end_time);
Observable<BaseModel<RoomDetails>> getCharmList(@Field("room_id") String room_id, @Field("start_time") String start_time, @Field("end_time") String end_time,@Field("page") String page);
@FormUrlEncoded
@POST(Constants.POST_SET_UPLOAD_BG_IMG)

70
moduleUtil/src/main/java/com/qxcm/moduleutil/http/RetrofitClient.java
View File

@@ -144,7 +144,7 @@ public class RetrofitClient {
private OkHttpClient provideOkHttpClient() {
Map<String, String> headers = Collections.emptyMap();
if (SpUtil.isAgreePolicy()) {
headers = SystemUtils.getSystemParams();
headers = SystemUtils.getSystemParams();
}
SetCookieCache cookieCache = new SetCookieCache();
ClearableCookieJar cookieJar =
@@ -248,6 +248,41 @@ public class RetrofitClient {
sApiServer.sendCode(mobile, event).compose(new DefaultTransformer<>()).subscribe(observer);
}
public void mobileView(String mobile, String new_mobile, String sms_code, BaseObserver<String> observer) {
sApiServer.mobileView(mobile, new_mobile, sms_code).enqueue(new Callback<BaseModel<String>>() {
@Override
public void onResponse(Call<BaseModel<String>> call, Response<BaseModel<String>> response) {
if (response.code() == 200) {
BaseModel<String> body = response.body();
observer.onNext(body.getMsg());
}
}
@Override
public void onFailure(Call<BaseModel<String>> call, Throwable t) {
t.printStackTrace();
}
});
}
public void mobileView2(String new_mobile, String sms_code, BaseObserver<String> observer) {
sApiServer.mobileView2(new_mobile, sms_code).enqueue(new Callback<BaseModel<String>>() {
@Override
public void onResponse(Call<BaseModel<String>> call, Response<BaseModel<String>> response) {
if (response.code() == 200) {
BaseModel<String> body = response.body();
observer.onNext(body.getMsg());
}
}
@Override
public void onFailure(Call<BaseModel<String>> call, Throwable t) {
t.printStackTrace();
}
});
}
public void login(String mobile, String password, BaseObserver<List<UserBean>> observer) {
sApiServer.login(mobile, password).compose(new DefaultTransformer<>()).subscribe(observer);
}
@@ -453,24 +488,24 @@ public class RetrofitClient {
sApiServer.dailyTasksOpenBox(gift_box_id).compose(new DefaultTransformer<>()).subscribe(observer);
}
public void dailyTasksReceive(String task_id,BaseObserver<String> observer){
public void dailyTasksReceive(String task_id, BaseObserver<String> observer) {
sApiServer.dailyTasksReceive(task_id).enqueue(new Callback<ResponseBody>() {
@Override
public void onResponse(Call<ResponseBody> call, Response<ResponseBody> response) {
if (response.code() == 200){
if (response.code() == 200) {
observer.onNext("任务完成");
}
}
@Override
public void onFailure(Call<ResponseBody> call, Throwable t) {
t.printStackTrace();
t.printStackTrace();
}
});
}
public void dailyTasksComplete(String task_id,BaseObserver<RoomSingleton> observer) {
public void dailyTasksComplete(String task_id, BaseObserver<RoomSingleton> observer) {
sApiServer.dailyTasksComplete(task_id).enqueue(new Callback<ResponseBody>() {
@Override
public void onResponse(Call<ResponseBody> call, Response<ResponseBody> response) {
@@ -494,6 +529,7 @@ public class RetrofitClient {
}
});
}
public void sendHeadine(String content, String money, String roomId, BaseObserver<String> observer) {
sApiServer.sendHeadine(content, money, roomId).enqueue(new Callback<BaseModel<String>>() {
@Override
@@ -543,7 +579,7 @@ public class RetrofitClient {
if (baseModel != null) {
if (baseModel.getData() != null && baseModel.getData().size() > 0) {
observer.onNext(baseModel.getData());
}else {
} else {
observer.onNext(new ArrayList<>());
}
}
@@ -718,16 +754,16 @@ public class RetrofitClient {
});
}
public void getThemeData(BaseObserver<ThemeBean> observer){
public void getThemeData(BaseObserver<ThemeBean> observer) {
sApiServer.getThemeData().enqueue(new Callback<BaseModel<ThemeBean>>() {
@Override
public void onResponse(Call<BaseModel<ThemeBean>> call, Response<BaseModel<ThemeBean>> response) {
if (response.code() == 200){
if (response.code() == 200) {
BaseModel<ThemeBean> baseModel = response.body();
if (baseModel.getData()!=null){
if (baseModel.getData() != null) {
observer.onNext(baseModel.getData());
}else {
} else {
observer.onNext(null);
}
}
@@ -760,7 +796,7 @@ public class RetrofitClient {
sApiServer.getBlacklist(page, page_limit).compose(new DefaultTransformer<>()).subscribe(observer);
}
public void getLockMiniList(String page, String page_limit, BaseObserver<List<BlackUserBean>> observer){
public void getLockMiniList(String page, String page_limit, BaseObserver<List<BlackUserBean>> observer) {
sApiServer.getLockMiniList(page, page_limit).compose(new DefaultTransformer<>()).subscribe(observer);
}
@@ -770,7 +806,7 @@ public class RetrofitClient {
//获取扩列数据
public void getExpandColumn(String type, String page, String page_limit, BaseObserver<List<ExpandColumnBean>> observer) {
sApiServer.getExpandColumn(type).compose(new DefaultTransformer<>()).subscribe(observer);
sApiServer.getExpandColumn(type,page, page_limit).compose(new DefaultTransformer<>()).subscribe(observer);
}
//获取官方公告数据或者系统消息，
@@ -1074,7 +1110,7 @@ public class RetrofitClient {
}
public void getCharmList(String roomId, String stime, String etime, String p, BaseObserver<RoomDetails> observer) {
sApiServer.getCharmList(roomId, stime, etime).compose(new DefaultTransformer<>()).subscribe(observer);
sApiServer.getCharmList(roomId, stime, etime, p).compose(new DefaultTransformer<>()).subscribe(observer);
}
// TODO: 2025/6/28 房间竞拍开始
@@ -1644,9 +1680,9 @@ public class RetrofitClient {
sApiServer.cancelUserDecorate(type).enqueue(new Callback<BaseModel<String>>() {
@Override
public void onResponse(Call<BaseModel<String>> call, Response<BaseModel<String>> response) {
if (response.code() == 200){
if (response.code() == 200) {
observer.onNext("取消成功");
}
}
}
@Override
@@ -1913,12 +1949,12 @@ public class RetrofitClient {
});
}
public void postRoomSwToken(String roomId, BaseObserver<PkSwTokenBean> observer){
public void postRoomSwToken(String roomId, BaseObserver<PkSwTokenBean> observer) {
sApiServer.postRoomSwToken(roomId).enqueue(new Callback<BaseModel<PkSwTokenBean>>() {
@Override
public void onResponse(Call<BaseModel<PkSwTokenBean>> call, Response<BaseModel<PkSwTokenBean>> response) {
if (response.code() == 200){
if (response.code() == 200) {
BaseModel<PkSwTokenBean> baseModel = response.body();
observer.onNext(baseModel.getData());
}

6
moduleUtil/src/main/java/com/qxcm/moduleutil/listener/MessageListenerSingleton.java
View File

@@ -1,5 +1,9 @@
package com.qxcm.moduleutil.listener;
import static com.liulishuo.okdownload.OkDownloadProvider.context;
import android.app.ActivityManager;
import android.content.Context;
import android.util.Log;
import com.blankj.utilcode.util.GsonUtils;
@@ -27,6 +31,8 @@ import org.greenrobot.eventbus.EventBus;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import java.util.Queue;
import java.util.concurrent.LinkedBlockingQueue;
/**
*@author qx

74
moduleUtil/src/main/java/com/qxcm/moduleutil/rtc/AgoraManager.java
View File

@@ -103,8 +103,8 @@ public class AgoraManager {
private static List<Music> musicList;
private static boolean isBjMusic = false;
private static List<SoundLevelUpdateListener> soundLevelUpdateListeners = new CopyOnWriteArrayList<>();
private static ChannelMediaOptions options;
private static RtcConnection connection;
private static ChannelMediaOptions options;
private static RtcConnection connection;
private String pkRoomId = "";
private AgoraManager() {
@@ -148,7 +148,8 @@ public class AgoraManager {
* 初始化 Agora 引擎
*/
public static void init(String appId) {
if (rtcEngine != null) throw new IllegalStateException("RtcEngine已经初始化过");;
if (rtcEngine != null) throw new IllegalStateException("RtcEngine已经初始化过");
;
try {
RtcEngineConfig config = new RtcEngineConfig();
@@ -212,7 +213,7 @@ public class AgoraManager {
public void joinRoom(String token, String roomId, int uid, boolean isMicrophoneEnabled, boolean isCamerJs) {
if (rtcEngine == null) {
Log.e("AgoraManager", "RtcEngine not initialized");
return;
init(CommonAppContext.getInstance().getCurrentEnvironment().getSwSdkAppId());
}
if (!mRoomId.isEmpty()) {
leaveRoom();
@@ -256,6 +257,9 @@ public class AgoraManager {
}
public void joinChannelEx(String token, String channelId, int uid) {
if (rtcEngine == null) {
init(CommonAppContext.getInstance().getCurrentEnvironment().getSwSdkAppId());
}
if (rtcEngine != null) {
options.clientRoleType = Constants.CLIENT_ROLE_BROADCASTER;
options.channelProfile = Constants.CHANNEL_PROFILE_LIVE_BROADCASTING;
@@ -346,21 +350,69 @@ public class AgoraManager {
* 销毁引擎
*/
public void destroy() {
// if (rtcEngine != null) {
//// rtcEngine.registerEventHandler(getDefaultEventHandler());
// rtcEngine.leaveChannel();
// rtcEngine.stopScreenCapture();
// rtcEngine.stopPreview();
// if (musicPlayer != null) {
// musicPlayer.destroy();
// }
// if (musicContentCenter != null) {
// musicContentCenter.destroy();
// }
//// rtcEngine.destroy();
//// rtcEngine = null;
// }
// eventHandlers.clear();
if (rtcEngine != null) {
// rtcEngine.registerEventHandler(getDefaultEventHandler());
rtcEngine.leaveChannel();
// 停止屏幕捕获
rtcEngine.stopScreenCapture();
// 停止预览
rtcEngine.stopPreview();
// 离开频道
rtcEngine.leaveChannel();
// 销毁音乐播放器
if (musicPlayer != null) {
musicPlayer.stop();
musicPlayer.destroy();
musicPlayer = null;
}
// 销毁音乐内容中心
if (musicContentCenter != null) {
musicContentCenter.destroy();
musicContentCenter = null;
}
// rtcEngine.destroy();
// 移除所有事件监听器
for (IRtcEngineEventHandler handler : eventHandlers) {
rtcEngine.removeHandler(handler);
}
eventHandlers.clear();
// // 销毁RtcEngine
// RtcEngine.destroy();
// rtcEngine = null;
}
eventHandlers.clear();
// 清理静态变量
musicList = null;
soundLevelUpdateListeners.clear();
mRoomId = "";
mSongCode = 0;
options = null;
connection = null;
pkRoomId = "";
isBjMusic = false;
// 清理实例
instance = null;
}
public void desMusic() {
@@ -374,6 +426,9 @@ public class AgoraManager {
*/
@SuppressLint("SuspiciousIndentation")
public void setLocalAudioEnabled(boolean enabled, String userId) {
if (rtcEngine == null) {
init(CommonAppContext.getInstance().getCurrentEnvironment().getSwSdkAppId());
}
if (rtcEngine != null) {
rtcEngine.enableLocalAudio(enabled); // 启用/禁用音频采集
this.isLocalAudioEnabled = enabled;
@@ -425,6 +480,9 @@ public class AgoraManager {
// RtcConnection connection = new RtcConnection();
// connection.channelId = mRoomId;
// connection.localUid = uid;
if (rtcEngine == null) {
init(CommonAppContext.getInstance().getCurrentEnvironment().getSwSdkAppId());
}
rtcEngine.muteLocalAudioStreamEx(enabled, connection);
}

87
moduleUtil/src/main/java/com/qxcm/moduleutil/utils/MemoryOptimizationUtils.java Normal file
View File

@@ -0,0 +1,87 @@
package com.qxcm.moduleutil.utils;
import android.content.Context;
import com.blankj.utilcode.util.LogUtils;
import com.bumptech.glide.Glide;
public class MemoryOptimizationUtils {
private static final String TAG = "MemoryOptimization";
/**
* 检查内存状态
*/
public static boolean isMemoryLow() {
Runtime runtime = Runtime.getRuntime();
long usedMemory = runtime.totalMemory() - runtime.freeMemory();
long maxMemory = runtime.maxMemory();
double memoryUsage = (double) usedMemory / maxMemory;
LogUtils.d(TAG, "Memory usage: " + (memoryUsage * 100) + "%");
// 内存使用超过85%认为是低内存
return memoryUsage > 0.85;
}
/**
* 强制进行垃圾回收
*/
public static void forceGC() {
try {
LogUtils.d(TAG, "Forcing garbage collection");
Runtime.getRuntime().gc();
Thread.sleep(100); // 给GC一些时间
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
}
}
/**
* 清理图片缓存
*/
public static void clearImageCache(Context context) {
try {
// 清理Glide缓存
Glide.get(context).clearMemory();
// 在后台线程清理磁盘缓存
new Thread(() -> {
try {
Glide.get(context).clearDiskCache();
} catch (Exception e) {
LogUtils.e(TAG, "Error clearing Glide disk cache: " + e.getMessage());
}
}).start();
} catch (Exception e) {
LogUtils.e(TAG, "Error clearing image cache: " + e.getMessage());
}
}
/**
* 获取当前内存使用情况
*/
public static String getMemoryInfo() {
Runtime runtime = Runtime.getRuntime();
long maxMemory = runtime.maxMemory();
long totalMemory = runtime.totalMemory();
long freeMemory = runtime.freeMemory();
long usedMemory = totalMemory - freeMemory;
return String.format("Max: %d MB, Total: %d MB, Used: %d MB, Free: %d MB",
maxMemory / (1024 * 1024),
totalMemory / (1024 * 1024),
usedMemory / (1024 * 1024),
freeMemory / (1024 * 1024));
}
/**
* 清理SVGA缓存
*/
public static void clearSVGACache() {
try {
// 如果SVGA库提供了清理缓存的方法，调用它
// SVGAParser.clearCache(); // 假设有这样的方法
} catch (Exception e) {
LogUtils.e(TAG, "Error clearing SVGA cache: " + e.getMessage());
}
}
}

4
moduleUtil/src/main/java/com/qxcm/moduleutil/utils/config/EnvironmentEnum.java
View File

@@ -2,7 +2,7 @@ package com.qxcm.moduleutil.utils.config;
public enum EnvironmentEnum {
PRODUCTION(//生产环境
"http://chat.qxmier.com/",
"https://chat.qxmier.com/",
"6rdWuz058oq5OahdbFiGEybUcdahd12J83L34Uc7MrPIrxtFG+rXiwDvRcqNvjwbClbbmvMrmxKVkIysFByBsl0Qe9kqd2w8T/nhK5G6eXXlk2V9AjYCieIU+jRnjZBB+Cfechr6rCGJ2aeBARIsXcRPW7wm9WFK9euh5T+v6Pyte68yNaNdcYCll3+U4/uCEog7HygCnMIbAU+kqoPdmn2H+51YOHW+VsnsHd4w1+I3f8Tt0xLIXGM4GWnQueZ5GR46GTWiSYMy8dCIh9SPIMRyC91GosVcfGPMJSdcXqc=",
"https://oss-cn-hangzhou.aliyuncs.com/",
"LTAI5tJ2UYfFNF7K3F4e1siv",
@@ -15,7 +15,7 @@ public enum EnvironmentEnum {
"tcp://81.70.45.221",
"https://vespa.qxmier.com"),
TEST(//测试环境
"http://vschat.qxmier.com/",
"https://vschat.qxmier.com/",
"6rdWuz058oq5OahdbFiGEybUcdahd12J83L34Uc7MrPIrxtFG+rXiwDvRcqNvjwbClbbmvMrmxKVkIysFByBsl0Qe9kqd2w8T/nhK5G6eXXlk2V9AjYCieIU+jRnjZBB+Cfechr6rCGJ2aeBARIsXcRPW7wm9WFK9euh5T+v6Pyte68yNaNdcYCll3+U4/uCEog7HygCnMIbAU+kqoPdmn2H+51YOHW+VsnsHd4w1+I3f8Tt0xLIXGM4GWnQueZ5GR46GTWiSYMy8dCIh9SPIMRyC91GosVcfGPMJSdcXqc=",
"https://oss-cn-hangzhou.aliyuncs.com/",
"LTAI5tJ2UYfFNF7K3F4e1siv",

316
moduleUtil/src/main/java/com/qxcm/moduleutil/utils/location/SystemLocationProvider.java
View File

@@ -16,14 +16,100 @@ import androidx.annotation.NonNull;
import androidx.core.app.ActivityCompat;
import com.blankj.utilcode.util.ToastUtils;
import com.qxcm.moduleutil.base.CommonAppContext;
import java.io.IOException;
import java.lang.ref.WeakReference;
import java.util.List;
import java.util.Locale;
public class SystemLocationProvider implements LocationProvider {
private LocationManager locationManager;
private LocationListener gpsLocationListener;
private LocationListener networkLocationListener;
private Handler timeoutHandler;
private Runnable timeoutRunnable;
// 使用静态内部类避免内存泄漏
private static class LocationListenerImpl implements LocationListener {
private final WeakReference<LocationCallback> callbackRef;
private final WeakReference<Context> contextRef;
private final boolean isGpsListener; // 标识是否是GPS监听器
LocationListenerImpl(LocationCallback callback, Context context, boolean isGpsListener) {
this.callbackRef = new WeakReference<>(callback);
this.contextRef = new WeakReference<>(context);
this.isGpsListener = isGpsListener;
}
@Override
public void onLocationChanged(@NonNull Location location) {
LocationCallback callback = callbackRef.get();
Context context = contextRef.get();
if (callback != null && context != null) {
String city = getCityName(context, location.getLatitude(), location.getLongitude());
callback.onLocationReceived(location.getLatitude(), location.getLongitude(), city);
}
}
@Override
public void onStatusChanged(String provider, int status, Bundle extras) {
// 可以添加日志或其他处理
Log.d("LocationDebug", "onStatusChanged: " + provider + ", status: " + status);
}
@Override
public void onProviderEnabled(@NonNull String provider) {
Log.d("LocationDebug", "onProviderEnabled: " + provider);
}
@Override
public void onProviderDisabled(@NonNull String provider) {
LocationCallback callback = callbackRef.get();
Context context = contextRef.get();
if (callback != null && context != null) {
if (isGpsListener) {
// GPS被禁用时回退到网络定位
fallbackToNetwork(callback, context);
} else {
callback.onFailed("网络定位不可用");
}
}
}
private String getCityName(Context context, double latitude, double longitude) {
android.location.Geocoder geocoder = new android.location.Geocoder(context, Locale.getDefault());
try {
List<Address> addresses = geocoder.getFromLocation(latitude, longitude, 1);
if (addresses != null && !addresses.isEmpty()) {
return addresses.get(0).getAdminArea() + "," + addresses.get(0).getLocality() + "," + addresses.get(0).getSubLocality();
}
} catch (IOException e) {
e.printStackTrace();
}
return "未知城市";
}
private void fallbackToNetwork(LocationCallback callback, Context context) {
LocationManager locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
if (locationManager != null && locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER)) {
if (ActivityCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED
&& ActivityCompat.checkSelfPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
callback.onFailed("缺少定位权限");
return;
}
// 创建网络定位监听器
LocationListenerImpl networkListener = new LocationListenerImpl(callback, context, false);
locationManager.requestSingleUpdate(LocationManager.NETWORK_PROVIDER, networkListener, Looper.getMainLooper());
} else {
callback.onFailed("GPS 不可用且网络定位也未启用");
}
}
}
@Override
public void getLastKnownLocation(@NonNull Context context, @NonNull LocationCallback callback) {
locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
if (locationManager == null) {
@@ -40,153 +126,40 @@ public class SystemLocationProvider implements LocationProvider {
Log.d("LocationDebug", "GPS Enabled: " + isGpsEnabled);
Log.d("LocationDebug", "Network Enabled: " + isNetworkEnabled);
if (!isGpsEnabled && !isNetworkEnabled) {
callback.onFailed("GPS 和 网络定位均未启用");
return;
}
// 清理之前的监听器
cleanupListeners();
final Handler handler = new Handler(Looper.getMainLooper());
Runnable timeout = () -> callback.onFailed("定位请求超时");
handler.postDelayed(timeout, 15000); // 15秒超时
LocationListener listener = new LocationListener() {
@Override
public void onLocationChanged(@NonNull Location location) {
handler.removeCallbacks(timeout);
String city = getCityName(context, location.getLatitude(), location.getLongitude());
callback.onLocationReceived(location.getLatitude(), location.getLongitude(), city);
}
@Override
public void onStatusChanged(String provider, int status, Bundle extras) {
Log.d("LocationDebug", "onStatusChanged: " + provider + ", status: " + status);
}
@Override
public void onProviderEnabled(@NonNull String provider) {
Log.d("LocationDebug", "onProviderEnabled: " + provider);
}
@Override
public void onProviderDisabled(@NonNull String provider) {
Log.d("LocationDebug", "onProviderDisabled: " + provider);
fallbackToNetwork(callback, context);
}
// 设置超时处理
timeoutHandler = new Handler(Looper.getMainLooper());
timeoutRunnable = () -> {
cleanupListeners();
callback.onFailed("定位请求超时");
};
if (isNetworkEnabled) {
Log.d("LocationDebug", "尝试使用 NETWORK 定位");
locationManager.requestSingleUpdate(LocationManager.NETWORK_PROVIDER, listener, Looper.getMainLooper());
}
else if (isGpsEnabled) {
timeoutHandler.postDelayed(timeoutRunnable, 15000); // 15秒超时
if (isGpsEnabled) {
Log.d("LocationDebug", "尝试使用 GPS 定位");
locationManager.requestSingleUpdate(LocationManager.GPS_PROVIDER, listener, Looper.getMainLooper());
gpsLocationListener = new LocationListenerImpl(callback, context, true);
locationManager.requestSingleUpdate(LocationManager.GPS_PROVIDER, gpsLocationListener, Looper.getMainLooper());
} else if (isNetworkEnabled) {
Log.d("LocationDebug", "尝试使用 NETWORK 定位");
networkLocationListener = new LocationListenerImpl(callback, context, false);
locationManager.requestSingleUpdate(LocationManager.NETWORK_PROVIDER, networkLocationListener, Looper.getMainLooper());
} else {
// 清理超时处理
if (timeoutHandler != null && timeoutRunnable != null) {
timeoutHandler.removeCallbacks(timeoutRunnable);
}
callback.onFailed("GPS 和 网络定位均未启用");
}
} catch (SecurityException e) {
Log.e("LocationDebug", "缺少定位权限", e);
callback.onFailed("缺少定位权限：" + e.getMessage());
}
}
// @Override
// public void getLastKnownLocation(@NonNull Context context, @NonNull LocationCallback callback) {
// locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
// if (locationManager == null) {
// callback.onFailed("无法获取定位服务");
// return;
// }
//
// try {
// if (locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
// locationManager.requestSingleUpdate(LocationManager.GPS_PROVIDER, new LocationListener() {
// @Override
// public void onLocationChanged(@NonNull Location location) {
// String city = getCityName(context, location.getLatitude(), location.getLongitude());
// callback.onLocationReceived(location.getLatitude(), location.getLongitude(), city);
// }
//
// @Override
// public void onStatusChanged(String provider, int status, Bundle extras) {
// ToastUtils.showShort(provider);
// }
//
// @Override
// public void onProviderEnabled(@NonNull String provider) {
// ToastUtils.showShort(provider);
// }
//
// @Override
// public void onProviderDisabled(@NonNull String provider) {
// fallbackToNetwork(callback, context);
// }
// }, Looper.getMainLooper());
// } else if (locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER)) {
// locationManager.requestSingleUpdate(LocationManager.NETWORK_PROVIDER, new LocationListener() {
// @Override
// public void onLocationChanged(@NonNull Location location) {
// String city = getCityName(context, location.getLatitude(), location.getLongitude());
// callback.onLocationReceived(location.getLatitude(), location.getLongitude(), city);
// }
//
// @Override
// public void onStatusChanged(String provider, int status, Bundle extras) {
// ToastUtils.showShort(provider);
// }
//
// @Override
// public void onProviderEnabled(@NonNull String provider) {
// ToastUtils.showShort(provider);
// }
//
// @Override
// public void onProviderDisabled(@NonNull String provider) {
// callback.onFailed("网络定位不可用");
// }
// }, Looper.getMainLooper());
// } else {
// callback.onFailed("GPS 和 网络定位均未启用");
// }
// } catch (SecurityException e) {
// callback.onFailed("缺少定位权限：" + e.getMessage());
// }
// }
private void fallbackToNetwork(LocationCallback callback, Context context) {
if (locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER)) {
if (ActivityCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
// TODO: Consider calling
// ActivityCompat#requestPermissions
// here to request the missing permissions, and then overriding
// public void onRequestPermissionsResult(int requestCode, String[] permissions,
// int[] grantResults)
// to handle the case where the user grants the permission. See the documentation
// for ActivityCompat#requestPermissions for more details.
return;
// 清理超时处理
if (timeoutHandler != null && timeoutRunnable != null) {
timeoutHandler.removeCallbacks(timeoutRunnable);
}
locationManager.requestSingleUpdate(LocationManager.NETWORK_PROVIDER, new LocationListener() {
@Override
public void onLocationChanged(@NonNull Location location) {
String city = getCityName(context, location.getLatitude(), location.getLongitude());
callback.onLocationReceived(location.getLatitude(), location.getLongitude(), city);
}
@Override
public void onStatusChanged(String provider, int status, Bundle extras) {
ToastUtils.showShort(provider);
}
@Override
public void onProviderEnabled(@NonNull String provider) {
ToastUtils.showShort(provider);
}
@Override
public void onProviderDisabled(@NonNull String provider) {
callback.onFailed("网络定位不可用");
}
}, Looper.getMainLooper());
} else {
callback.onFailed("GPS 不可用且网络定位也未启用");
callback.onFailed("缺少定位权限：" + e.getMessage());
}
}
@@ -197,15 +170,47 @@ public class SystemLocationProvider implements LocationProvider {
@Override
public void stopLocationUpdates() {
// 可扩展为停止监听
cleanupListeners();
}
private void cleanupListeners() {
try {
if (locationManager != null) {
if (gpsLocationListener != null) {
if (ActivityCompat.checkSelfPermission(CommonAppContext.getInstance(), Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED
|| ActivityCompat.checkSelfPermission(CommonAppContext.getInstance(), Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED) {
locationManager.removeUpdates(gpsLocationListener);
}
gpsLocationListener = null;
}
if (networkLocationListener != null) {
if (ActivityCompat.checkSelfPermission(CommonAppContext.getInstance(), Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED
|| ActivityCompat.checkSelfPermission(CommonAppContext.getInstance(), Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED) {
locationManager.removeUpdates(networkLocationListener);
}
networkLocationListener = null;
}
}
// 清理超时处理
if (timeoutHandler != null && timeoutRunnable != null) {
timeoutHandler.removeCallbacks(timeoutRunnable);
timeoutHandler = null;
timeoutRunnable = null;
}
} catch (Exception e) {
Log.e("LocationDebug", "清理监听器时出错", e);
}
}
// 保持原有的工具方法
private String getCityName(Context context, double latitude, double longitude) {
android.location.Geocoder geocoder = new android.location.Geocoder(context, Locale.getDefault());
try {
List<Address> addresses = geocoder.getFromLocation(latitude, longitude, 1);
if (addresses != null && !addresses.isEmpty()) {
return addresses.get(0).getAdminArea() + "," + addresses.get(0).getLocality()+ "," + addresses.get(0).getSubLocality();
return addresses.get(0).getAdminArea() + "," + addresses.get(0).getLocality() + "," + addresses.get(0).getSubLocality();
}
} catch (IOException e) {
e.printStackTrace();
@@ -213,7 +218,6 @@ public class SystemLocationProvider implements LocationProvider {
return "未知城市";
}
public void useNetworkLocation(Context context, LocationCallback callback) {
LocationManager locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
if (locationManager == null) {
@@ -228,31 +232,15 @@ public class SystemLocationProvider implements LocationProvider {
}
if (locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER)) {
locationManager.requestSingleUpdate(LocationManager.NETWORK_PROVIDER, new LocationListener() {
@Override
public void onLocationChanged(@NonNull Location location) {
String city = getCityName(context, location.getLatitude(), location.getLongitude());
callback.onLocationReceived(location.getLatitude(), location.getLongitude(), city);
}
// 清理之前的网络监听器
if (networkLocationListener != null) {
locationManager.removeUpdates(networkLocationListener);
}
@Override
public void onStatusChanged(String provider, int status, Bundle extras) {
ToastUtils.showShort(provider);
}
@Override
public void onProviderEnabled(@NonNull String provider) {
ToastUtils.showShort(provider);
}
@Override
public void onProviderDisabled(@NonNull String provider) {
callback.onFailed("网络定位不可用");
}
}, Looper.getMainLooper());
networkLocationListener = new LocationListenerImpl(callback, context, false);
locationManager.requestSingleUpdate(LocationManager.NETWORK_PROVIDER, networkLocationListener, Looper.getMainLooper());
} else {
callback.onFailed("网络定位未启用");
}
}
}

449
moduleUtil/src/main/java/com/qxcm/moduleutil/widget/AvatarFrameView.java
View File

@@ -10,6 +10,7 @@ import android.os.Handler;
import android.os.Looper;
import android.util.AttributeSet;
import android.util.Log;
import android.util.LruCache;
import android.view.LayoutInflater;
import android.view.Surface;
import android.view.View;
@@ -19,6 +20,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.databinding.DataBindingUtil;
import com.blankj.utilcode.util.LogUtils;
import com.blankj.utilcode.util.PathUtils;
import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.MediaItem;
@@ -39,6 +41,7 @@ import com.qxcm.moduleutil.R;
import com.qxcm.moduleutil.databinding.RoomViewSvgaAnimBinding;
import com.qxcm.moduleutil.utils.DownloadUtil;
import com.qxcm.moduleutil.utils.Md5Utils;
import com.qxcm.moduleutil.utils.MemoryOptimizationUtils;
import com.qxcm.moduleutil.utils.SpUtil;
import com.qxcm.moduleutil.utils.logger.Logger;
import com.tencent.qgame.animplayer.AnimConfig;
@@ -46,13 +49,15 @@ import com.tencent.qgame.animplayer.inter.IAnimListener;
import com.tencent.qgame.animplayer.inter.IFetchResource;
import java.io.File;
import java.lang.ref.WeakReference;
import java.net.URL;
import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.Map;
import java.util.Queue;
public class AvatarFrameView extends FrameLayout implements IAnimListener {
@Override
public void onFailed(int i, @Nullable String s) {
@@ -75,15 +80,37 @@ public class AvatarFrameView extends FrameLayout implements IAnimListener {
@Override
public void onVideoComplete() {
// if (mType == 1) {
// mBinding.playView.startPlay(mFile); // 循环播放
// } else {
// isPlaying = false;
// playNextFromQueue(); // 播放下一项
// }
if (isDestroyed) return;
// 确保在主线程中执行
if (Looper.myLooper() == Looper.getMainLooper()) {
handleVideoComplete();
} else {
mainHandler.post(() -> {
if (!isDestroyed) {
handleVideoComplete();
}
});
}
}
private void handleVideoComplete() {
if (isDestroyed) return;
if (mType == 1) {
mBinding.playView.startPlay(mFile); // 循环播放
if (mBinding != null && mFile != null) {
mBinding.playView.startPlay(mFile); // 循环播放
}
} else {
isPlaying = false;
playNextFromQueue(); // 播放下一项
}
}
@Override
public void onVideoDestroy() {
@@ -101,11 +128,19 @@ public class AvatarFrameView extends FrameLayout implements IAnimListener {
private int mType;//1:循环播放 2:播放一次停止播放
private File mFile;
private final Queue<PlayItem> playQueue = new LinkedList<>();
private boolean isPlaying = false;
// 添加销毁标记
private boolean isDestroyed = false;
private static final String TAG = "AvatarFrameView";
private RoomViewSvgaAnimBinding mBinding;
// 内存监控
private static final long MAX_MEMORY_THRESHOLD = 300 * 1024 * 1024; // 300MB
private static final int MAX_SVGA_CACHE_SIZE = 3;
private final Map<String, WeakReference<SVGAVideoEntity>> svgaCache = new LruCache<>(MAX_SVGA_CACHE_SIZE);
public AvatarFrameView(@NonNull Context context) {
this(context, null);
}
@@ -121,6 +156,7 @@ public class AvatarFrameView extends FrameLayout implements IAnimListener {
}
private void initViews() {
if (isDestroyed) return;
// 初始化 ExoPlayer View
playerView = new PlayerView(getContext());
playerView.setUseController(false);
@@ -142,10 +178,18 @@ public class AvatarFrameView extends FrameLayout implements IAnimListener {
// addView(glSurfaceView);
// 初始化 ExoPlayer
exoPlayer = new ExoPlayer.Builder(getContext()).build();
playerView.setPlayer(exoPlayer);
if (!isDestroyed) {
try {
exoPlayer = new ExoPlayer.Builder(getContext()).build();
playerView.setPlayer(exoPlayer);
} catch (Exception e) {
LogUtils.e("AvatarFrameView", "Failed to initialize ExoPlayer: " + e.getMessage());
}
}
mBinding.playView.setAnimListener(this);
if (mBinding != null) {
mBinding.playView.setAnimListener(this);
}
}
private String getFileExtension(String url) {
if (url == null || url.isEmpty()) return "";
@@ -156,7 +200,18 @@ public class AvatarFrameView extends FrameLayout implements IAnimListener {
return "";
}
private void playNextFromQueue() {
if (isDestroyed) return;
// 确保在主线程中执行
if (Looper.myLooper() != Looper.getMainLooper()) {
mainHandler.post(this::playNextFromQueue);
return;
}
// 再次检查内存状态
if (isMemoryLow()) {
LogUtils.w(TAG, "Low memory, clearing queue");
clearQueue();
return;
}
// 检查特效是否开启
if (SpUtil.getOpenEffect() != 1) {
clearQueue();
@@ -202,6 +257,18 @@ public class AvatarFrameView extends FrameLayout implements IAnimListener {
}
}
public void setSource(String url, int type2) {
if (isDestroyed) return;
// 确保在主线程中执行
if (Looper.myLooper() != Looper.getMainLooper()) {
mainHandler.post(() -> setSource(url, type2));
return;
}
// 检查内存状态
if (isMemoryLow()) {
LogUtils.w(TAG, "Low memory, skipping animation");
clearQueue();
return;
}
// 检查特效是否开启
if (SpUtil.getOpenEffect() != 1) {
// 特效关闭时清空队列并停止播放
@@ -219,7 +286,15 @@ public class AvatarFrameView extends FrameLayout implements IAnimListener {
playNextFromQueue();
}
}
private boolean isMemoryLow() {
Runtime runtime = Runtime.getRuntime();
long usedMemory = runtime.totalMemory() - runtime.freeMemory();
long maxMemory = runtime.maxMemory();
double memoryUsage = (double) usedMemory / maxMemory;
// 内存使用超过80%或绝对使用量超过阈值
return memoryUsage > 0.8 || usedMemory > MAX_MEMORY_THRESHOLD;
}
// public void setSource(String url, int type2) {
// if (SpUtil.getOpenEffect()==1) {
@@ -323,7 +398,157 @@ public class AvatarFrameView extends FrameLayout implements IAnimListener {
}
}
private void handleSVGAComplete(SVGAVideoEntity videoItem, String url) {
if (isDestroyed || svgaSurface == null) return;
try {
// 缓存实体（使用弱引用）
svgaCache.put(url, new WeakReference<>(videoItem));
SVGADrawable drawable = new SVGADrawable(videoItem, new SVGADynamicEntity());
svgaSurface.setImageDrawable(drawable);
svgaSurface.setCallback(new SVGACallback() {
@Override
public void onStep(int i, double v) {
}
@Override
public void onRepeat() {
}
@Override
public void onPause() {
}
@Override
public void onFinished() {
if (isDestroyed) return;
if (Looper.myLooper() != Looper.getMainLooper()) {
mainHandler.post(() -> {
isPlaying = false;
playNextFromQueue();
});
} else {
isPlaying = false;
playNextFromQueue();
}
}
});
svgaSurface.startAnimation();
} catch (Exception e) {
LogUtils.e(TAG, "Error handling SVGA completion: " + e.getMessage());
isPlaying = false;
playNextFromQueue();
}
}
private void playCachedSVGA(SVGAVideoEntity videoItem) {
if (isDestroyed || svgaSurface == null) return;
try {
SVGADrawable drawable = new SVGADrawable(videoItem, new SVGADynamicEntity());
svgaSurface.setImageDrawable(drawable);
svgaSurface.setCallback(new SVGACallback() {
@Override
public void onStep(int i, double v) {
}
@Override
public void onRepeat() {
}
@Override
public void onPause() {
}
@Override
public void onFinished() {
if (isDestroyed) return;
if (Looper.myLooper() != Looper.getMainLooper()) {
mainHandler.post(() -> {
isPlaying = false;
playNextFromQueue();
});
} else {
isPlaying = false;
playNextFromQueue();
}
}
});
svgaSurface.startAnimation();
} catch (Exception e) {
LogUtils.e(TAG, "Error playing cached SVGA: " + e.getMessage());
isPlaying = false;
playNextFromQueue();
}
}
private void loadNewSVGA(String url) {
if (isDestroyed) return;
try {
new SVGAParser(getContext()).parse(new URL(url), new SVGAParser.ParseCompletion() {
@Override
public void onComplete(SVGAVideoEntity videoItem) {
if (isDestroyed) return;
if (Looper.myLooper() != Looper.getMainLooper()) {
mainHandler.post(() -> handleSVGAComplete(videoItem, url));
} else {
handleSVGAComplete(videoItem, url);
}
}
@Override
public void onError() {
if (isDestroyed) return;
if (Looper.myLooper() != Looper.getMainLooper()) {
mainHandler.post(() -> {
isPlaying = false;
playNextFromQueue();
});
} else {
isPlaying = false;
playNextFromQueue();
}
}
});
} catch (Exception e) {
LogUtils.e(TAG, "Error parsing SVGA: " + e.getMessage());
isPlaying = false;
playNextFromQueue();
}
}
private void loadSVGA(String url) {
if (isDestroyed || svgaSurface == null) return;
if (Looper.myLooper() != Looper.getMainLooper()) {
mainHandler.post(() -> loadSVGA(url));
return;
}
try {
svgaSurface.setVisibility(View.VISIBLE);
// 检查缓存
WeakReference<SVGAVideoEntity> cachedRef = svgaCache.get(url);
SVGAVideoEntity cachedEntity = cachedRef != null ? cachedRef.get() : null;
if (cachedEntity != null) {
// 使用缓存的实体
playCachedSVGA(cachedEntity);
} else {
// 加载新的SVGA
loadNewSVGA(url);
}
} catch (Exception e) {
LogUtils.e(TAG, "Error loading SVGA: " + e.getMessage());
isPlaying = false;
playNextFromQueue();
}
svgaSurface.setVisibility(View.VISIBLE);
try {
new SVGAParser(getContext()).parse(new URL(url), new SVGAParser.ParseCompletion() {
@@ -406,38 +631,201 @@ public class AvatarFrameView extends FrameLayout implements IAnimListener {
}
private void clearPrevious() {
// if (exoPlayer != null) {
// exoPlayer.stop();
// exoPlayer.clearVideoSurface();
// }
if (svgaSurface.getDrawable() instanceof SVGADrawable) {
((SVGADrawable) svgaSurface.getDrawable()).stop();
if (isDestroyed) return;
// 确保在主线程中执行
if (Looper.myLooper() != Looper.getMainLooper()) {
mainHandler.post(() -> {
if (!isDestroyed) {
clearPrevious();
}
});
return;
}
try {
// 停止并清理 ExoPlayer
if (exoPlayer != null) {
try {
exoPlayer.stop(); // 这里可能会在错误线程中调用
exoPlayer.clearVideoSurface();
} catch (Exception e) {
Logger.e("Error stopping ExoPlayer: " + e.getMessage());
// 如果在错误线程中，切换到主线程重试
mainHandler.post(() -> {
try {
if (exoPlayer != null) {
exoPlayer.stop();
exoPlayer.clearVideoSurface();
}
} catch (Exception ex) {
Logger.e("Error stopping ExoPlayer on main thread: " + ex.getMessage());
}
});
}
}
// 停止并清理 SVGA 动画
if (svgaSurface != null && svgaSurface.getDrawable() instanceof SVGADrawable) {
SVGADrawable drawable = (SVGADrawable) svgaSurface.getDrawable();
if (drawable != null) {
drawable.stop();
// 清理 SVGADrawable 中的资源
svgaSurface.clearAnimation();
svgaSurface.setImageDrawable(null);
}
}
// 隐藏所有视图
if (playerView != null) playerView.setVisibility(View.GONE);
if (svgaSurface != null) svgaSurface.setVisibility(View.GONE);
mBinding.playView.setVisibility(View.GONE);
// 停止播放器
if (mBinding.playView != null) {
mBinding.playView.stopPlay();
}
} catch (Exception e) {
LogUtils.e(TAG, "Error in clearPrevious: " + e.getMessage());
}
// if (svgaSurface.getDrawable() instanceof SVGADrawable) {
// ((SVGADrawable) svgaSurface.getDrawable()).stop();
// }
// if (playerView != null) playerView.setVisibility(View.GONE);
// if (svgaSurface != null) svgaSurface.setVisibility(View.GONE);
// if (glSurfaceView != null) glSurfaceView.setVisibility(View.GONE);
// mBinding.playView.setVisibility(View.GONE);
}
// 简单的 LRU Cache 实现
private static class LruCache<K, V> extends LinkedHashMap<K, V> {
private final int maxSize;
public void release() {
// if (exoPlayer != null) {
// exoPlayer.release();
// }
if (svgaSurface.getDrawable() instanceof SVGADrawable) {
((SVGADrawable) svgaSurface.getDrawable()).stop();
public LruCache(int maxSize) {
super(16, 0.75f, true);
this.maxSize = maxSize;
}
if (glSurfaceView != null) {
glSurfaceView.onPause(); // 必须调用生命周期方法
// glSurfaceView.requestRender();
@Override
protected boolean removeEldestEntry(Map.Entry<K, V> eldest) {
return size() > maxSize;
}
}
/**
* 释放所有资源
*/
private void releaseResources() {
LogUtils.d(TAG, "Releasing all resources");
if (isDestroyed) return;
try {
// 清理 SVGA 资源
if (svgaSurface != null && svgaSurface.getDrawable() instanceof SVGADrawable) {
SVGADrawable drawable = (SVGADrawable) svgaSurface.getDrawable();
if (drawable != null) {
try {
drawable.stop();
svgaSurface.clearAnimation();
svgaSurface.setImageDrawable(null);
} catch (Exception e) {
LogUtils.e(TAG, "Error releasing SVGA resources: " + e.getMessage());
}
}
}
// 停止并清理播放器
if (mBinding != null && mBinding.playView != null) {
mBinding.playView.stopPlay();
}
// 清理 ExoPlayer 资源
if (exoPlayer != null) {
try {
exoPlayer.stop();
exoPlayer.clearVideoSurface();
} catch (Exception e) {
LogUtils.e(TAG, "Error releasing ExoPlayer resources: " + e.getMessage());
}
}
} catch (Exception e) {
LogUtils.e(TAG, "Error in releaseResources: " + e.getMessage());
}
}
/**
* 公共释放方法，用于外部主动释放资源
*/
public void release() {
Logger.d("AvatarFrameView", "Public release called");
if (isDestroyed) return;
// 确保在主线程中执行
if (Looper.myLooper() != Looper.getMainLooper()) {
mainHandler.post(this::release);
return;
}
isDestroyed = true;
try {
// 清空播放队列
clearQueue();
// 释放所有资源
releaseResources();
// 释放 ExoPlayer
if (exoPlayer != null) {
try {
exoPlayer.stop();
exoPlayer.release();
} catch (Exception e) {
LogUtils.e(TAG, "Error releasing ExoPlayer: " + e.getMessage());
}
exoPlayer = null;
}
// 清理 PlayerView
if (playerView != null) {
try {
playerView.setPlayer(null);
} catch (Exception e) {
LogUtils.e(TAG, "Error releasing PlayerView: " + e.getMessage());
}
playerView = null;
}
// 清理 SVGAImageView
if (svgaSurface != null) {
try {
svgaSurface.pauseAnimation();
svgaSurface.clearAnimation();
svgaSurface.setImageDrawable(null);
} catch (Exception e) {
LogUtils.e(TAG, "Error releasing SVGAImageView: " + e.getMessage());
}
svgaSurface = null;
}
// 清理 binding
if (mBinding != null) {
mBinding = null;
}
// 清理队列
playQueue.clear();
} catch (Exception e) {
LogUtils.e(TAG, "Error in AvatarFrameView release: " + e.getMessage());
} finally {
// 建议进行垃圾回收
MemoryOptimizationUtils.forceGC();
}
}
public void clearQueue() {
if (isDestroyed) return;
playQueue.clear();
isPlaying = false;
// 清理当前正在播放的内容
clearPrevious();
}
@@ -454,8 +842,13 @@ public class AvatarFrameView extends FrameLayout implements IAnimListener {
* 关闭特效
*/
public void closeEffect() {
// 清空队列
clearQueue();
// 释放资源
releaseResources();
//清空队列
playQueue.clear();
// playQueue.clear();
//关闭动画
// if (mBinding.image != null && isPlaying && mBinding.image.isAnimating()) {
// mBinding.image.setAnimation(null);

8
moduleUtil/src/main/java/com/qxcm/moduleutil/widget/BaseWheatView.java
View File

@@ -285,6 +285,8 @@ public abstract class BaseWheatView extends ConstraintLayout implements IBaseWhe
if (pitBean != null && pitBean.getUser_id() != null && !pitBean.getUser_id().equals("0")) {
if (pitBean.getUser_id().equals(userId + "")) {
iv_on_line.setVisibility(GONE);
mIvRipple.stopAnimation();
mIvRipple.setVisibility(GONE);
}
}
}
@@ -297,12 +299,16 @@ public abstract class BaseWheatView extends ConstraintLayout implements IBaseWhe
}
}else if (pitBean.getUser_id()==null || pitBean.getUser_id().equals("0") || pitBean.getUser_id().equals("")){
iv_on_line.setVisibility(GONE);
mIvRipple.stopAnimation();
mIvRipple.setVisibility(GONE);
}
}
});
if (pitBean.getUser_id()==null || pitBean.getUser_id().equals("0") || pitBean.getUser_id().equals("") ){
iv_on_line.setVisibility(GONE);
mIvRipple.stopAnimation();
mIvRipple.setVisibility(GONE);
}
}
@@ -361,6 +367,8 @@ public abstract class BaseWheatView extends ConstraintLayout implements IBaseWhe
if (pitBean.getUser_id().equals(isOnline.getUser_id())) {
if (isOnline.getIs_online() == 1) {
iv_on_line.setVisibility(GONE);
mIvRipple.stopAnimation();
mIvRipple.setVisibility(GONE);
} else {
iv_on_line.setVisibility(VISIBLE);
}

122
moduleUtil/src/main/java/com/qxcm/moduleutil/widget/ChannelSplitRenderer.kt
View File

@@ -1,122 +0,0 @@
package com.qxcm.moduleutil.widget
import android.graphics.SurfaceTexture
import android.opengl.GLES20
import android.opengl.Matrix
class ChannelSplitRenderer {
private val vertexShaderCode = """
attribute vec4 aPosition;
attribute vec2 aTexCoord;
varying vec2 vTexCoord;
void main() {
gl_Position = aPosition;
vTexCoord = aTexCoord;
}
"""
private val fragmentShaderCode = """
precision mediump float;
uniform sampler2D uTexture;
varying vec2 vTexCoord;
void main() {
// 只使用左半部分作为最终颜色
vec2 leftCoord = vec2(vTexCoord.x * 0.5, vTexCoord.y);
vec4 color = texture2D(uTexture, leftCoord);
// 设置 alpha 为 1.0 表示完全不透明，或根据需求设为 0.0 表示全透明
gl_FragColor = vec4(color.rgb, 0.0); // 左通道颜色 + 不透明
}"""
private var program = 0
private var positionHandle = 0
private var texCoordHandle = 0
private var textureHandle = 0
private val projectionMatrix = FloatArray(16)
private val modelMatrix = FloatArray(16)
fun onSurfaceCreated(surface: SurfaceTexture, width: Int, height: Int) {
// 初始化着色器
val vertexShader = ShaderUtils.loadShader(GLES20.GL_VERTEX_SHADER, vertexShaderCode)
val fragmentShader = ShaderUtils.loadShader(GLES20.GL_FRAGMENT_SHADER, fragmentShaderCode)
program = GLES20.glCreateProgram().also {
GLES20.glAttachShader(it, vertexShader)
GLES20.glAttachShader(it, fragmentShader)
GLES20.glLinkProgram(it)
}
positionHandle = GLES20.glGetAttribLocation(program, "aPosition")
texCoordHandle = GLES20.glGetAttribLocation(program, "aTexCoord")
textureHandle = GLES20.glGetUniformLocation(program, "uTexture")
// 初始化矩阵
Matrix.setIdentityM(projectionMatrix, 0)
Matrix.setIdentityM(modelMatrix, 0)
GLES20.glClearColor(0.0f, 0.0f, 0.0f, 0.0f)
GLES20.glEnable(GLES20.GL_BLEND)
GLES20.glBlendFunc(GLES20.GL_SRC_ALPHA, GLES20.GL_ONE_MINUS_SRC_ALPHA)
}
fun onSurfaceChanged(width: Int, height: Int) {
GLES20.glViewport(0, 0, width, height)
}
fun onDrawFrame(textureId: Int) {
GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT)
GLES20.glUseProgram(program)
// 定义顶点坐标（全屏）
val vertices = floatArrayOf(
-1.0f, -1.0f, 0.0f,
1.0f, -1.0f, 0.0f,
-1.0f, 1.0f, 0.0f,
1.0f, 1.0f, 0.0f
)
// 修改纹理坐标，只映射左半部分视频内容到左侧屏幕
val texCoords = floatArrayOf(
0.0f, 1.0f, // 左下角
0.5f, 1.0f, // 右下角（对应视频中间）
0.0f, 0.0f, // 左上角
0.5f, 0.0f // 右上角
)
val vertexBuffer = ShaderUtils.createFloatBuffer(vertices)
val texBuffer = ShaderUtils.createFloatBuffer(texCoords)
GLES20.glEnableVertexAttribArray(positionHandle)
GLES20.glVertexAttribPointer(
positionHandle, 3,
GLES20.GL_FLOAT, false,
0, vertexBuffer
)
GLES20.glEnableVertexAttribArray(texCoordHandle)
GLES20.glVertexAttribPointer(
texCoordHandle, 2,
GLES20.GL_FLOAT, false,
0, texBuffer
)
// 绑定纹理
GLES20.glActiveTexture(GLES20.GL_TEXTURE0)
GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, textureId)
GLES20.glUniform1i(textureHandle, 0)
// 绘制
GLES20.glDrawArrays(GLES20.GL_TRIANGLE_STRIP, 0, 4)
// 清理
GLES20.glDisableVertexAttribArray(positionHandle)
GLES20.glDisableVertexAttribArray(texCoordHandle)
}
fun release() {
GLES20.glDeleteProgram(program)
}
}

2
moduleUtil/src/main/java/com/qxcm/moduleutil/widget/Constants.java
View File

@@ -370,6 +370,8 @@ public class Constants {
public static final String dailyTasksComplete = "/api/Dailytasks/dailyTasksComplete";//领取每日任务奖励
public static final String POST_CANCEL_USER_DECORATE = "/api/Decorate/cancel_user_decorate";//取消装扮
public static final String GET_THEME_DATA = "/api/Theme/get_theme_data";//主题接口
public static final String MODIFY_MOBILE = "/api/UserData/modify_mobile";//手机换绑
public static final String BIND_MOBILE = "/api/UserData/bind_mobile";//手机绑定

136
moduleUtil/src/main/java/com/qxcm/moduleutil/widget/PiaoPingManager.java
View File

@@ -9,9 +9,11 @@ import android.content.Context;
import android.view.LayoutInflater;
import android.view.View;
import android.view.WindowManager;
import android.view.animation.DecelerateInterpolator;
import android.widget.FrameLayout;
import android.widget.TextView;
import com.blankj.utilcode.util.LogUtils;
import com.petterp.floatingx.FloatingX;
import com.petterp.floatingx.assist.FxGravity;
import com.petterp.floatingx.assist.helper.FxAppHelper;
@@ -23,6 +25,9 @@ import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
/**
* @Author
* @Time 2025/7/18 21:52
@@ -33,6 +38,8 @@ public class PiaoPingManager {
private WindowManager windowManager;
private View piaoPingView;
private boolean isPiaoPingShown = false;
private Queue<MqttBean> messageQueue = new ConcurrentLinkedQueue<>(); // 消息队列
private boolean isAnimating = false; // 动画状态标记
private PiaoPingManager(Context context) {
windowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
@@ -52,11 +59,64 @@ public class PiaoPingManager {
public void showPiaoPingMessage(MqttBean mqttBean) {
// 创建 FloatingX 配置
// 添加到队列
messageQueue.offer(mqttBean);
// 如果当前没有动画正在进行，则开始处理
if (!isAnimating) {
processNextMessage();
}
// // 获取悬浮窗视图并设置内容
//// 替换第72行及后续对 layoutView 的直接访问
// View floatingView = LayoutInflater.from(context).inflate(R.layout.item_piaoping, new FrameLayout(context), false);
// TextView textView = floatingView.findViewById(R.id.tv_name);
// TextView textView2 = floatingView.findViewById(R.id.tv_to_name);
// textView2.setText("送给" + mqttBean.getList().getToUserName());
// textView.setText(mqttBean.getList().getFromUserName());
// ImageUtils.loadHeadCC(mqttBean.getList().getGift_picture(), floatingView.findViewById(R.id.iv_piaoping));
// TextView tv_time = floatingView.findViewById(R.id.tv_num);
// tv_time.setText("x" + mqttBean.getList().getNumber());
//
// // 3秒后执行左侧滑动关闭动画
// floatingView.postDelayed(() -> {
// // 实现左侧滑出动画
// ObjectAnimator animator = ObjectAnimator.ofFloat(floatingView, "translationX", 0f, -floatingView.getWidth());
// animator.setDuration(300); // 300ms 动画时间
// animator.addListener(new AnimatorListenerAdapter() {
// @Override
// public void onAnimationEnd(Animator animation) {
// // 动画结束后移除悬浮窗
// FloatingX.uninstallAll();
// }
// });
// animator.start();
// }, 3000);
//
// assert floatingView != null;
// FxAppHelper fxAppHelper = FxAppHelper.builder()
// .setContext(context)
// .setLayoutView(floatingView)
// .setGravity(FxGravity.LEFT_OR_TOP)
// .setY(100)
// .build();
//
// FloatingX.install(fxAppHelper).show();
}
private void processNextMessage() {
if (messageQueue.isEmpty()) {
isAnimating = false;
return;
}
isAnimating = true;
MqttBean mqttBean = messageQueue.poll();
displayMessage(mqttBean);
}
private void displayMessage(MqttBean mqttBean) {
// 获取悬浮窗视图并设置内容
// 替换第72行及后续对 layoutView 的直接访问
View floatingView = LayoutInflater.from(context).inflate(R.layout.item_piaoping, new FrameLayout(context), false);
View floatingView = LayoutInflater.from(context).inflate(R.layout.item_piaoping, new FrameLayout(context), false);
TextView textView = floatingView.findViewById(R.id.tv_name);
TextView textView2 = floatingView.findViewById(R.id.tv_to_name);
textView2.setText("送给" + mqttBean.getList().getToUserName());
@@ -65,38 +125,74 @@ public class PiaoPingManager {
TextView tv_time = floatingView.findViewById(R.id.tv_num);
tv_time.setText("x" + mqttBean.getList().getNumber());
// 3秒后执行左侧滑动关闭动画
floatingView.postDelayed(() -> {
// 实现左侧滑出动画
ObjectAnimator animator = ObjectAnimator.ofFloat(floatingView, "translationX", 0f, -floatingView.getWidth());
animator.setDuration(300); // 300ms 动画时间
animator.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
// 动画结束后移除悬浮窗
FloatingX.uninstallAll();
}
});
animator.start();
}, 3000);
// 先将视图放置在屏幕右侧外部，避免闪现问题
floatingView.setTranslationX(10000); // 先放到屏幕外
assert floatingView != null;
FxAppHelper fxAppHelper = FxAppHelper.builder()
.setContext(context)
.setLayoutView(floatingView)
.setGravity(FxGravity.LEFT_OR_TOP)
.setGravity(FxGravity.RIGHT_OR_TOP)
.setX(0)
.setY(100)
.build();
FloatingX.install(fxAppHelper).show();
// 首先从右侧滑入到屏幕中央
floatingView.post(() -> {
// 确保初始位置在屏幕右侧外部
floatingView.setTranslationX(floatingView.getWidth());
// 第一阶段：从右到屏幕右侧边缘（缓慢进入）
ObjectAnimator animator1 = ObjectAnimator.ofFloat(floatingView, "translationX",
floatingView.getWidth(), 0f);
animator1.setDuration(1500); // 延长动画时间到1.5秒
animator1.setInterpolator(new DecelerateInterpolator(2.0f)); // 更平缓的减速效果
animator1.start();
// 第二阶段：延迟1秒后从当前位置向左滑出
floatingView.postDelayed(() -> {
ObjectAnimator animator2 = ObjectAnimator.ofFloat(floatingView, "translationX",
0f, -floatingView.getWidth());
animator2.setDuration(1500); // 延长动画时间到1.5秒
animator2.setInterpolator(new DecelerateInterpolator(2.0f)); // 更平缓的减速效果
animator2.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
// 动画结束后移除悬浮窗
FloatingX.uninstallAll();
// 处理下一个消息
processNextMessage();
}
});
animator2.start();
}, 1000); // 停留1秒
});
}
public void subscribe() {
EventBus.getDefault().register(this);
try {
if (!EventBus.getDefault().isRegistered(this)) {
EventBus.getDefault().register(this);
}
} catch (Exception e) {
// 处理重复注册或其他异常
LogUtils.e("PiaoPingManager subscribe error: " + e.getMessage());
}
}
public void unsubscribe() {
EventBus.getDefault().unregister(this);
try {
if (EventBus.getDefault().isRegistered(this)) {
EventBus.getDefault().unregister(this);
}
} catch (Exception e) {
// 处理取消注册异常
LogUtils.e("PiaoPingManager unsubscribe error: " + e.getMessage());
}
messageQueue.clear();
isAnimating = false; // 重置动画状态
}
@Subscribe(threadMode = ThreadMode.MAIN)

14
moduleUtil/src/main/res/layout/item_gift_room.xml
View File

@@ -73,7 +73,19 @@
app:layout_constraintRight_toRightOf="@+id/iv_gift_pic"
app:layout_constraintTop_toBottomOf="@+id/tv_gift_name" />
<TextView
android:id="@+id/integral"
android:layout_width="@dimen/dp_35"
android:layout_height="@dimen/dp_13"
android:layout_gravity="center_horizontal"
android:background="@mipmap/text_bj"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:gravity="center"
android:text="x30"
android:textColor="@color/color_FF333333"
android:textSize="@dimen/sp_10"
android:visibility="gone"/>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

10
moduleUtil/src/main/res/layout/rv_item_balance_recharge.xml
View File

@@ -3,12 +3,13 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/cl_item"
android:layout_width="@dimen/dp_106"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_66"
android:layout_marginTop="@dimen/dp_5"
android:layout_marginEnd="@dimen/dp_12"
android:layout_marginStart="@dimen/dp_12"
android:layout_gravity="center"
android:background="@drawable/bg_r10_white">
<ImageView
@@ -28,12 +29,13 @@
android:id="@+id/tv_gold_num"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_20"
android:layout_marginLeft="@dimen/dp_5"
android:layout_marginStart="@dimen/dp_5"
android:textColor="@color/color_353535"
android:textSize="@dimen/sp_18"
android:layout_marginEnd="@dimen/dp_10"
app:layout_constraintLeft_toRightOf="@+id/iv_gold"
app:layout_constraintTop_toTopOf="@+id/iv_gold"
tools:text="600" />
tools:text="60000" />
<TextView
android:id="@+id/tv_money"
@@ -41,8 +43,6 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="@dimen/dp_10"
android:layout_marginStart="@dimen/dp_25"
android:layout_marginEnd="@dimen/dp_40"
android:textColor="@color/color_FF666666"
android:textSize="@dimen/sp_14"
app:layout_constraintBottom_toBottomOf="parent"

5
moduleUtil/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
View File

@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@mipmap/ic_launcher"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>

5
moduleUtil/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
View File

@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>

8
modulecircle/src/main/java/com/example/modulecircle/fragment/CircleCategoryFragment.java
View File

@@ -234,7 +234,13 @@ public class CircleCategoryFragment extends BaseMvpFragment<CirclePresenter, Fra
@Override
public void setCircleList(List<CircleListBean> list) {
cirleListAdapter.setNewData(list);
if (page==1){
cirleListAdapter.setNewData(list);
}else {
if (list!=null && list.size()>0){
cirleListAdapter.addData(list);
}
}
}
@Override

8
modulecircle/src/main/java/com/example/modulecircle/fragment/ExpandColumnFragment.java
View File

@@ -167,7 +167,13 @@ public class ExpandColumnFragment extends BaseMvpFragment<CirclePresenter, Fragm
@Override
public void setExpandColumn(List<ExpandColumnBean> list) {
expandColumnAdapter.setNewData(list);
if (page==1) {
expandColumnAdapter.setNewData(list);
}else {
if (list!=null && list.size()>0){
expandColumnAdapter.addData(list);
}
}
}
@Override

1
modulecircle/src/main/java/com/example/modulecircle/presenter/CirclePresenter.java
View File

@@ -68,6 +68,7 @@ public class CirclePresenter extends BasePresenter<CircleContacts.View> implemen
@Override
public void onNext(List<ExpandColumnBean> expandColumnBeans) {
MvpRef.get().setExpandColumn(expandColumnBeans);
MvpRef.get().finishComment();
}
});

4
modulemain/src/main/AndroidManifest.xml
View File

@@ -10,8 +10,10 @@
<activity
android:name=".activity.MainActivity"
android:launchMode="singleTask"
android:exported="true"
/>
>
</activity>
</application>
</manifest>

2
moduleroom/src/main/AndroidManifest.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.moduleroom">
>
<application>

229
moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.java
View File

@@ -15,6 +15,7 @@ import android.os.Build;
import android.os.Bundle;
import android.os.CountDownTimer;
import android.os.Handler;
import android.os.PersistableBundle;
import android.text.TextUtils;
import android.util.Log;
import android.view.GestureDetector;
@@ -105,14 +106,13 @@ import com.qxcm.moduleutil.utils.ARouteConstants;
import com.qxcm.moduleutil.utils.DialogUtils;
import com.qxcm.moduleutil.utils.ImageUtils;
import com.qxcm.moduleutil.utils.SpUtil;
import com.qxcm.moduleutil.utils.logger.DataLogger;
import com.qxcm.moduleutil.widget.AvatarFrameView;
import com.qxcm.moduleutil.widget.CircularProgressView;
import com.qxcm.moduleutil.widget.CustomMusicFloatingView;
import com.qxcm.moduleutil.widget.MusicView;
import com.qxcm.moduleutil.widget.SilentCountDownTimer;
import com.qxcm.moduleutil.widget.ViewUtils;
import com.qxcm.moduleutil.widget.floatingView.Floa;
import com.qxcm.moduleutil.widget.floatingView.FloatingMagnetView;
import com.tencent.imsdk.v2.V2TIMCallback;
import com.tencent.imsdk.v2.V2TIMManager;
@@ -188,13 +188,23 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
}
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_BACK) {
return true;
public boolean dispatchKeyEvent(KeyEvent event) {
if (event.getKeyCode() == KeyEvent.KEYCODE_BACK) {
// 自定义处理逻辑
return true; // 表示已消费事件
}
return false;
return super.dispatchKeyEvent(event);
}
// @Override
// public boolean onKeyDown(int keyCode, KeyEvent event) {
// if (keyCode == KeyEvent.KEYCODE_BACK) {
// return true;
// }
// return false;
// }
@Override
public void onConfigurationChanged(@NonNull Configuration newConfig) {
super.onConfigurationChanged(newConfig);
@@ -1309,31 +1319,226 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
}
// @Override
// protected void onDestroy() {
//
// // 移除 EventBus 注册
// if (EventBus.getDefault().isRegistered(this)) {
// EventBus.getDefault().unregister(this);
// }
// MessageListenerSingleton.reset(roomId); // 主动清理
// AgoraManager.getInstance(this).destroy(); // 确保释放 Agora 资源
// if (customMusicFloatingView != null) {
// customMusicFloatingView.destroy();
// }
// CommonAppContext.getInstance().isPlaying = false;
// CommonAppContext.getInstance().isShow = false;
// sDestroied = true;
// SpUtil.setMusicName("");
// if (isSave) {
// finish();
// }
// if (silentCountDownTimer != null) {
// silentCountDownTimer.release();
// }
// super.onDestroy();
// }
@Override
protected void onDestroy() {
// 移除 EventBus 注册
if (EventBus.getDefault().isRegistered(this)) {
EventBus.getDefault().unregister(this);
}
MessageListenerSingleton.reset(roomId); // 主动清理
AgoraManager.getInstance(this).destroy(); // 确保释放 Agora 资源
destroyAllFragments();
// 清理消息监听器
MessageListenerSingleton.reset(roomId);
// 释放所有 AvatarFrameView 实例
releaseAllAvatarFrameViews();
// 释放 Agora 资源
AgoraManager.getInstance(this).destroy();
// 销毁自定义音乐悬浮窗
if (customMusicFloatingView != null) {
customMusicFloatingView.destroy();
customMusicFloatingView = null;
}
// 释放悬浮窗控制资源
if (musicWindowControl != null) {
musicWindowControl.cancel();
musicWindowControl = null;
}
// 释放自定义悬浮窗资源
if (floatingMagnetView != null) {
floatingMagnetView.removeAllViews();
floatingMagnetView = null;
}
// 释放全屏相关资源
if (fullScreenContainer != null) {
fullScreenContainer.removeAllViews();
fullScreenContainer = null;
}
// 释放倒计时资源
if (silentCountDownTimer != null) {
silentCountDownTimer.release();
silentCountDownTimer = null;
}
// 清理礼物相关资源
hideGiftGiveProgress();
if (giftCountTimer != null) {
giftCountTimer.cancel();
giftCountTimer = null;
}
giftGiveEvent = null;
// 清理房间Fragment
if (roomFragment != null) {
getSupportFragmentManager().beginTransaction().remove(roomFragment).commitAllowingStateLoss();
roomFragment = null;
}
// 清理适配器资源
if (likeUserAdapter != null) {
likeUserAdapter.setOnItemClickListener(null);
likeUserAdapter.setNewData(null);
likeUserAdapter = null;
}
// 清理绑定的视图引用
if (mBinding != null) {
mBinding.roomTop.userRecyclerView.setAdapter(null);
// 清理其他可能的视图引用
// 释放布局中的 AvatarFrameView 实例
releaseLayoutAvatarFrameViews();
mBinding = null;
}
// 重置全局状态
CommonAppContext.getInstance().isPlaying = false;
CommonAppContext.getInstance().isShow = false;
CommonAppContext.getInstance().playId = null;
CommonAppContext.getInstance().playName = null;
CommonAppContext.getInstance().playCover = null;
// 清理静态变量
sDestroied = true;
SpUtil.setMusicName("");
// 清理房间相关信息
mRoomBean = null;
mRoomOwnerBean = null;
mRoomUserBean = null;
mRoomInfoResp = null;
mPitList.clear();
mPitList = null;
// 清理全屏相关视图引用
ivQuan = null;
ivExitFullscreen = null;
/// 清理礼物播放
// 如果是保存状态则finish
if (isSave) {
finish();
}
if (silentCountDownTimer != null) {
silentCountDownTimer.release();
}
// 调用父类方法
super.onDestroy();
// 强制垃圾回收（谨慎使用，仅在必要时）
// System.gc();
}
/**
* 释放所有 AvatarFrameView 实例
*/
private void releaseAllAvatarFrameViews() {
try {
// 释放 svgaGift
if (mBinding != null && mBinding.svgaGift != null) {
mBinding.svgaGift.release();
}
// 释放 svgaZuoji
if (mBinding != null && mBinding.svgaZuoji != null) {
mBinding.svgaZuoji.release();
}
// 释放其他可能的 AvatarFrameView 实例
// 如果你知道其他 AvatarFrameView 的引用，也需要在这里释放
} catch (Exception e) {
LogUtils.e("releaseAllAvatarFrameViews error: " + e.getMessage());
}
}
private void releaseLayoutAvatarFrameViews() {
try {
// 遍历视图层次结构，查找并释放所有 AvatarFrameView 实例
if (mBinding != null) {
releaseViewGroupAvatarFrameViews((ViewGroup) mBinding.getRoot());
}
} catch (Exception e) {
LogUtils.e("releaseAllViewAvatarFrameViews error: " + e.getMessage());
}
}
private void releaseViewGroupAvatarFrameViews(ViewGroup viewGroup) {
if (viewGroup == null) return;
try {
for (int i = 0; i < viewGroup.getChildCount(); i++) {
View child = viewGroup.getChildAt(i);
if (child instanceof AvatarFrameView) {
((AvatarFrameView) child).release();
} else if (child instanceof ViewGroup) {
releaseViewGroupAvatarFrameViews((ViewGroup) child);
}
}
} catch (Exception e) {
LogUtils.e("releaseViewGroupAvatarFrameViews error: " + e.getMessage());
}
}
/**
* 销毁所有子Fragment
*/
private void destroyAllFragments() {
try {
// 获取FragmentManager
androidx.fragment.app.FragmentManager fragmentManager = getSupportFragmentManager();
// 获取所有已添加的Fragment
List<Fragment> fragments = fragmentManager.getFragments();
if (!fragments.isEmpty()) {
// 开始Fragment事务
androidx.fragment.app.FragmentTransaction transaction = fragmentManager.beginTransaction();
// 遍历所有Fragment并移除
for (Fragment fragment : fragments) {
if (fragment != null) {
// 移除Fragment
transaction.remove(fragment);
}
}
// 提交事务
transaction.commitAllowingStateLoss();
}
// 强制执行挂起的事务
fragmentManager.executePendingTransactions();
} catch (Exception e) {
LogUtils.e("destroyAllFragments error: " + e.getMessage());
}
}
@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);

2
moduleroom/src/main/java/com/example/moduleroom/adapter/GiftUserAdapter.java
View File

@@ -46,7 +46,7 @@ public class GiftUserAdapter extends BaseQuickAdapter<RewardUserBean, BaseViewHo
}else {
helper.setText(R.id.tv_pit, String.format("%s号麦", item.getPit_number()));
}
if (item.getPit_number().equals("8")) {
if (item.getPit_number().equals("10")) {
helper.setText(R.id.tv_pit, "嘉宾");
}
if (BaseWheatView.WHEAT_HOST.equals(item.getPit_number())) {

6
moduleroom/src/main/java/com/example/moduleroom/dialog/RoomGiftDialogFragment.java
View File

@@ -133,7 +133,7 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
int height = displayMetrics.heightPixels;
// 设置DialogFragment的高度为屏幕高度的70%
dialog.getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, (int) (height * 0.6));
dialog.getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, (int) (height * 0.7));
}
}
@@ -363,7 +363,9 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
// }else {
// mBinding.llGiftRule.setVisibility(View.GONE);
// }
roonGiftModel = event.gift;
// if (event.type==1) {
roonGiftModel = event.gift;
// }
}
public void setGiftDetail(RoonGiftModel giftDetailResp) {

11
moduleroom/src/main/java/com/example/moduleroom/dialog/RoomUserInfoFragment.java
View File

@@ -187,8 +187,17 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
intent.putExtra(TUIConstants.TUIChat.CHAT_TYPE, V2TIMConversation.V2TIM_C2C);
startActivity(intent);
} else if (id == R.id.im_room_gz) {
MvpPre.userGuanz(user_id, "1");
if (MvpPre==null){
MvpPre=bindPresenter();
}
if (user_id!=null) {
MvpPre.userGuanz(user_id, "1");
}
}else if (id == R.id.im_room_sl){
if (pit_number==null){
ToastUtils.show("请选择麦位");
return;
}
userInfo.setPit_number(pit_number);
RoomGiftDialogFragment.show( null,userInfo, room_id,0,getParentFragmentManager());
dismiss();

1
moduleroom/src/main/java/com/example/moduleroom/fragment/RoomCabinFragment.java
View File

@@ -69,7 +69,6 @@ import com.qxcm.moduleutil.bean.room.RoomInfoResp;
import com.qxcm.moduleutil.bean.room.RoomPitBean;
import com.qxcm.moduleutil.event.CabinEvent;
import com.qxcm.moduleutil.event.RoomBeckoningEvent;
import com.qxcm.moduleutil.http.FloatingWindowService;
import com.qxcm.moduleutil.rtc.AgoraManager;
import com.qxcm.moduleutil.utils.ImageUtils;
import com.qxcm.moduleutil.utils.SpUtil;

59
moduleroom/src/main/java/com/example/moduleroom/fragment/RoomFragment.java
View File

@@ -65,6 +65,7 @@ import com.qxcm.moduleutil.event.UnreadCountEvent;
import com.qxcm.moduleutil.listener.MessageListenerSingleton;
import com.qxcm.moduleutil.rtc.AgoraManager;
import com.qxcm.moduleutil.utils.SpUtil;
import com.qxcm.moduleutil.widget.AvatarFrameView;
import com.qxcm.moduleutil.widget.RoomMessageInputMenu;
import com.tencent.imsdk.v2.V2TIMManager;
import com.tencent.imsdk.v2.V2TIMValueCallback;
@@ -132,6 +133,64 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
if (EventBus.getDefault().isRegistered(this)) {
EventBus.getDefault().unregister(this);
}
// 释放SVGA动画资源
if (mBinding != null && mBinding.svgaNobility != null) {
mBinding.svgaNobility.release();
}
releaseAllResources();
}
/**
* 释放Fragment中的所有资源
*/
private void releaseAllResources() {
try {
// 释放计时器
releaseCountDownTimer();
// 释放麦序对话框
if (wheatFeedingDialogFragment != null && wheatFeedingDialogFragment.isAdded()) {
wheatFeedingDialogFragment.dismissAllowingStateLoss();
wheatFeedingDialogFragment = null;
}
// 释放子Fragment
releaseChildFragments();
// 释放输入菜单相关资源
if (mBinding != null && mBinding.inputMenu1 != null) {
mBinding.inputMenu1.dismiss();
}
// 取消所有可能的网络请求
if (MvpPre != null) {
// 取消与Fragment相关的网络请求（如果有提供相应方法）
}
} catch (Exception e) {
LogUtils.e("releaseAllResources error: " + e.getMessage());
}
}
/**
* 释放所有子Fragment
*/
private void releaseChildFragments() {
try {
// 获取所有子Fragment
List<Fragment> fragments = getChildFragmentManager().getFragments();
if (!fragments.isEmpty()) {
FragmentTransaction transaction = getChildFragmentManager().beginTransaction();
for (Fragment fragment : fragments) {
if (fragment != null) {
transaction.remove(fragment);
}
}
transaction.commitAllowingStateLoss();
}
} catch (Exception e) {
LogUtils.e("releaseChildFragments error: " + e.getMessage());
}
}
@Override

18
moduleroom/src/main/res/layout/room_gift_dialog.xml
View File

@@ -7,10 +7,10 @@
</data>
<LinearLayout
<RelativeLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/ll_gift_rule"
@@ -20,6 +20,7 @@
android:layout_marginEnd="@dimen/dp_2"
android:layout_marginBottom="@dimen/dp_12"
android:background="@mipmap/gift_mh"
android:layout_above="@+id/cl"
android:orientation="vertical"
android:visibility="gone"
tools:visibility="visible">
@@ -64,13 +65,16 @@
</LinearLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/bg_room_gift"
android:layout_alignParentBottom="true"
android:paddingStart="@dimen/dp_16"
android:paddingTop="@dimen/dp_25"
android:paddingEnd="@dimen/dp_16"
>
<RelativeLayout
@@ -134,13 +138,15 @@
android:layout_width="match_parent"
android:layout_height="@dimen/dp_240"
android:paddingTop="@dimen/dp_12"
app:layout_constraintTop_toBottomOf="@id/sliding_tab_layout" />
app:layout_constraintTop_toBottomOf="@id/sliding_tab_layout"
app:layout_constraintBottom_toTopOf="@+id/rl_s"/>
<RelativeLayout
android:id="@+id/rl_s"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_32"
android:layout_marginTop="@dimen/dp_16"
android:layout_marginBottom="@dimen/dp_46"
android:layout_marginBottom="@dimen/dp_16"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/view_pager">
@@ -211,5 +217,5 @@
</RelativeLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
</RelativeLayout>
</layout>

4
moduletablayout/build.gradle
View File

@@ -23,6 +23,10 @@ android {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
lint {
baseline = file("lint-baseline.xml")
}
}
dependencies {

2
moduletablayout/src/main/AndroidManifest.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="com.example.moduletablayout">
<manifest >
</manifest>

2
moduletablayout/src/main/java/com/example/moduletablayout/CustomImgSlidingTabLayout.java
View File

@@ -1,5 +1,6 @@
package com.example.moduletablayout;
import android.annotation.SuppressLint;
import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.Bitmap;
@@ -158,6 +159,7 @@ public class CustomImgSlidingTabLayout extends HorizontalScrollView implements V
} else if (height.equals(ViewGroup.LayoutParams.WRAP_CONTENT + "")) {
} else {
int[] systemAttrs = {android.R.attr.layout_height};
@SuppressLint("ResourceType")
TypedArray a = context.obtainStyledAttributes(attrs, systemAttrs);
mHeight = a.getDimensionPixelSize(0, ViewGroup.LayoutParams.WRAP_CONTENT);
a.recycle();

128
modulevocal/src/main/AndroidManifest.xml
View File

@@ -8,139 +8,141 @@
android:supportsRtl="true"
android:theme="@style/BaseAppTheme">
<activity
android:name=".activity.WithdrawalListActivity"
android:launchMode="singleTask"
android:name=".activity.AboutUsActivity"
android:exported="false" />
<activity
android:name=".activity.WithdrawalListActivity"
android:exported="false"
android:launchMode="singleTask" />
<activity
android:name=".activity.GiftBoxRecordActivity"
android:launchMode="singleTask"
android:exported="false" />
android:exported="false"
android:launchMode="singleTask" />
<activity
android:name=".activity.BindCardDetailsActivity"
android:launchMode="singleTask"
android:exported="false" />
android:exported="false"
android:launchMode="singleTask" />
<activity
android:name=".activity.BindCardActivity"
android:launchMode="singleTask"
android:exported="false" />
android:exported="false"
android:launchMode="singleTask" />
<activity
android:name=".activity.AlbumDetailActivity"
android:launchMode="singleTask"
android:exported="false" />
android:exported="false"
android:launchMode="singleTask" />
<activity
android:name=".activity.SettingActivity"
android:launchMode="singleTask"
android:exported="false" />
android:exported="false"
android:launchMode="singleTask" />
<activity
android:name=".activity.CreateAlbumActivity"
android:launchMode="singleTask"
android:exported="false" />
android:exported="false"
android:launchMode="singleTask" />
<activity
android:name=".activity.RealName1Activity"
android:exported="false" />
<activity
android:name=".activity.RevenueActivity"
android:launchMode="singleTask"
android:exported="false" />
android:exported="false"
android:launchMode="singleTask" />
<activity
android:name=".activity.DailyTasksActivity"
android:launchMode="singleTask"
android:exported="false" />
android:exported="false"
android:launchMode="singleTask" />
<activity
android:name=".activity.UserHomepageActivity"
android:launchMode="singleTask"
android:exported="false" />
android:exported="false"
android:launchMode="singleTask" />
<activity
android:name=".activity.MyBagActivity"
android:launchMode="singleTask"
android:exported="false" />
android:exported="false"
android:launchMode="singleTask" />
<activity
android:name=".activity.BriefIntroductionActivity"
android:launchMode="singleTask"
android:exported="false" />
android:exported="false"
android:launchMode="singleTask" />
<activity
android:name=".activity.ChangeNicknameActivity"
android:launchMode="singleTask"
android:exported="false" />
android:exported="false"
android:launchMode="singleTask" />
<activity
android:name=".activity.CurrencyExchangeActivity"
android:launchMode="singleTask"
android:exported="false" />
android:exported="false"
android:launchMode="singleTask" />
<activity
android:name=".activity.WithdrawalActivity"
android:launchMode="singleTask"
android:exported="false" />
android:exported="false"
android:launchMode="singleTask" />
<activity
android:name=".activity.RechargeActivity"
android:launchMode="singleTask"
android:exported="false" />
android:exported="false"
android:launchMode="singleTask" />
<activity
android:name=".activity.MyMoneyActivity"
android:launchMode="singleTask"
android:exported="false" />
android:exported="false"
android:launchMode="singleTask" />
<activity
android:name=".activity.EditUserInfoActivity"
android:launchMode="singleTask"
android:exported="false" />
android:exported="false"
android:launchMode="singleTask" />
<activity
android:name=".activity.EditUserActivity"
android:exported="false" />
<activity
android:name=".activity.ChangPassActivity"
android:launchMode="singleTask"
android:exported="false" />
android:exported="false"
android:launchMode="singleTask" />
<activity
android:name=".activity.PersonalityActivity"
android:launchMode="singleTask"
android:exported="false" />
android:exported="false"
android:launchMode="singleTask" />
<activity
android:name=".activity.RealDetailActivity"
android:launchMode="singleTask"
android:exported="false" />
android:exported="false"
android:launchMode="singleTask" />
<activity
android:name=".activity.RoomAllowanceDetailActivity"
android:launchMode="singleTask"
android:exported="false" />
android:exported="false"
android:launchMode="singleTask" />
<activity
android:name=".activity.RoomAllowanceActivity"
android:launchMode="singleTask"
android:exported="false" />
android:exported="false"
android:launchMode="singleTask" />
<activity
android:name=".activity.RoomDetailsActivity"
android:launchMode="singleTask"
android:exported="false" />
android:exported="false"
android:launchMode="singleTask" />
<activity
android:name=".activity.CreatedRoomActivity"
android:launchMode="singleTask"
android:exported="false" />
android:exported="false"
android:launchMode="singleTask" />
<activity
android:name=".activity.MyRoomActivity"
android:launchMode="singleTask"
android:exported="false" />
android:exported="false"
android:launchMode="singleTask" />
<activity
android:name=".activity.PhoneReplacementActivity"
android:launchMode="singleTask"
android:exported="false" />
android:exported="false"
android:launchMode="singleTask" />
<activity
android:name=".activity.ChangePasswordActivity"
android:exported="false" />
<activity
android:name=".activity.BlacklistActivity"
android:launchMode="singleTask"
android:exported="false" />
android:exported="false"
android:launchMode="singleTask" />
<activity
android:name=".activity.MessageReminderActivity"
android:launchMode="singleTask"
android:exported="false" />
android:exported="false"
android:launchMode="singleTask" />
<activity
android:name=".activity.NotificationActivity"
android:launchMode="singleTask"
android:exported="false" />
android:exported="false"
android:launchMode="singleTask" />
<activity
android:name=".activity.UnderageActivity"
android:launchMode="singleTask"
android:exported="true" />
android:exported="true"
android:launchMode="singleTask" />
</application>
</manifest>

50
modulevocal/src/main/java/com/example/modulevocal/activity/AboutUsActivity.java Normal file
View File

@@ -0,0 +1,50 @@
package com.example.modulevocal.activity;
import android.os.Bundle;
import androidx.activity.EdgeToEdge;
import androidx.appcompat.app.AppCompatActivity;
import androidx.core.graphics.Insets;
import androidx.core.view.ViewCompat;
import androidx.core.view.WindowInsetsCompat;
import com.alibaba.android.arouter.launcher.ARouter;
import com.example.modulevocal.R;
import com.example.modulevocal.databinding.ActivityAboutUsBinding;
import com.qxcm.moduleutil.activity.BaseAppCompatActivity;
import com.qxcm.moduleutil.utils.ARouteConstants;
import com.qxcm.moduleutil.utils.SystemUtils;
import com.qxcm.moduleutil.widget.CommonAppConfig;
/**
*@author qx
*@data 2025/8/14
*@description: 关于我们
*/
public class AboutUsActivity extends BaseAppCompatActivity<ActivityAboutUsBinding> {
@Override
protected void initData() {
mBinding.tvAppVersion.setText("Version " + CommonAppConfig.getInstance().getVersion());
mBinding.llYonghu.setOnClickListener(v -> {
ARouter.getInstance().build(ARouteConstants.H5).withString("url", "file:///android_asset/page_yongh.html").withString("title", "用户协议").navigation();
});
mBinding.llYins.setOnClickListener(v -> {
ARouter.getInstance().build(ARouteConstants.H5).withString("url", "file:///android_asset/page_show.html").withString("title", "隐私协议").navigation();
});
}
@Override
protected void initView() {
mBinding.topBar.setTitle("关于我们");
}
@Override
protected int getLayoutId() {
return R.layout.activity_about_us;
}
}

30
modulevocal/src/main/java/com/example/modulevocal/activity/EditUserInfoActivity.java
View File

@@ -344,21 +344,21 @@ public class EditUserInfoActivity extends BaseMvpActivity<EditUserPresenter, Act
}
});
V2TIMUserFullInfo userFullInfo = new V2TIMUserFullInfo();
userFullInfo.setNickname(userInfo.getNickname());
userFullInfo.setFaceUrl(userInfo.getAvatar());
userFullInfo.setAllowType(userInfo.getSex());
V2TIMManager.getInstance().setSelfInfo(userFullInfo, new V2TIMCallback() {
@Override
public void onSuccess() {
LogUtils.e("@@@", "成功");
}
@Override
public void onError(int code, String desc) {
LogUtils.e("@@@", "描述" + desc);
}
});
// V2TIMUserFullInfo userFullInfo = new V2TIMUserFullInfo();
// userFullInfo.setNickname(userInfo.getNickname());
// userFullInfo.setFaceUrl(userInfo.getAvatar());
// userFullInfo.setAllowType(userInfo.getSex());
// V2TIMManager.getInstance().setSelfInfo(userFullInfo, new V2TIMCallback() {
// @Override
// public void onSuccess() {
// LogUtils.e("@@@", "成功");
// }
//
// @Override
// public void onError(int code, String desc) {
// LogUtils.e("@@@", "描述" + desc);
// }
// });
}
@Override

117
modulevocal/src/main/java/com/example/modulevocal/activity/PhoneReplacementActivity.java
View File

@@ -1,6 +1,8 @@
package com.example.modulevocal.activity;
import android.os.Bundle;
import android.os.CountDownTimer;
import android.view.View;
import androidx.activity.EdgeToEdge;
import androidx.appcompat.app.AppCompatActivity;
@@ -9,28 +11,129 @@ import androidx.core.view.ViewCompat;
import androidx.core.view.WindowInsetsCompat;
import com.example.modulevocal.R;
import com.example.modulevocal.conacts.PhoneReplacementConacts;
import com.example.modulevocal.databinding.ActivityPhoneReplacementBinding;
import com.example.modulevocal.presenter.PhoneReplacementPresenter;
import com.hjq.toast.ToastUtils;
import com.qxcm.moduleutil.activity.BaseAppCompatActivity;
import com.qxcm.moduleutil.activity.BaseMvpActivity;
import com.qxcm.moduleutil.utils.SpUtil;
/**
*@author
*@data
*@description: 手机换绑
* @author
* @data
* @description: 手机换绑
*/
public class PhoneReplacementActivity extends BaseAppCompatActivity<ActivityPhoneReplacementBinding> {
public class PhoneReplacementActivity extends BaseMvpActivity<PhoneReplacementPresenter, ActivityPhoneReplacementBinding> implements PhoneReplacementConacts.View {
private CountDownTimer mTimer;
private String mobile;
private String type;//1：更换手机 2：绑定手机
@Override
protected void initData() {
if (SpUtil.getUserBean().getMobile() == null || SpUtil.getUserBean().getMobile().equals("")) {
type="2";
mBinding.topBar.setTitle("手机绑定");
}else {
type="1";
mBinding.topBar.setTitle("手机换绑");
}
}
@Override
protected PhoneReplacementPresenter bindPresenter() {
return new PhoneReplacementPresenter(this, this);
}
@Override
protected void initView() {
mBinding.topBar.setTitle("手机换绑");
mBinding.tvSendCode.setOnClickListener(this::onClick);
mBinding.btnSubmit.setOnClickListener(this::onClick);
}
@Override
protected int getLayoutId() {
return R.layout.activity_phone_replacement;
}
private void onClick(View view) {
if (view.getId() == R.id.tv_send_code) {
if (mBinding.edPhone.getText().toString().isEmpty()) {
ToastUtils.show("请输入手机号");
return;
}
if (MvpPre == null) {
MvpPre = bindPresenter();
}
MvpPre.sendCode(mBinding.edPhone.getText().toString(), type);
sendCodeSuccess2(mBinding.edPhone.getText().toString());
} else if (view.getId() == R.id.btnSubmit) {
if (mBinding.edPhone.getText().toString().isEmpty()) {
com.blankj.utilcode.util.ToastUtils.showShort("请输入手机号");
return;
}
if (mBinding.edPassword.getText().toString().isEmpty()) {
com.blankj.utilcode.util.ToastUtils.showShort("请输入验证码");
return;
}
if (MvpPre != null) {
if (SpUtil.getUserBean().getMobile() == null || SpUtil.getUserBean().getMobile().equals("")){
MvpPre.mobileView(mBinding.edPhone.getText().toString(), mBinding.edPhone.getText().toString(), mBinding.edPassword.getText().toString(), type);
}else {
MvpPre.mobileView(SpUtil.getUserBean().getMobile(), mBinding.edPhone.getText().toString(), mBinding.edPassword.getText().toString(), type);
}
}
}
}
public void sendCodeSuccess2(String phoneNumber) {
com.blankj.utilcode.util.ToastUtils.showShort("短信验证码发送成功请注意查收");
mBinding.tvSendCode.setEnabled(false);
mBinding.tvSendCode.setAlpha(0.5f);
releaseTimer();
if (mTimer != null) {
mTimer.cancel();
}
mTimer = new CountDownTimer(60000L, 1000L) {
@Override
public void onTick(long millisUntilFinished) {
if (mBinding.tvSendCode != null) {
mBinding.tvSendCode.setText(String.format("重新发送（%s）", millisUntilFinished / 1000));
}
}
@Override
public void onFinish() {
mBinding.tvSendCode.setAlpha(1f);
mBinding.tvSendCode.setEnabled(true);
mBinding.tvSendCode.setText("重新发送");
}
};
mTimer.start();
}
private void releaseTimer() {
if (mTimer != null) {
mTimer.cancel();
mTimer = null;
}
}
@Override
public void sendCodeSuccess1(String phoneNumber) {
}
@Override
public void sendCodeSuccess(String s) {
if (s.contains("失败")){
ToastUtils.show(s);
}else {
ToastUtils.show(s);
finish();
}
}
}

7
modulevocal/src/main/java/com/example/modulevocal/activity/RoomDetailsActivity.java
View File

@@ -154,6 +154,9 @@ public class RoomDetailsActivity extends BaseMvpActivity<RoomDetailsPresenter, A
r.setTotal_earning(list.getList().get(i).getTotal_earning());
r.setTime(list.getList().get(i).getTime());
r.setSticky(true);
if (currentPage==1){
loadedUserIds.clear();
}
// 确保不重复添加
if (!loadedUserIds.contains(r.getTime())) {
newData.add(r);
@@ -191,7 +194,9 @@ public class RoomDetailsActivity extends BaseMvpActivity<RoomDetailsPresenter, A
mBinding.rv.requestLayout();
} else {
adapter.setNewData(null);
if (currentPage == 1) {
adapter.setNewData(null);
}
}
}

7
modulevocal/src/main/java/com/example/modulevocal/activity/SettingActivity.java
View File

@@ -131,8 +131,11 @@ 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());
// 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);
Intent intent=new Intent(this, AboutUsActivity.class);
startActivity(intent);
}
}

4
modulevocal/src/main/java/com/example/modulevocal/adapter/TaskBoxAdapter.java
View File

@@ -42,14 +42,14 @@ public class TaskBoxAdapter extends BaseQuickAdapter<GiftBoxBean.GiftBean, BaseV
if (position == 0) {
itemView.setBackgroundColor(mContext.getResources().getColor(com.qxcm.moduleutil.R.color.color_FCE4ED)); // 红色
giftName.setTextColor(mContext.getResources().getColor(com.qxcm.moduleutil.R.color.color_E24171));
setSpannableText(giftTitle, "最高可获得%d金币", Integer.parseInt(item.getHighest_gain()),com.qxcm.moduleutil.R.color.color_E24171);
setSpannableText(giftTitle, item.getTitle(), Integer.parseInt(item.getHighest_gain()),com.qxcm.moduleutil.R.color.color_E24171);
// helper.setImageDrawable(R.id.task_box, mContext.getResources().getDrawable(com.qxcm.moduleutil.R.mipmap.task_cj));
} else if (position == 1) {
itemView.setBackgroundColor(mContext.getResources().getColor(com.qxcm.moduleutil.R.color.color_FDE8AE)); // 黄色
giftName.setTextColor(mContext.getResources().getColor(com.qxcm.moduleutil.R.color.color_F35F07));
setSpannableText(giftTitle, "最高可获得%d金币", Integer.parseInt(item.getHighest_gain()),com.qxcm.moduleutil.R.color.color_F35F07);
setSpannableText(giftTitle, item.getTitle(), Integer.parseInt(item.getHighest_gain()),com.qxcm.moduleutil.R.color.color_F35F07);
// helper.setImageDrawable(R.id.task_box, mContext.getResources().getDrawable(com.qxcm.moduleutil.R.mipmap.task_gj));
} else {

21
modulevocal/src/main/java/com/example/modulevocal/conacts/PhoneReplacementConacts.java Normal file
View File

@@ -0,0 +1,21 @@
package com.example.modulevocal.conacts;
import android.app.Activity;
import com.qxcm.moduleutil.activity.IPresenter;
import com.qxcm.moduleutil.activity.IView;
public class PhoneReplacementConacts {
public interface View extends IView<Activity> {
void sendCodeSuccess1(String phoneNumber);
void sendCodeSuccess(String s);
}
public interface IMePre extends IPresenter {
void sendCode(String phoneNumber, String type);
void mobileView(String mobile, String new_mobile, String sms_code,String type);
}
}

6
modulevocal/src/main/java/com/example/modulevocal/fragment/UserHomepageFragment.java
View File

@@ -165,6 +165,12 @@ public class UserHomepageFragment extends BaseMvpFragment<UserHomepagePresenter,
mBinding.headerInfo.tvGz.setOnClickListener(this::onClick);
mBinding.headerInfo.tvGsSx.setOnClickListener(this::onClick);
refreshView();
if (userInfo.getGuild()==null || userInfo.getGuild().isEmpty()){
mBinding.headerInfo.tvGH.setText("所属公会：无");
}else {
mBinding.headerInfo.tvGH.setText("所属公会："+userInfo.getGuild());
}
}
private void refreshView() {

3
modulevocal/src/main/java/com/example/modulevocal/fragment/VocalRangeFragment.java
View File

@@ -236,7 +236,8 @@ public class VocalRangeFragment extends BaseMvpFragment<MePresenter, FragmentVoc
// 设置剪贴板数据
clipboard.setPrimaryClip(clip);
Toast.makeText(getContext(), "复制成功", Toast.LENGTH_SHORT);
// Toast.makeText(getContext(), "复制成功", Toast.LENGTH_SHORT);
ToastUtils.showShort("复制成功");
// 可选：通知用户文本已复制
}

76
modulevocal/src/main/java/com/example/modulevocal/presenter/PhoneReplacementPresenter.java Normal file
View File

@@ -0,0 +1,76 @@
package com.example.modulevocal.presenter;
import android.content.Context;
import com.example.modulevocal.conacts.PhoneReplacementConacts;
import com.qxcm.moduleutil.http.BaseObserver;
import com.qxcm.moduleutil.presenter.BasePresenter;
import java.lang.ref.WeakReference;
import io.reactivex.disposables.Disposable;
public class PhoneReplacementPresenter extends BasePresenter<PhoneReplacementConacts.View> implements PhoneReplacementConacts.IMePre{
PhoneReplacementConacts.View mView;
public PhoneReplacementPresenter(PhoneReplacementConacts.View view, Context context) {
super(view, context);
this.mView = view;
}
@Override
public void sendCode(String phoneNumber, String type) {
api.sendCode(phoneNumber,type, new BaseObserver<Object>() {
@Override
public void onSubscribe(Disposable d) {
addDisposable(d);
}
@Override
public void onNext(Object o) {
if (MvpRef==null){
MvpRef=new WeakReference<>(mView);
}
MvpRef.get().sendCodeSuccess1(phoneNumber);
}
});
}
@Override
public void mobileView(String mobile, String new_mobile, String sms_code,String type) {
if (type.equals("1")){
api.mobileView(mobile, new_mobile, sms_code, new BaseObserver<String>() {
@Override
public void onSubscribe(Disposable d) {
addDisposable( d);
}
@Override
public void onNext(String s) {
if (MvpRef==null){
MvpRef=new WeakReference<>(mView);
}
MvpRef.get().sendCodeSuccess(s);
}
});
}else if (type.equals("2")){
api.mobileView2(new_mobile, sms_code, new BaseObserver<String>() {
@Override
public void onSubscribe(Disposable d) {
addDisposable(d);
}
@Override
public void onNext(String s) {
if (MvpRef==null){
MvpRef=new WeakReference<>(mView);
}
MvpRef.get().sendCodeSuccess(s);
}
});
}
}
}

104
modulevocal/src/main/res/layout/activity_about_us.xml Normal file
View File

@@ -0,0 +1,104 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/main"
tools:context=".activity.AboutUsActivity">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@mipmap/log_bj">
<com.qxcm.moduleutil.widget.CustomTopBar
android:id="@+id/top_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/im_title"
android:layout_width="@dimen/dp_80"
android:layout_height="@dimen/dp_80"
android:layout_marginTop="@dimen/dp_100"
android:src="@mipmap/ic_launcher_round"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_app_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:gravity="center"
android:text="@string/app_name"
android:textColor="@color/black"
android:textSize="@dimen/sp_20"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/im_title" />
<TextView
android:id="@+id/tv_app_version"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:textColor="@color/black"
android:textSize="@dimen/sp_15"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_app_name"
tools:text="版本号：1.0.0" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_200"
android:orientation="vertical"
android:layout_marginTop="@dimen/dp_10"
app:layout_constraintTop_toBottomOf="@+id/tv_app_version"
android:background="@drawable/bg_r15_white"
>
<LinearLayout
android:id="@+id/ll_yonghu"
style="@style/My_Info_Item_LL_Style"
>
<TextView
style="@style/My_Info_Item_Title_Style"
android:layout_width="0dp"
android:layout_weight="1"
android:text="用户许可协议" />
<ImageView style="@style/My_Info_Item_Arrow_Style" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_alignParentBottom="true"
android:background="#E2E2E2"
/>
<LinearLayout
android:id="@+id/ll_yins"
style="@style/My_Info_Item_LL_Style"
android:background="@drawable/bg_r15_white">
<TextView
style="@style/My_Info_Item_Title_Style"
android:layout_width="0dp"
android:layout_weight="1"
android:text="隐私协议" />
<ImageView style="@style/My_Info_Item_Arrow_Style" />
</LinearLayout>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>

2
modulevocal/src/main/res/layout/activity_currency_exchange.xml
View File

@@ -127,7 +127,7 @@
android:layout_alignParentEnd="true"
android:gravity="center"
android:layout_marginStart="@dimen/dp_4"
android:text="全部提现"
android:text="全部兑换"
android:textSize="@dimen/sp_12"
android:textColor="#0DFB89"
/>

2
modulevocal/src/main/res/layout/activity_phone_replacement.xml
View File

@@ -84,7 +84,7 @@
android:layout_toRightOf="@+id/iv_code"
android:background="@android:color/transparent"
android:hint="@string/login_hint_code"
android:inputType="textPassword"
android:inputType="number"
android:maxLength="20"
android:singleLine="true"
android:textColor="@color/black"

258
modulevocal/src/main/res/layout/activity_recharge.xml
View File

@@ -67,182 +67,109 @@
</RelativeLayout>
</RelativeLayout>
<ScrollView
android:id="@+id/scroll_view"
<!-- 使用NestedScrollView替代ScrollView -->
<androidx.core.widget.NestedScrollView
android:id="@+id/nested_scroll_view"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_300"
app:layout_constraintTop_toBottomOf="@+id/rl_1">
android:layout_height="0dp"
android:layout_marginTop="@dimen/dp_12"
app:layout_constraintTop_toBottomOf="@+id/rl_1"
app:layout_constraintBottom_toTopOf="@+id/tv_payment"
app:layout_constraintVertical_bias="0.0">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_12"
android:layout_marginEnd="@dimen/dp_16" />
</ScrollView>
android:orientation="vertical">
<RelativeLayout
android:id="@+id/r_4"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_12"
android:layout_marginEnd="@dimen/dp_16"
app:layout_constraintBottom_toTopOf="@+id/v_view"
app:layout_constraintTop_toBottomOf="@+id/scroll_view">
<!-- 第一个RecyclerView -->
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_16"
android:nestedScrollingEnabled="false" />
<TextView
android:id="@+id/t_4"
android:layout_width="@dimen/dp_18"
android:layout_height="@dimen/dp_27"
android:layout_alignParentStart="true"
android:layout_centerInParent="true"
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_16"
android:gravity="center"
android:text="￥"
android:textColor="@color/color_FF000000"
android:textSize="@dimen/sp_18"
android:textStyle="bold" />
<RelativeLayout
android:id="@+id/r_4"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_12"
android:layout_marginEnd="@dimen/dp_16">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/et_custom_amount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_toRightOf="@+id/t_4"
android:background="@null"
android:hint="请输入充值金额"
android:inputType="numberDecimal"
android:textColorHint="@color/color_FF999999"
android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/t_4"
android:layout_width="@dimen/dp_18"
android:layout_height="@dimen/dp_27"
android:layout_alignParentStart="true"
android:layout_centerInParent="true"
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_16"
android:gravity="center"
android:text="￥"
android:textColor="@color/color_FF000000"
android:textSize="@dimen/sp_18"
android:textStyle="bold" />
<TextView
android:id="@+id/t_5"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_27"
android:layout_alignParentEnd="true"
android:layout_centerInParent="true"
android:layout_marginStart="@dimen/dp_4"
android:gravity="center"
android:text="将获得0金币"
android:textStyle="bold"
android:visibility="gone" />
</RelativeLayout>
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/et_custom_amount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_toRightOf="@+id/t_4"
android:background="@null"
android:hint="请输入充值金额"
android:inputType="numberDecimal"
android:textColorHint="@color/color_FF999999"
android:textSize="@dimen/sp_14" />
<View
android:id="@+id/v_view"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_0_5"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_12"
android:layout_marginEnd="@dimen/dp_16"
android:background="@color/color_FF999999"
app:layout_constraintTop_toBottomOf="@id/r_4" />
<TextView
android:id="@+id/t_5"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_27"
android:layout_alignParentEnd="true"
android:layout_centerInParent="true"
android:layout_marginStart="@dimen/dp_4"
android:gravity="center"
android:text="将获得0金币"
android:textStyle="bold"
android:visibility="gone" />
</RelativeLayout>
<TextView
android:id="@+id/t_2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_12"
android:layout_marginEnd="@dimen/dp_16"
android:text="@string/payment_method"
android:textColor="@color/color_FF333333"
android:textSize="@dimen/sp_16"
app:layout_constraintTop_toBottomOf="@id/v_view" />
<View
android:id="@+id/v_view"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_0_5"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_12"
android:layout_marginEnd="@dimen/dp_16"
android:background="@color/color_FF999999" />
<!-- <RelativeLayout-->
<!-- android:id="@+id/rl_weixin_pay"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginStart="@dimen/dp_16"-->
<!-- android:layout_marginTop="@dimen/dp_10"-->
<!-- android:layout_marginEnd="@dimen/dp_16"-->
<!-- app:layout_constraintTop_toBottomOf="@+id/t_2">-->
<TextView
android:id="@+id/t_2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_12"
android:layout_marginEnd="@dimen/dp_16"
android:text="@string/payment_method"
android:textColor="@color/color_FF333333"
android:textSize="@dimen/sp_16" />
<!-- <ImageView-->
<!-- android:id="@+id/im_wx"-->
<!-- android:layout_width="@dimen/dp_20"-->
<!-- android:layout_height="@dimen/dp_20"-->
<!-- android:src="@mipmap/wx_zf" />-->
<!-- 第二个RecyclerView -->
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycle_view1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_12"
android:layout_marginEnd="@dimen/dp_16"
android:nestedScrollingEnabled="false" />
<!-- <TextView-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_centerVertical="true"-->
<!-- android:layout_marginLeft="@dimen/dp_1"-->
<!-- android:layout_toRightOf="@+id/im_wx"-->
<!-- android:text="@string/wechat_payment"-->
<!-- android:textColor="@color/color_FF333333"-->
<!-- android:textSize="@dimen/sp_14" />-->
<!-- <ImageView-->
<!-- android:id="@+id/iv_weixin"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_alignParentRight="true"-->
<!-- android:layout_centerVertical="true"-->
<!-- android:layout_marginEnd="@dimen/dp_2"-->
<!-- android:src="@drawable/level_pay" />-->
<!-- </RelativeLayout>-->
<!-- <RelativeLayout-->
<!-- android:id="@+id/rl_three_pay"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginStart="@dimen/dp_16"-->
<!-- android:layout_marginTop="@dimen/dp_12"-->
<!-- android:layout_marginEnd="@dimen/dp_16"-->
<!-- app:layout_constraintTop_toBottomOf="@+id/rl_weixin_pay">-->
<!-- <ImageView-->
<!-- android:id="@+id/im_zfb"-->
<!-- android:layout_width="@dimen/dp_20"-->
<!-- android:layout_height="@dimen/dp_20"-->
<!-- android:src="@mipmap/sign_icon_zfb" />-->
<!-- <TextView-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_centerVertical="true"-->
<!-- android:layout_marginLeft="@dimen/dp_1"-->
<!-- android:layout_toRightOf="@+id/im_zfb"-->
<!-- android:text="@string/alipay_payment"-->
<!-- android:textColor="@color/color_FF333333"-->
<!-- android:textSize="@dimen/sp_14" />-->
<!-- <ImageView-->
<!-- android:id="@+id/iv_three_pay"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_alignParentRight="true"-->
<!-- android:layout_centerVertical="true"-->
<!-- android:layout_marginEnd="@dimen/dp_2"-->
<!-- android:src="@drawable/level_pay" />-->
<!-- </RelativeLayout>-->
<ScrollView
android:id="@+id/scroll_view2"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_140"
app:layout_constraintTop_toBottomOf="@+id/t_2">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycle_view1"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_12"
android:layout_marginEnd="@dimen/dp_16"
app:layout_constraintTop_toBottomOf="@+id/t_2" />
</ScrollView>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
<TextView
android:id="@+id/tv_payment"
@@ -251,7 +178,7 @@
android:layout_alignParentBottom="true"
android:layout_marginLeft="@dimen/dp_38"
android:layout_marginRight="@dimen/dp_38"
android:layout_marginBottom="@dimen/dp_47"
android:layout_marginBottom="@dimen/dp_27"
android:background="@drawable/cs"
android:gravity="center"
android:text="确认支付"
@@ -259,7 +186,6 @@
android:textSize="@dimen/sp_14"
app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
</layout>

97
modulevocal/src/main/res/layout/user_top.xml
View File

@@ -13,21 +13,19 @@
android:clipChildren="false">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_177"
android:layout_height="@dimen/dp_187"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_60"
android:layout_marginEnd="@dimen/dp_16"
android:background="@drawable/bg_r16_fff">
<com.qxcm.moduleutil.utils.MeHeadView
android:id="@+id/riv_user_head"
android:layout_width="@dimen/dp_70"
android:layout_height="@dimen/dp_70"
android:layout_marginTop="-20dp"
/>
android:layout_marginTop="-20dp" />
<TextView
android:id="@+id/tv_gz"
@@ -36,25 +34,24 @@
android:layout_marginTop="@dimen/dp_19"
android:layout_marginEnd="@dimen/dp_6"
android:layout_toStartOf="@+id/tv_gs_sx"
android:background="@mipmap/gz"
/>
android:background="@mipmap/gz" />
<TextView
android:id="@+id/tv_gs_sx"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_29"
android:layout_alignParentEnd="true"
android:layout_marginTop="@dimen/dp_19"
android:layout_marginEnd="@dimen/dp_12"
android:layout_alignParentEnd="true"
android:background="@mipmap/gsui"
/>
android:background="@mipmap/gsui" />
<TextView
android:id="@+id/tv_nick_name"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_24"
android:layout_below="@+id/riv_user_head"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_4"
android:layout_below="@+id/riv_user_head"
android:textColor="@color/color_FF333333"
android:textSize="@dimen/sp_16"
tools:text="备注名" />
@@ -62,19 +59,18 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_4"
android:layout_alignTop="@+id/tv_nick_name"
android:layout_marginStart="@dimen/dp_12"
android:gravity="center"
android:layout_marginTop="@dimen/dp_4"
android:layout_toEndOf="@id/tv_nick_name"
android:layout_alignTop="@+id/tv_nick_name">
android:gravity="center">
<TextView
android:layout_width="@dimen/dp_20"
android:layout_height="@dimen/dp_20"
android:text="ID:"
android:textColor="@color/color_FF999999"
android:textSize="@dimen/sp_12"
/>
android:textSize="@dimen/sp_12" />
<TextView
android:id="@+id/tv_user_id"
@@ -90,47 +86,57 @@
android:id="@+id/tv_age"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_8"
android:layout_marginStart="@dimen/dp_16"
android:layout_below="@id/tv_nick_name"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_8"
android:text="25岁"
android:textColor="@color/color_FF999999"
android:textSize="@dimen/sp_12" />
<!-- <androidx.recyclerview.widget.RecyclerView-->
<!-- <androidx.recyclerview.widget.RecyclerView-->
<!-- android:id="@+id/recycle_view1"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="@dimen/dp_16"-->
<!-- android:layout_toRightOf="@+id/tv_age"-->
<!-- android:layout_marginStart="@dimen/dp_8"-->
<!-- android:layout_alignTop="@+id/tv_age"/>-->
<!-- android:id="@+id/recycle_view1"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="@dimen/dp_16"-->
<!-- android:layout_toRightOf="@+id/tv_age"-->
<!-- android:layout_marginStart="@dimen/dp_8"-->
<!-- android:layout_alignTop="@+id/tv_age"/>-->
<LinearLayout
android:id="@+id/ll_image_container"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_16"
android:layout_toRightOf="@+id/tv_age"
android:layout_marginStart="@dimen/dp_8"
android:layout_alignTop="@+id/tv_age"
android:orientation="horizontal"
/>
android:layout_marginStart="@dimen/dp_8"
android:layout_toRightOf="@+id/tv_age"
android:orientation="horizontal" />
<TextView
android:id="@+id/tv_g_h"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/tv_age"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_8"
android:textColor="@color/color_FF999999"
android:textSize="@dimen/sp_12"
tools:text="所属公会：" />
<TextView
android:id="@+id/tv_jj"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_22"
android:layout_below="@id/tv_g_h"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_8"
android:layout_marginEnd="@dimen/dp_16"
android:ellipsize="end"
android:gravity="left|center"
android:singleLine="true"
android:textColor="@color/color_FF333333"
android:textSize="@dimen/sp_14"
tools:text="时光会教会你所有的过去，但你只能看到现在，所以好好" />
<TextView
android:id="@+id/tv_jj"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_22"
android:gravity="left|center"
android:layout_marginTop="@dimen/dp_8"
android:layout_below="@id/tv_age"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_16"
android:textColor="@color/color_FF333333"
android:textSize="@dimen/sp_14"
android:singleLine="true"
android:ellipsize="end"
tools:text="时光会教会你所有的过去，但你只能看到现在，所以好好"
/>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycle_view2"
@@ -138,8 +144,7 @@
android:layout_height="@dimen/dp_24"
android:layout_below="@+id/tv_jj"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_8"
/>
android:layout_marginTop="@dimen/dp_8" />
</RelativeLayout>
</RelativeLayout>

6
modulevocal/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
View File

@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
<monochrome android:drawable="@drawable/ic_launcher_foreground" />
</adaptive-icon>

6
modulevocal/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
View File

@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
<monochrome android:drawable="@drawable/ic_launcher_foreground" />
</adaptive-icon>

BIN
modulevocal/src/main/res/mipmap-hdpi/ic_launcher.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

BIN
modulevocal/src/main/res/mipmap-hdpi/ic_launcher_round.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.8 KiB

BIN
modulevocal/src/main/res/mipmap-mdpi/ic_launcher.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 982 B

BIN
modulevocal/src/main/res/mipmap-mdpi/ic_launcher_round.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.7 KiB

BIN
modulevocal/src/main/res/mipmap-xhdpi/ic_launcher.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.9 KiB

BIN
modulevocal/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.8 KiB

BIN
modulevocal/src/main/res/mipmap-xxhdpi/ic_launcher.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.8 KiB

BIN
modulevocal/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.8 KiB

BIN
modulevocal/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.8 KiB

BIN
modulevocal/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 7.6 KiB

40
modulevoice/src/main/java/com/example/modulevoice/activity/ui/main/PlaceholderFragment.java
View File

@@ -30,6 +30,7 @@ import com.example.modulevoice.presenter.PlaceholderPresenter;
import com.lihang.ShadowLayout;
import com.qxcm.moduleutil.base.BaseMvpFragment;
import com.qxcm.moduleutil.bean.PlaceholderBean;
import com.qxcm.moduleutil.utils.ARouteConstants;
import com.qxcm.moduleutil.utils.ImageUtils;
import com.qxcm.moduleutil.utils.StringUtil;
import com.qxcm.moduleutil.widget.BeautifulNameView;
@@ -163,7 +164,7 @@ public class PlaceholderFragment extends BaseMvpFragment<PlaceholderPresenter, F
@Override
protected void convert(BaseViewHolder helper, PlaceholderBean.ListsBean item) {
helper.setText(R.id.tv_charm, StringUtil.toWan2(item.getTotal(),1));
helper.setText(R.id.tv_charm, StringUtil.toWan2(item.getTotal(), 1));
RelativeLayout rl = helper.getView(R.id.r_3_2);
if (index == 0) {
rl.setVisibility(View.GONE);
@@ -190,10 +191,8 @@ public class PlaceholderFragment extends BaseMvpFragment<PlaceholderPresenter, F
helper.itemView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
// if (type == RankingFragment.TYPE_WEALTH) {
// return;
// }
// ARouter.getInstance().build(ARouteConstants.NEW_HOME_PAGE).withString("userId", item.getUser_id()).navigation();
ARouter.getInstance().build(ARouteConstants.USER_HOME_PAGE).withString("userId", item.getUser_id()).navigation();
}
});
} else if (index == 3) {
@@ -284,7 +283,7 @@ public class PlaceholderFragment extends BaseMvpFragment<PlaceholderPresenter, F
TextView tvRankState = mBinding.includeTopBar.tvRankState;
TextView tvRankNo = mBinding.includeTopBar.tvRankNo;
tvCharm.setText(StringUtil.toWan2(data.getTotal(),1));
tvCharm.setText(StringUtil.toWan2(data.getTotal(), 1));
if (data.getRank().equals("-1")) {
tvRankState.setText("暂未上榜");
tvRankNo.setText(new SpanUtils().append("距上榜差 ").append(data.getDiff() + "").setBold().setForegroundColor(Color.parseColor("#FFFF8ACC")).setFontSize(12, true).create());
@@ -330,22 +329,23 @@ public class PlaceholderFragment extends BaseMvpFragment<PlaceholderPresenter, F
ivOneCp2Hhead.setImageResource(0); // 设置默认图片资源
return;
}
tvXing1.setText(StringUtil.toWan2(data.getTotal(),1));
tvXing1.setBackgroundResource(type.equals("4") ? com.qxcm.moduleutil.R.mipmap.bangdan3 :com.qxcm.moduleutil.R.mipmap.bangdan4);
tvXing1.setText(StringUtil.toWan2(data.getTotal(), 1));
tvXing1.setBackgroundResource(type.equals("4") ? com.qxcm.moduleutil.R.mipmap.bangdan3 : com.qxcm.moduleutil.R.mipmap.bangdan4);
if (type.equals("0")) {
tvUsername1.setText(data.getRoom_name());
ImageUtils.loadHeadCC(data.getRoom_cover(), imUser1);
tvId1.setText(data.getRoom_id() != null ? "ID:" + data.getRoom_id() : "");
imUser1.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
// ARouter.getInstance().build(ARouteConstants.NEW_HOME_PAGE).withString("userId", listsBean.getUser_id()).navigation();
}
});
} else if (type.equals("1") || type.equals("2")) {
tvUsername1.setText(data.getNickname());
ImageUtils.loadHeadCC(data.getAvatar(), imUser1);
tvId1.setText(data.getUser_id() != null ? "ID:" + data.getUser_id() : "");
imUser1.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
ARouter.getInstance().build(ARouteConstants.USER_HOME_PAGE).withString("userId", data.getUser_id()).navigation();
}
});
} else if (type.equals("3")) {
tvUsername1.setText(data.getGuild_name());
ImageUtils.loadHeadCC(data.getCover(), imUser1);
@@ -383,8 +383,8 @@ public class PlaceholderFragment extends BaseMvpFragment<PlaceholderPresenter, F
ivOneCp2Hhead.setImageResource(0); // 设置默认图片资源
return;
}
tvXing2.setText(StringUtil.toWan2(data.getTotal(),1));
tvXing2.setBackgroundResource(type.equals("4") ? com.qxcm.moduleutil.R.mipmap.bangdan3 :com.qxcm.moduleutil.R.mipmap.bangdan4);
tvXing2.setText(StringUtil.toWan2(data.getTotal(), 1));
tvXing2.setBackgroundResource(type.equals("4") ? com.qxcm.moduleutil.R.mipmap.bangdan3 : com.qxcm.moduleutil.R.mipmap.bangdan4);
if (type.equals("0")) {
tvUsername2.setText(data.getRoom_name());
ImageUtils.loadHeadCC(data.getRoom_cover(), imUser2);
@@ -396,7 +396,7 @@ public class PlaceholderFragment extends BaseMvpFragment<PlaceholderPresenter, F
imUser2.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
// ARouter.getInstance().build(ARouteConstants.NEW_HOME_PAGE).withString("userId", listsBean.getUser_id()).navigation();
ARouter.getInstance().build(ARouteConstants.USER_HOME_PAGE).withString("userId", data.getUser_id()).navigation();
}
});
} else if (type.equals("3")) {
@@ -435,8 +435,8 @@ public class PlaceholderFragment extends BaseMvpFragment<PlaceholderPresenter, F
ivOneCp2Hhead.setImageResource(0); // 设置默认图片资源
return;
}
tvXing3.setText(StringUtil.toWan2(data.getTotal(),1));
tvXing3.setBackgroundResource(type.equals("4") ? com.qxcm.moduleutil.R.mipmap.bangdan3 :com.qxcm.moduleutil.R.mipmap.bangdan4);
tvXing3.setText(StringUtil.toWan2(data.getTotal(), 1));
tvXing3.setBackgroundResource(type.equals("4") ? com.qxcm.moduleutil.R.mipmap.bangdan3 : com.qxcm.moduleutil.R.mipmap.bangdan4);
if (type.equals("0")) {
tvUsername3.setText(data.getRoom_name());
ImageUtils.loadHeadCC(data.getRoom_cover(), imUser3);
@@ -448,7 +448,7 @@ public class PlaceholderFragment extends BaseMvpFragment<PlaceholderPresenter, F
imUser3.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
// ARouter.getInstance().build(ARouteConstants.NEW_HOME_PAGE).withString("userId", listsBean.getUser_id()).navigation();
ARouter.getInstance().build(ARouteConstants.USER_HOME_PAGE).withString("userId", data.getUser_id()).navigation();
}
});
} else if (type.equals("3")) {

38
modulevoice/src/main/java/com/example/modulevoice/fragment/HotListFragment.java
View File

@@ -25,13 +25,14 @@ import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
import org.greenrobot.eventbus.EventBus;
import java.util.ArrayList;
import java.util.List;
public class HotListFragment extends BaseMvpFragment<HotListPresenter, FragmentHotListBinding> implements HotListContacts.View {
private String label_id;
private HotAdapter mAdapter;
private String tag;
private int page;
private int page=1;
public static HotListFragment newInstance(String type, String tag) {
@@ -48,6 +49,7 @@ public class HotListFragment extends BaseMvpFragment<HotListPresenter, FragmentH
super.initArgs(arguments);
label_id = arguments.getString("label_id");
tag = arguments.getString("tag");
page = 1; // 重置page
}
@Override
@@ -103,6 +105,8 @@ public class HotListFragment extends BaseMvpFragment<HotListPresenter, FragmentH
public void onRefresh(@NonNull RefreshLayout refreshLayout) {
// EventBus.getDefault().post(new BannerRefreshEvent());
page = 1;
// 确保在请求前清空适配器数据
mAdapter.setNewData(new ArrayList<>());
MvpPre.getRoomList(2, page+"", "20", "1", label_id);
}
});
@@ -125,16 +129,32 @@ public class HotListFragment extends BaseMvpFragment<HotListPresenter, FragmentH
@Override
public void roomList(List<TopRoom> data, int type) {
if (data!= null && data.size() > 0) {
if (page==1) {
mAdapter.setNewData(data);
}else {
mAdapter.setNewData(data);
if (data != null && data.size() > 0) {
if (page == 1) {
mAdapter.setNewData(data); // 刷新时替换数据
} else {
// 检查是否有重复数据
boolean hasDuplicate = false;
List<TopRoom> currentData = mAdapter.getData();
if (!currentData.isEmpty() && data.size() > 0) {
// 检查第一条数据是否已经存在
TopRoom firstNewData = data.get(0);
for (TopRoom item : currentData) {
if (item.getRoom_id().equals(firstNewData.getRoom_id())) {
hasDuplicate = true;
break;
}
}
}
if (!hasDuplicate) {
mAdapter.addData(data); // 加载更多时添加数据
}
}
} else if (page == 1) {
// 如果是刷新且没有数据，清空列表
mAdapter.setNewData(new ArrayList<>());
}
// }else {
// mAdapter.addData(data);
// }
}
@Override

80
modulevoice/src/main/java/com/example/modulevoice/fragment/VoiceCategoryFragment.java
View File

@@ -37,7 +37,6 @@ import com.qxcm.moduleutil.event.RoomGiftRunable;
import com.qxcm.moduleutil.utils.ARouteConstants;
import com.qxcm.moduleutil.utils.ImageUtils;
import com.stx.xhb.xbanner.XBanner;
import com.sunfusheng.marqueeview.MarqueeView;
import com.zhpan.bannerview.constants.PageStyle;
import org.greenrobot.eventbus.EventBus;
@@ -136,7 +135,7 @@ public class VoiceCategoryFragment extends BaseMvpFragment<VoiceCategoryPresente
// } else if (bannerModel.getType().equals("10")) {
// ARouter.getInstance().build(ARouteConstants.ME_SHOP).withString("from", "首页横幅").navigation();
// } else {
ARouter.getInstance().build(ARouteConstants.H5).withString("url",bannerModel.getUrl()).withString("title", "首页横幅").navigation();
ARouter.getInstance().build(ARouteConstants.H5).withString("url", bannerModel.getUrl()).withString("title", "首页横幅").navigation();
// }
// try {
// //A0204点击banner
@@ -179,32 +178,64 @@ public class VoiceCategoryFragment extends BaseMvpFragment<VoiceCategoryPresente
// }
// });
mBinding.tvWg.setOnClickListener(v -> {
ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页热门列表").withString("roomId", mqttList.get(mBinding.marqueeView.getPosition()).getRoomId()).navigation();
// 确保 MarqueeView 和 mqttList 都已初始化且不为空
if (mBinding.marqueeView == null || mqttList == null || mqttList.isEmpty()) {
// 可以选择在这里添加日志或提示
// Log.w(TAG, "MarqueeView or mqttList is null/empty, cannot handle click.");
return; // 直接返回，不执行后续操作
}
try {
int position = mBinding.marqueeView.getPosition();
// 检查 position 是否有效
if (position < 0 || position >= mqttList.size()) {
// Log.w(TAG, "Invalid position from MarqueeView: " + position);
return; // 位置无效，直接返回
}
// 获取对应的 MqttBean.ListBean 对象
MqttBean.ListBean item = mqttList.get(position);
if (item != null) { // 再次检查 item 是否为 null
String roomId = item.getRoom_id(); // 或者 item.getRoomId(); 确保方法名正确
if (roomId != null && !roomId.isEmpty()) { // 检查 roomId 是否有效
ARouter.getInstance()
.build(ARouteConstants.ROOM_DETAILS)
.withString("form", "首页热门列表")
.withString("roomId", roomId)
.navigation();
} else {
// Log.d(TAG, "Room ID is null or empty for item at position: " + position);
}
} else {
// Log.w(TAG, "Item at position " + position + " is null in mqttList.");
}
} catch (Exception ignored) {
}
});
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void onEvent(MqttBean event) {
// if (event != null) {
List<MqttBean> cachedMqttBeans = RoomGiftRunable.getMqttCache();
if (cachedMqttBeans == null || cachedMqttBeans.isEmpty()){
mBinding.rl.setVisibility(GONE);
}else {
mBinding.rl.setVisibility(View.VISIBLE);
}
if (mqttList == null){
mqttList = new ArrayList<>();
info = new ArrayList<>();
}
mqttList.clear();
info.clear();
// 处理缓存数据
for (MqttBean mqttBean : cachedMqttBeans) {
// 处理每一条 mqttBean 数据
mqttList.add(mqttBean.getList());
info.add(mqttBean.getList().getFromUserName()+"送给"+mqttBean.getList().getToUserName()+"\n"+mqttBean.getList().getGiftName());
}
List<MqttBean> cachedMqttBeans = RoomGiftRunable.getMqttCache();
if (cachedMqttBeans == null || cachedMqttBeans.isEmpty()) {
mBinding.rl.setVisibility(GONE);
} else {
mBinding.rl.setVisibility(View.VISIBLE);
}
if (mqttList == null) {
mqttList = new ArrayList<>();
info = new ArrayList<>();
}
mqttList.clear();
info.clear();
// 处理缓存数据
for (MqttBean mqttBean : cachedMqttBeans) {
// 处理每一条 mqttBean 数据
mqttList.add(mqttBean.getList());
info.add(mqttBean.getList().getFromUserName() + "送给" + mqttBean.getList().getToUserName() + "\n" + mqttBean.getList().getGiftName());
}
// if (mqttList == null) {
// info = new ArrayList<>();
@@ -219,7 +250,10 @@ public class VoiceCategoryFragment extends BaseMvpFragment<VoiceCategoryPresente
// mqttList.add(event.getList());
// }
// info.add(event.getList().getFromUserName()+"送给"+event.getList().getToUserName()+"\n"+event.getList().getGiftName());
mBinding.marqueeView.startWithList(info);
mBinding.marqueeView.startWithList(info);
// }else {
// mBinding.rl.setVisibility(View.GONE);
// }
}
//
@@ -302,7 +336,7 @@ public class VoiceCategoryFragment extends BaseMvpFragment<VoiceCategoryPresente
private List<RoomTypeModel> list;
// public MyFragmentPagerAdapter(FragmentManager fm, List<RoomTypeModel> list) {
// public MyFragmentPagerAdapter(FragmentManager fm, List<RoomTypeModel> list) {
// super(fm);
// this.list = list;
// }

BIN
timcommon/build/intermediates/compiled_local_resources/debug/compileDebugLibraryResources/out/drawable-xxhdpi-v4_core_selected_icon_light.png.flat
View File

Binary file not shown.

5
tuichat/build.gradle
View File

@@ -52,6 +52,9 @@ android {
res.srcDirs += "src/main/res-serious"
}
}
dataBinding {
enabled = true
}
}
dependencies {
@@ -75,6 +78,8 @@ dependencies {
//annotationProcessor
annotationProcessor libs.arouter.compiler
api(libs.greenrobot.eventbus)
api project(':timcommon')
}
apply plugin: 'com.alibaba.arouter' // ⚠️ 添加这一行

BIN
tuichat/build/intermediates/compiled_local_resources/debug/compileDebugLibraryResources/out/drawable-xxhdpi-v4_chat_back.png.flat
View File

Binary file not shown.

79
tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/TUIGroupChatFragment.java
View File

@@ -1,32 +1,22 @@
package com.tencent.qcloud.tuikit.tuichat.classicui.page;
import android.content.Intent;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.Nullable;
import com.tencent.imsdk.v2.V2TIMMessage;
import com.tencent.qcloud.tuicore.TUIConstants;
import com.tencent.qcloud.tuicore.TUICore;
import com.tencent.qcloud.tuicore.interfaces.TUIExtensionEventListener;
import com.tencent.qcloud.tuicore.interfaces.TUIExtensionInfo;
import com.tencent.qcloud.tuicore.interfaces.TUIValueCallback;
import com.tencent.qcloud.tuikit.timcommon.bean.TUIMessageBean;
import com.tencent.qcloud.tuikit.timcommon.interfaces.OnItemClickListener;
import com.tencent.qcloud.tuikit.tuichat.R;
import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
import com.tencent.qcloud.tuikit.tuichat.bean.C2CChatInfo;
import com.tencent.qcloud.tuikit.tuichat.bean.GroupChatInfo;
import com.tencent.qcloud.tuikit.tuichat.bean.message.MergeMessageBean;
import com.tencent.qcloud.tuikit.tuichat.presenter.GroupChatPresenter;
import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
import com.tencent.qcloud.tuikit.tuichat.util.TUIChatUtils;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.greenrobot.eventbus.EventBus;
public class TUIGroupChatFragment extends TUIBaseChatFragment {
private static final String TAG = TUIGroupChatFragment.class.getSimpleName();
@@ -77,35 +67,37 @@ public class TUIGroupChatFragment extends TUIBaseChatFragment {
titleBar.setOnRightClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Map<String, Object> param = new HashMap<>();
if (TUIChatUtils.isTopicGroup(chatInfo.getId())) {
param.put(TUIConstants.TUIChat.Extension.ChatNavigationMoreItem.TOPIC_ID, chatInfo.getId());
} else {
param.put(TUIConstants.TUIChat.Extension.ChatNavigationMoreItem.GROUP_ID, chatInfo.getId());
}
List<TUIExtensionInfo> extensionInfoList =
TUICore.getExtensionList(TUIConstants.TUIChat.Extension.ChatNavigationMoreItem.CLASSIC_EXTENSION_ID, param);
if (!extensionInfoList.isEmpty()) {
Collections.sort(extensionInfoList, (o1, o2) -> o2.getWeight() - o1.getWeight());
TUIExtensionInfo extensionInfo = extensionInfoList.get(0);
TUIExtensionEventListener eventListener = extensionInfo.getExtensionListener();
if (eventListener != null) {
Map<String, Object> map = new HashMap<>();
if (TUIChatUtils.isTopicGroup(chatInfo.getId())) {
map.put(TUIConstants.TUIChat.Extension.ChatNavigationMoreItem.TOPIC_ID, chatInfo.getId());
} else {
map.put(TUIConstants.TUIChat.Extension.ChatNavigationMoreItem.GROUP_ID, chatInfo.getId());
}
map.put(TUIChatConstants.CHAT_BACKGROUND_URI, mChatBackgroundThumbnailUrl);
eventListener.onClicked(map);
}
} else {
Intent intent = new Intent(getContext(), GroupInfoActivity.class);
intent.putExtra(TUIChatConstants.GROUP_ID, chatInfo.getId());
intent.putExtra(TUIChatConstants.CHAT_BACKGROUND_URI, mChatBackgroundThumbnailUrl);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
startActivity(intent);
}
EventBus.getDefault().post(chatInfo);
// Map<String, Object> param = new HashMap<>();
// if (TUIChatUtils.isTopicGroup(chatInfo.getId())) {
// param.put(TUIConstants.TUIChat.Extension.ChatNavigationMoreItem.TOPIC_ID, chatInfo.getId());
// } else {
// param.put(TUIConstants.TUIChat.Extension.ChatNavigationMoreItem.GROUP_ID, chatInfo.getId());
// }
// List<TUIExtensionInfo> extensionInfoList =
// TUICore.getExtensionList(TUIConstants.TUIChat.Extension.ChatNavigationMoreItem.CLASSIC_EXTENSION_ID, param);
// if (!extensionInfoList.isEmpty()) {
// Collections.sort(extensionInfoList, (o1, o2) -> o2.getWeight() - o1.getWeight());
// TUIExtensionInfo extensionInfo = extensionInfoList.get(0);
// TUIExtensionEventListener eventListener = extensionInfo.getExtensionListener();
// if (eventListener != null) {
// Map<String, Object> map = new HashMap<>();
// if (TUIChatUtils.isTopicGroup(chatInfo.getId())) {
// map.put(TUIConstants.TUIChat.Extension.ChatNavigationMoreItem.TOPIC_ID, chatInfo.getId());
// } else {
// map.put(TUIConstants.TUIChat.Extension.ChatNavigationMoreItem.GROUP_ID, chatInfo.getId());
// }
// map.put(TUIChatConstants.CHAT_BACKGROUND_URI, mChatBackgroundThumbnailUrl);
// eventListener.onClicked(map);
// }
// } else {
// Intent intent = new Intent(getContext(), GroupInfoActivity.class);
// intent.putExtra(TUIChatConstants.GROUP_ID, chatInfo.getId());
// intent.putExtra(TUIChatConstants.CHAT_BACKGROUND_URI, mChatBackgroundThumbnailUrl);
// intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
// startActivity(intent);
// }
}
});
}
@@ -140,4 +132,5 @@ public class TUIGroupChatFragment extends TUIBaseChatFragment {
public void setChatInfo(GroupChatInfo groupChatInfo) {
this.chatInfo = groupChatInfo;
}
}

8
tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/TipsMessageHolder.java
View File

@@ -152,9 +152,9 @@ public class TipsMessageHolder extends MessageBaseHolder {
}
private void onUserClick(String userID) {
Intent intent = new Intent(itemView.getContext(), FriendProfileActivity.class);
intent.putExtra(TUIConstants.TUIChat.CHAT_ID, userID);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
itemView.getContext().startActivity(intent);
// Intent intent = new Intent(itemView.getContext(), FriendProfileActivity.class);
// intent.putExtra(TUIConstants.TUIChat.CHAT_ID, userID);
// intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
// itemView.getContext().startActivity(intent);
}
}