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

1:修改交友房出现嘉宾会闭麦的情况

Browse Source
This commit is contained in:
梁小江
2025-11-03 20:34:42 +08:00
parent f5377127ce
commit 96c679528e
20 changed files with 719 additions and 646 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/.name generated
View File

@@ -1 +1 @@
秘地
羽声语音

6
.idea/AndroidProjectSystem.xml generated Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="AndroidProjectSystem">
<option name="providerId" value="com.android.tools.idea.GradleProjectSystem" />
</component>
</project>

8
.idea/compiler.xml generated Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<annotationProcessing>
<profile default="true" name="Default" enabled="true" />
</annotationProcessing>
</component>
</project>

10
.idea/deploymentTargetSelector.xml generated Normal file
View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="deploymentTargetSelector">
<selectionStates>
<SelectionState runConfigName="app">
<option name="selectionMode" value="DROPDOWN" />
</SelectionState>
</selectionStates>
</component>
</project>

12
.idea/gradle.xml generated Normal file
View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="GradleMigrationSettings" migrationVersion="1" />
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<option name="externalProjectPath" value="$PROJECT_DIR$/app" />
<option name="gradleJvm" value="#JAVA_HOME" />
</GradleProjectSettings>
</option>
</component>
</project>

4
.idea/misc.xml generated Normal file
View File

@@ -0,0 +1,4 @@
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_24" project-jdk-name="Android API 35, extension level 13 Platform" project-jdk-type="Android SDK" />
</project>

17
.idea/runConfigurations.xml generated Normal file
View File

@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RunConfigurationProducerService">
<option name="ignoredProducers">
<set>
<option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
<option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
<option value="com.intellij.execution.junit.PatternConfigurationProducer" />
<option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
<option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
<option value="com.intellij.execution.junit.testDiscovery.JUnitTestDiscoveryConfigurationProducer" />
<option value="org.jetbrains.kotlin.idea.junit.KotlinJUnitRunConfigurationProducer" />
<option value="org.jetbrains.kotlin.idea.junit.KotlinPatternConfigurationProducer" />
</set>
</option>
</component>
</project>

6
.idea/vcs.xml generated Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>

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

@@ -86,13 +86,17 @@
<uses-permission android:name="android.permission.READ_MEDIA_VIDEO"/>
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
<uses-feature android:glEsVersion="0x00020000" android:required="true" />
<uses-feature
android:glEsVersion="0x00020000"
android:required="true"/>
<queries>
<package android:name="com.tencent.mm"/>
</queries>
<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"
<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"/>
@@ -116,6 +120,7 @@
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_CAMERA"/>
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK"/>
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
<application
android:name="com.qxcm.qxlive.AppContext"
android:allowBackup="true"

2
app/src/main/java/com/qxcm/qxlive/AppContext.java
View File

@@ -39,6 +39,7 @@ public class AppContext extends CommonAppContext {
// });
// L.setDeBug(BuildConfig.DEBUG);
}
public static void initSdk() {
// CommonAppContext context = CommonAppContext.getInstance();
@@ -72,7 +73,6 @@ public class AppContext extends CommonAppContext {
// OpenInstall.init(context);
}
/**

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

@@ -20,9 +20,10 @@ import com.xscm.moduleutil.base.CommonAppContext;
import com.xscm.moduleutil.dialog.PolicyDialog;
import com.xscm.moduleutil.utils.ARouteConstants;
import com.xscm.moduleutil.utils.SpUtil;
/**
APP准备启动
*
* APP准备启动
* <p>
* _oo0oo_
* o8888888o
* 88" . "88
@@ -41,7 +42,7 @@ import com.xscm.moduleutil.utils.SpUtil;
* \ \ `_. \_ __\ /__ _/ .-` / /
* =====`-.____`.___ \_____/___.-`___.-'=====
* `=---='
*
* <p>
* 佛祖保佑 永无BUG
* 佛曰:
* 写字楼里写字间，写字间里程序员；

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

@@ -62,6 +62,7 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
public PhoneNumberAuthHelper phoneNumberAuthHelper;
private TokenResultListener tokenResultListener;
private boolean canOnePass;
@Override
protected void initData() {
@@ -71,6 +72,7 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
protected int getLayoutId() {
return R.layout.activity_password_login;
}
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
// 检查是否已经创建过该Activity
@@ -91,6 +93,7 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
// EventBus.getDefault().register(this);
// AppLogUtil.reportAppLog(AppLogEvent.A0101);
}
private void checkAppVersion() {
// 获取当前版本号
int currentVersionCode = 0;
@@ -252,7 +255,6 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
}
private void checkOnePass() {
if (!TextUtils.isEmpty(CommonAppContext.getInstance().getToken()) && !TextUtils.isEmpty(CommonAppContext.getInstance().getUser().getTencent_im())) {
isRoot();
@@ -431,7 +433,6 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
}
@Override
public void showLoadings() {
showLoading();
@@ -477,8 +478,7 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
}
}
else if (id == R.id.fl_login) {
} else if (id == R.id.fl_login) {
if (!mBinding.cbPrivacy.isChecked()) {
ToastUtils.show("请先勾选服务条款");
return;
@@ -544,6 +544,7 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
isPasswordVisible = !isPasswordVisible; // 切换状态
}
}
private void wcLogin() {
//发起登陆请求前先注册微信api
IWXAPI api = WXAPIFactory.createWXAPI(this, CommonAppContext.getInstance().getCurrentEnvironment().getWxAppId(), true);
@@ -568,6 +569,7 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
MvpPre.oauthLogin(authResp.code, 1);
}
}
private void releaseTimer() {
if (mTimer != null) {
mTimer.cancel();

1
app/src/main/java/com/qxcm/qxlive/presenter/BasePresenter.java
View File

@@ -106,5 +106,4 @@ public abstract class BasePresenter<V extends IView> implements IPresenter {
}
}

3
app/src/main/res/drawable/bg_launcher_skip.xml
View File

@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape android:shape="oval" xmlns:android="http://schemas.android.com/apk/res/android">
<shape android:shape="oval"
xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#80000000"/>
</shape>

4
app/src/main/res/drawable/bg_launcher_skip_2.xml
View File

@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="12sp"/>
<stroke android:color="@color/white" android:width="1dp"/>
<stroke
android:color="@color/white"
android:width="1dp"/>
<solid android:color="#80000000"/>
</shape>

1
app/src/main/res/layout/activity_password_login.xml
View File

@@ -245,7 +245,6 @@
</RelativeLayout>
<FrameLayout
android:id="@+id/fl_login"
android:layout_width="match_parent"

3
moduleroom/src/main/java/com/example/moduleroom/presenter/RoomPresenter.java
View File

@@ -16,6 +16,7 @@ import com.xscm.moduleutil.http.RetrofitClient;
import com.xscm.moduleutil.listener.MessageListenerSingleton;
import com.xscm.moduleutil.presenter.BasePresenter;
import com.xscm.moduleutil.rtc.AgoraManager;
import com.xscm.moduleutil.rtc.VolumeManager;
import com.xscm.moduleutil.utils.SpUtil;
import java.lang.ref.WeakReference;
@@ -70,7 +71,7 @@ public class RoomPresenter extends BasePresenter<RoomContacts.View> implements R
AgoraManager.getInstance(mContext.getApplicationContext())
.joinRoom(token, roomId, uid, enableMic,enableJs);
}
VolumeManager.getInstance().clearCurrentVolumes();
// 初始化 Agora 并加入房间