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>

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

@@ -7,115 +7,120 @@
<!-- Features --> <!-- Features -->
<uses-feature <uses-feature
android:name="android.hardware.telephony" android:name="android.hardware.telephony"
android:required="false" /> android:required="false"/>
<uses-feature <uses-feature
android:name="android.hardware.camera" android:name="android.hardware.camera"
android:required="false" /> android:required="false"/>
<!-- <uses-permission android:name="android.permission.READ_PHONE_STATE" />--> <!-- <uses-permission android:name="android.permission.READ_PHONE_STATE" />-->
<!-- <uses-permission--> <!-- <uses-permission-->
<!-- android:name="android.permission.GET_ACCOUNTS"--> <!-- android:name="android.permission.GET_ACCOUNTS"-->
<!-- tools:node="remove" />--> <!-- tools:node="remove" />-->
<!-- <uses-permission--> <!-- <uses-permission-->
<!-- android:name="android.permission.CALL_PHONE"--> <!-- android:name="android.permission.CALL_PHONE"-->
<!-- tools:node="remove" />--> <!-- tools:node="remove" />-->
<!-- <uses-permission--> <!-- <uses-permission-->
<!-- android:name="android.permission.READ_LOGS"--> <!-- android:name="android.permission.READ_LOGS"-->
<!-- tools:node="remove" />--> <!-- tools:node="remove" />-->
<!-- <uses-permission--> <!-- <uses-permission-->
<!-- android:name="android.permission.READ_CALL_LOG"--> <!-- android:name="android.permission.READ_CALL_LOG"-->
<!-- tools:node="remove" />--> <!-- tools:node="remove" />-->
<!-- <uses-permission--> <!-- <uses-permission-->
<!-- android:name="android.permission.WRITE_CALL_LOG"--> <!-- android:name="android.permission.WRITE_CALL_LOG"-->
<!-- tools:node="remove" />--> <!-- tools:node="remove" />-->
<!-- <uses-permission--> <!-- <uses-permission-->
<!-- android:name="android.permission.READ_SMS"--> <!-- android:name="android.permission.READ_SMS"-->
<!-- tools:node="remove" />--> <!-- tools:node="remove" />-->
<!-- <uses-permission--> <!-- <uses-permission-->
<!-- android:name="android.permission.SEND_SMS"--> <!-- android:name="android.permission.SEND_SMS"-->
<!-- tools:node="remove" />--> <!-- tools:node="remove" />-->
<!-- <uses-permission--> <!-- <uses-permission-->
<!-- android:name="android.permission.WRITE_SMS"--> <!-- android:name="android.permission.WRITE_SMS"-->
<!-- tools:node="remove" />--> <!-- tools:node="remove" />-->
<!-- <uses-permission--> <!-- <uses-permission-->
<!-- android:name="android.permission.RECEIVE_SMS"--> <!-- android:name="android.permission.RECEIVE_SMS"-->
<!-- tools:node="remove" />--> <!-- tools:node="remove" />-->
<!-- <uses-permission--> <!-- <uses-permission-->
<!-- android:name="android.permission.RECEIVE_WAP_PUSH"--> <!-- android:name="android.permission.RECEIVE_WAP_PUSH"-->
<!-- tools:node="remove" />--> <!-- tools:node="remove" />-->
<!-- <uses-permission--> <!-- <uses-permission-->
<!-- android:name="android.permission.RECEIVE_MMS"--> <!-- android:name="android.permission.RECEIVE_MMS"-->
<!-- tools:node="remove" />--> <!-- tools:node="remove" />-->
<!-- <uses-permission--> <!-- <uses-permission-->
<!-- android:name="android.permission.SEND_MMS"--> <!-- android:name="android.permission.SEND_MMS"-->
<!-- tools:node="remove" />--> <!-- tools:node="remove" />-->
<!-- <uses-permission--> <!-- <uses-permission-->
<!-- android:name="android.permission.PROCESS_OUTGOING_CALLS"--> <!-- android:name="android.permission.PROCESS_OUTGOING_CALLS"-->
<!-- tools:node="remove" />--> <!-- tools:node="remove" />-->
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.WAKE_LOCK" /> <uses-permission android:name="android.permission.WAKE_LOCK"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
<!-- <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" /> 显示系统窗口--> <!-- <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" /> 显示系统窗口-->
<!-- <uses-permission android:name="android.permission.NETWORK_PROVIDER" />--> <!-- <uses-permission android:name="android.permission.NETWORK_PROVIDER" />-->
<!-- <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> 访问近似位置--> <!-- <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> 访问近似位置-->
<!-- <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> 获取精准位置--> <!-- <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> 获取精准位置-->
<uses-permission android:name="android.permission.VIBRATE" /> <uses-permission android:name="android.permission.VIBRATE"/>
<!-- <uses-permission android:name="android.permission.RECORD_AUDIO" /> 录音功能--> <!-- <uses-permission android:name="android.permission.RECORD_AUDIO" /> 录音功能-->
<uses-permission android:name="android.permission.CAMERA" /> <uses-permission android:name="android.permission.CAMERA"/>
<!-- <uses-permission android:name="android.permission.FLASHLIGHT" />//闪光灯--> <!-- <uses-permission android:name="android.permission.FLASHLIGHT" />//闪光灯-->
<!-- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" <&#45;&#45; 访问存储权限&ndash;&gt;--> <!-- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" <&#45;&#45; 访问存储权限&ndash;&gt;-->
<!-- android:maxSdkVersion="32"--> <!-- android:maxSdkVersion="32"-->
<!-- />--> <!-- />-->
<!-- <uses-permission android:name="android.permission.GET_TASKS" />--> <!-- <uses-permission android:name="android.permission.GET_TASKS" />-->
<!-- <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />--> <!-- <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />-->
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
<uses-permission android:name="android.permission.REORDER_TASKS" /> <uses-permission android:name="android.permission.REORDER_TASKS"/>
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" /> <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
<!-- <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" /> 管理账户列表--> <!-- <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" /> 管理账户列表-->
<uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" /> <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT"/>
<!-- <uses-permission android:name="android.permission.WRITE_SETTINGS" />--> <!-- <uses-permission android:name="android.permission.WRITE_SETTINGS" />-->
<!-- <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" /> 获取精准位置 --> <!-- <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" /> 获取精准位置 -->
<!-- <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />--> <!-- <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />-->
<uses-permission android:name="android.permission.READ_MEDIA_AUDIO"/> <uses-permission android:name="android.permission.READ_MEDIA_AUDIO"/>
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/> <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
<uses-permission android:name="android.permission.READ_MEDIA_VIDEO"/> <uses-permission android:name="android.permission.READ_MEDIA_VIDEO"/>
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" /> <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> <queries>
<package android:name="com.tencent.mm" /> <package android:name="com.tencent.mm"/>
</queries> </queries>
<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" <uses-permission
android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"
tools:ignore="ProtectedPermissions"/> tools:ignore="ProtectedPermissions"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.CAMERA"/> <uses-permission android:name="android.permission.CAMERA"/>
<!-- <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"--> <!-- <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"-->
<!-- android:required="false"--> <!-- android:required="false"-->
<!-- android:maxSdkVersion="32"/>--> <!-- android:maxSdkVersion="32"/>-->
<!-- <uses-permission android:name="android.permission.BLUETOOTH"/>--> <!-- <uses-permission android:name="android.permission.BLUETOOTH"/>-->
<!-- <uses-permission android:name="android.permission.BLUETOOTH_CONNECT"/>--> <!-- <uses-permission android:name="android.permission.BLUETOOTH_CONNECT"/>-->
<!-- <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" /> 自定义权限 --> <!-- <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" /> 自定义权限 -->
<!-- <uses-permission android:name="android.permission.POST_NOTIFICATIONS" /> 自定义权限 --> <!-- <uses-permission android:name="android.permission.POST_NOTIFICATIONS" /> 自定义权限 -->
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION" /> <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION"/>
<!-- <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" 读写系统安全设置--> <!-- <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" 读写系统安全设置-->
<!-- tools:ignore="ProtectedPermissions" />--> <!-- tools:ignore="ProtectedPermissions" />-->
<!-- 声明前台服务权限 --> <!-- 声明前台服务权限 -->
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE" /> <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE"/>
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_CAMERA" /> <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.FOREGROUND_SERVICE_MEDIA_PLAYBACK"/>
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/> <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
<application <application
android:name="com.qxcm.qxlive.AppContext" android:name="com.qxcm.qxlive.AppContext"
android:allowBackup="true" android:allowBackup="true"
@@ -145,30 +150,30 @@
android:screenOrientation="behind" android:screenOrientation="behind"
android:theme="@style/main_SplashThemeImage"> android:theme="@style/main_SplashThemeImage">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter> </intent-filter>
<intent-filter> <intent-filter>
<action android:name="com.qxcm.qxlive.LAUNCH_PAGE" /> <action android:name="com.qxcm.qxlive.LAUNCH_PAGE"/>
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT"/>
</intent-filter> </intent-filter>
</activity> </activity>
<!-- 配置APP ID --> <!-- 配置APP ID -->
<meta-data <meta-data
android:name="BUGLY_APPID" android:name="BUGLY_APPID"
android:value="b45883f58f" /> android:value="b45883f58f"/>
<!-- &lt;!&ndash; 配置APP版本号 &ndash;&gt;--> <!-- &lt;!&ndash; 配置APP版本号 &ndash;&gt;-->
<!-- <meta-data--> <!-- <meta-data-->
<!-- android:name="BUGLY_APP_VERSION"--> <!-- android:name="BUGLY_APP_VERSION"-->
<!-- android:value="<APP_Version>" />--> <!-- android:value="<APP_Version>" />-->
<!-- &lt;!&ndash; 配置APP渠道号 &ndash;&gt;--> <!-- &lt;!&ndash; 配置APP渠道号 &ndash;&gt;-->
<!-- <meta-data--> <!-- <meta-data-->
<!-- android:name="BUGLY_APP_CHANNEL"--> <!-- android:name="BUGLY_APP_CHANNEL"-->
<!-- android:value="<APP_Channel>" />--> <!-- android:value="<APP_Channel>" />-->
<!-- 配置Bugly调试模式（true或者false）--> <!-- 配置Bugly调试模式（true或者false）-->
<meta-data <meta-data
android:name="BUGLY_ENABLE_DEBUG" android:name="BUGLY_ENABLE_DEBUG"
android:value="false" /> android:value="false"/>
<activity <activity
android:name="com.mobile.auth.gatewayauth.LoginAuthActivity" android:name="com.mobile.auth.gatewayauth.LoginAuthActivity"
@@ -176,21 +181,21 @@
android:exported="false" android:exported="false"
android:launchMode="singleTask" android:launchMode="singleTask"
android:screenOrientation="behind" android:screenOrientation="behind"
android:theme="@style/authsdk_activity_dialog" /> android:theme="@style/authsdk_activity_dialog"/>
<!-- <activity--> <!-- <activity-->
<!-- android:name="com.mobile.auth.gatewayauth.activity.AuthWebVeiwActivity"--> <!-- android:name="com.mobile.auth.gatewayauth.activity.AuthWebVeiwActivity"-->
<!-- android:configChanges="orientation|keyboardHidden|screenSize"--> <!-- android:configChanges="orientation|keyboardHidden|screenSize"-->
<!-- android:exported="false"--> <!-- android:exported="false"-->
<!-- android:launchMode="singleTop"--> <!-- android:launchMode="singleTop"-->
<!-- android:screenOrientation="behind" />--> <!-- android:screenOrientation="behind" />-->
<activity <activity
android:name="com.cmic.sso.sdk.activity.LoginAuthActivity" android:name="com.cmic.sso.sdk.activity.LoginAuthActivity"
android:configChanges="orientation|keyboardHidden|screenSize" android:configChanges="orientation|keyboardHidden|screenSize"
android:launchMode="singleTop" android:launchMode="singleTop"
android:screenOrientation="behind" android:screenOrientation="behind"
android:theme="@style/authsdk_activity_dialog" /> android:theme="@style/authsdk_activity_dialog"/>
<activity <activity
android:name=".wxapi.WXEntryActivity" android:name=".wxapi.WXEntryActivity"
@@ -203,28 +208,28 @@
<activity <activity
android:name=".wxapi.WXPayEntryActivity" android:name=".wxapi.WXPayEntryActivity"
android:exported="true" android:exported="true"
android:launchMode="singleTop" /> android:launchMode="singleTop"/>
<activity <activity
android:name="com.example.modulevocal.activity.RealNameActivity" android:name="com.example.modulevocal.activity.RealNameActivity"
android:exported="false" /> android:exported="false"/>
<activity <activity
android:name=".PasswordLoginActivity" android:name=".PasswordLoginActivity"
android:exported="true" android:exported="true"
/> />
</application> </application>
<!-- <queries>--> <!-- <queries>-->
<!-- &lt;!&ndash; 支付宝 scheme &ndash;&gt;--> <!-- &lt;!&ndash; 支付宝 scheme &ndash;&gt;-->
<!-- <intent>--> <!-- <intent>-->
<!-- <action android:name="android.intent.action.VIEW" />--> <!-- <action android:name="android.intent.action.VIEW" />-->
<!-- <data android:scheme="alipays" />--> <!-- <data android:scheme="alipays" />-->
<!-- </intent>--> <!-- </intent>-->
<!-- &lt;!&ndash; 微信 scheme &ndash;&gt;--> <!-- &lt;!&ndash; 微信 scheme &ndash;&gt;-->
<!-- <intent>--> <!-- <intent>-->
<!-- <action android:name="android.intent.action.VIEW" />--> <!-- <action android:name="android.intent.action.VIEW" />-->
<!-- <data android:scheme="weixin" />--> <!-- <data android:scheme="weixin" />-->
<!-- </intent>--> <!-- </intent>-->
<!-- </queries>--> <!-- </queries>-->
</manifest> </manifest>

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

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

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

@@ -57,11 +57,11 @@ public class LaunchPresenter extends BasePresenter<com.qxcm.qxlive.LaunchContact
} }
public void loginSuccess(List<UserBean> userBean) { public void loginSuccess(List<UserBean> userBean) {
if (userBean==null) { if (userBean == null) {
ToastUtils.showShort("登录失败请重试"); ToastUtils.showShort("登录失败请重试");
return; return;
} }
if (userBean.size()==1) { if (userBean.size() == 1) {
CommonAppContext.getInstance().setUser(userBean.get(0)); CommonAppContext.getInstance().setUser(userBean.get(0));
@@ -84,9 +84,9 @@ public class LaunchPresenter extends BasePresenter<com.qxcm.qxlive.LaunchContact
} else { } else {
com.blankj.utilcode.util.ActivityUtils.startActivity(MainActivity.class); com.blankj.utilcode.util.ActivityUtils.startActivity(MainActivity.class);
} }
}else { } else {
Intent intent=new Intent(com.blankj.utilcode.util.ActivityUtils.getTopActivity(), SwitchAccountsActivity.class); Intent intent = new Intent(com.blankj.utilcode.util.ActivityUtils.getTopActivity(), SwitchAccountsActivity.class);
Bundle bundle=new Bundle(); Bundle bundle = new Bundle();
bundle.putSerializable("userBean", userBean.get(0)); bundle.putSerializable("userBean", userBean.get(0));
intent.putExtras(bundle); intent.putExtras(bundle);
com.blankj.utilcode.util.ActivityUtils.startActivity(intent); com.blankj.utilcode.util.ActivityUtils.startActivity(intent);

60
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; public PhoneNumberAuthHelper phoneNumberAuthHelper;
private TokenResultListener tokenResultListener; private TokenResultListener tokenResultListener;
private boolean canOnePass; private boolean canOnePass;
@Override @Override
protected void initData() { protected void initData() {
@@ -71,6 +72,7 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
protected int getLayoutId() { protected int getLayoutId() {
return R.layout.activity_password_login; return R.layout.activity_password_login;
} }
@Override @Override
protected void onCreate(@Nullable Bundle savedInstanceState) { protected void onCreate(@Nullable Bundle savedInstanceState) {
// 检查是否已经创建过该Activity // 检查是否已经创建过该Activity
@@ -91,6 +93,7 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
// EventBus.getDefault().register(this); // EventBus.getDefault().register(this);
// AppLogUtil.reportAppLog(AppLogEvent.A0101); // AppLogUtil.reportAppLog(AppLogEvent.A0101);
} }
private void checkAppVersion() { private void checkAppVersion() {
// 获取当前版本号 // 获取当前版本号
int currentVersionCode = 0; int currentVersionCode = 0;
@@ -126,7 +129,7 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
@Override @Override
protected void onDestroy() { protected void onDestroy() {
EventBus.getDefault().unregister(this); EventBus.getDefault().unregister(this);
if (phoneNumberAuthHelper!=null) { if (phoneNumberAuthHelper != null) {
phoneNumberAuthHelper.hideLoginLoading(); phoneNumberAuthHelper.hideLoginLoading();
//获取成功 dimiss就去登录、登录成功 //获取成功 dimiss就去登录、登录成功
phoneNumberAuthHelper.quitLoginPage(); phoneNumberAuthHelper.quitLoginPage();
@@ -192,10 +195,10 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
mBinding.tvSendCode.setOnClickListener(this::onClick); mBinding.tvSendCode.setOnClickListener(this::onClick);
mBinding.ivEye.setOnClickListener(this::onClick); mBinding.ivEye.setOnClickListener(this::onClick);
if (mBinding.tvCodeText.getText().equals("切换密码登录")){ if (mBinding.tvCodeText.getText().equals("切换密码登录")) {
type=1; type = 1;
}else { } else {
type=2; type = 2;
} }
} }
@@ -213,7 +216,7 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
tokenRet = JSON.parseObject(s, TokenRet.class); tokenRet = JSON.parseObject(s, TokenRet.class);
if (tokenRet != null && ("600000").equals(tokenRet.getCode())) { if (tokenRet != null && ("600000").equals(tokenRet.getCode())) {
LogUtils.e("@@@",tokenRet.getToken()); LogUtils.e("@@@", tokenRet.getToken());
MvpPre.oauthLoginLogin(tokenRet.getToken()); MvpPre.oauthLoginLogin(tokenRet.getToken());
// phoneNumberAuthHelper.hideLoginLoading(); // phoneNumberAuthHelper.hideLoginLoading();
// //获取成功 dimiss就去登录、登录成功 // //获取成功 dimiss就去登录、登录成功
@@ -252,7 +255,6 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
} }
private void checkOnePass() { private void checkOnePass() {
if (!TextUtils.isEmpty(CommonAppContext.getInstance().getToken()) && !TextUtils.isEmpty(CommonAppContext.getInstance().getUser().getTencent_im())) { if (!TextUtils.isEmpty(CommonAppContext.getInstance().getToken()) && !TextUtils.isEmpty(CommonAppContext.getInstance().getUser().getTencent_im())) {
isRoot(); isRoot();
@@ -398,8 +400,8 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
.setSwitchAccTextSize(12) .setSwitchAccTextSize(12)
.setSwitchOffsetY(390) .setSwitchOffsetY(390)
//协议栏 //协议栏
.setAppPrivacyOne("《用户协议》", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl()+"/api/Page/page_show?id=6") .setAppPrivacyOne("《用户协议》", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl() + "/api/Page/page_show?id=6")
.setAppPrivacyTwo("《隐私协议》", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl()+"/api/Page/page_show?id=4") .setAppPrivacyTwo("《隐私协议》", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl() + "/api/Page/page_show?id=4")
.setAppPrivacyColor(Color.parseColor("#000000"), Color.parseColor("#22BB79")) .setAppPrivacyColor(Color.parseColor("#000000"), Color.parseColor("#22BB79"))
.setPrivacyBefore("登录即代表同意") .setPrivacyBefore("登录即代表同意")
.setPrivacyEnd("并授权获得号码") .setPrivacyEnd("并授权获得号码")
@@ -431,7 +433,6 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
} }
@Override @Override
public void showLoadings() { public void showLoadings() {
showLoading(); showLoading();
@@ -462,23 +463,22 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
// startActivity(intent); // startActivity(intent);
// finish(); // finish();
if (mBinding.tvCodeText.getText().equals("切换密码登录")){ if (mBinding.tvCodeText.getText().equals("切换密码登录")) {
mBinding.rlPassCode.setVisibility(VISIBLE); mBinding.rlPassCode.setVisibility(VISIBLE);
mBinding.rlCode.setVisibility(View.GONE); mBinding.rlCode.setVisibility(View.GONE);
mBinding.tvCodeText.setText("切换验证码登录"); mBinding.tvCodeText.setText("切换验证码登录");
mBinding.tvLoginText.setText("密码登录"); mBinding.tvLoginText.setText("密码登录");
type=2; type = 2;
}else { } else {
mBinding.rlPassCode.setVisibility(View.GONE); mBinding.rlPassCode.setVisibility(View.GONE);
mBinding.rlCode.setVisibility(VISIBLE); mBinding.rlCode.setVisibility(VISIBLE);
mBinding.tvCodeText.setText("切换密码登录"); mBinding.tvCodeText.setText("切换密码登录");
mBinding.tvLoginText.setText("验证码登录"); mBinding.tvLoginText.setText("验证码登录");
type=1; type = 1;
} }
} } else if (id == R.id.fl_login) {
else if (id == R.id.fl_login) {
if (!mBinding.cbPrivacy.isChecked()) { if (!mBinding.cbPrivacy.isChecked()) {
ToastUtils.show("请先勾选服务条款"); ToastUtils.show("请先勾选服务条款");
return; return;
@@ -488,14 +488,14 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
com.blankj.utilcode.util.ToastUtils.showShort("请输入手机号"); com.blankj.utilcode.util.ToastUtils.showShort("请输入手机号");
return; return;
} }
if (type==1) { if (type == 1) {
String code = mBinding.edPassword.getText().toString().trim(); String code = mBinding.edPassword.getText().toString().trim();
if (TextUtils.isEmpty(code)) { if (TextUtils.isEmpty(code)) {
com.blankj.utilcode.util.ToastUtils.showShort("请输入验证码"); com.blankj.utilcode.util.ToastUtils.showShort("请输入验证码");
return; return;
} }
MvpPre.login(phone, "", code, 1); MvpPre.login(phone, "", code, 1);
}else if (type==2) { } else if (type == 2) {
String password = mBinding.edPasswordCode.getText().toString().trim(); String password = mBinding.edPasswordCode.getText().toString().trim();
if (TextUtils.isEmpty(password)) { if (TextUtils.isEmpty(password)) {
com.blankj.utilcode.util.ToastUtils.showShort("请输入密码"); com.blankj.utilcode.util.ToastUtils.showShort("请输入密码");
@@ -530,7 +530,7 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
} }
sendCodeSuccess(phone); sendCodeSuccess(phone);
MvpPre.sendCode(phone, 1); MvpPre.sendCode(phone, 1);
}else if (id == R.id.iv_eye) { } else if (id == R.id.iv_eye) {
if (!isPasswordVisible) { if (!isPasswordVisible) {
mBinding.edPassword.setInputType(android.text.InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD); mBinding.edPassword.setInputType(android.text.InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD);
@@ -544,11 +544,12 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
isPasswordVisible = !isPasswordVisible; // 切换状态 isPasswordVisible = !isPasswordVisible; // 切换状态
} }
} }
private void wcLogin() { private void wcLogin() {
//发起登陆请求前先注册微信api //发起登陆请求前先注册微信api
IWXAPI api = WXAPIFactory.createWXAPI(this,CommonAppContext.getInstance().getCurrentEnvironment().getWxAppId(),true); IWXAPI api = WXAPIFactory.createWXAPI(this, CommonAppContext.getInstance().getCurrentEnvironment().getWxAppId(), true);
api.registerApp(CommonAppContext.getInstance().getCurrentEnvironment().getWxAppId()); api.registerApp(CommonAppContext.getInstance().getCurrentEnvironment().getWxAppId());
if (!api.isWXAppInstalled()){ if (!api.isWXAppInstalled()) {
//todo 提醒未安装微信 //todo 提醒未安装微信
com.blankj.utilcode.util.ToastUtils.showShort("请安装微信客户端"); com.blankj.utilcode.util.ToastUtils.showShort("请安装微信客户端");
return; return;
@@ -562,12 +563,13 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
@Subscribe(threadMode = ThreadMode.MAIN) @Subscribe(threadMode = ThreadMode.MAIN)
public void loginEvent(BaseResp event) { public void loginEvent(BaseResp event) {
if (event.errCode ==BaseResp.ErrCode.ERR_OK){ if (event.errCode == BaseResp.ErrCode.ERR_OK) {
SendAuth.Resp authResp = (SendAuth.Resp)event; SendAuth.Resp authResp = (SendAuth.Resp) event;
LogUtils.e("@@@",authResp.code); LogUtils.e("@@@", authResp.code);
MvpPre.oauthLogin(authResp.code,1); MvpPre.oauthLogin(authResp.code, 1);
} }
} }
private void releaseTimer() { private void releaseTimer() {
if (mTimer != null) { if (mTimer != null) {
mTimer.cancel(); mTimer.cancel();
@@ -627,9 +629,9 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
} }
private void zfbLogin(String s) { private void zfbLogin(String s) {
LogUtils.e("@@@",s); LogUtils.e("@@@", s);
CommonAppContext.getInstance(); CommonAppContext.getInstance();
if (!CommonAppContext.isAlipayInstalled(this)){ if (!CommonAppContext.isAlipayInstalled(this)) {
com.blankj.utilcode.util.ToastUtils.showShort("请安装支付宝客户端"); com.blankj.utilcode.util.ToastUtils.showShort("请安装支付宝客户端");
return; return;
} }
@@ -644,14 +646,14 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
// 调用授权接口，获取授权结果 // 调用授权接口，获取授权结果
Map<String, String> result = authTask.authV2(authInfo, true); Map<String, String> result = authTask.authV2(authInfo, true);
LogUtils.e(result); LogUtils.e(result);
if (result.get("resultStatus").equals("9000")){ if (result.get("resultStatus").equals("9000")) {
Pattern pattern = Pattern.compile("auth_code=([^&]*)"); Pattern pattern = Pattern.compile("auth_code=([^&]*)");
Matcher matcher = pattern.matcher(result.get("result")); Matcher matcher = pattern.matcher(result.get("result"));
if (matcher.find()) { if (matcher.find()) {
String authCode = matcher.group(1); String authCode = matcher.group(1);
LogUtils.e("AuthCode", authCode); LogUtils.e("AuthCode", authCode);
MvpPre.oauthLogin(authCode,2); MvpPre.oauthLogin(authCode, 2);
} }
} }
} }

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

@@ -15,7 +15,7 @@ import io.reactivex.disposables.Disposable;
public abstract class BasePresenter<V extends IView> implements IPresenter { public abstract class BasePresenter<V extends IView> implements IPresenter {
protected CompositeDisposable mDisposables = new CompositeDisposable(); protected CompositeDisposable mDisposables = new CompositeDisposable();
// private RemoteDataSource api; // private RemoteDataSource api;
protected Reference<V> MvpRef; protected Reference<V> MvpRef;
protected Context mContext; protected Context mContext;
@@ -74,7 +74,7 @@ public abstract class BasePresenter<V extends IView> implements IPresenter {
if (MvpRef != null) { if (MvpRef != null) {
MvpRef.clear(); MvpRef.clear();
} }
mContext=null; mContext = null;
} }
/** /**
@@ -106,5 +106,4 @@ public abstract class BasePresenter<V extends IView> implements IPresenter {
} }
} }

64
app/src/main/java/com/qxcm/qxlive/wxapi/WXEntryActivity.java
View File

@@ -13,7 +13,7 @@ import com.tencent.mm.opensdk.openapi.WXAPIFactory;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
public class WXEntryActivity extends Activity implements IWXAPIEventHandler{ public class WXEntryActivity extends Activity implements IWXAPIEventHandler {
// private static String TAG = "MicroMsg.WXEntryActivity"; // private static String TAG = "MicroMsg.WXEntryActivity";
// //
// private IWXAPI api; // private IWXAPI api;
@@ -158,34 +158,34 @@ public class WXEntryActivity extends Activity implements IWXAPIEventHandler{
// finish(); // finish();
// } // }
// //
//// private void goToGetMsg() { /// / private void goToGetMsg() {
//// Intent intent = new Intent(this, GetFromWXActivity.class); /// / Intent intent = new Intent(this, GetFromWXActivity.class);
//// intent.putExtras(getIntent()); /// / intent.putExtras(getIntent());
//// startActivity(intent); /// / startActivity(intent);
//// finish(); /// / finish();
//// } /// / }
//// /// /
//// private void goToShowMsg(ShowMessageFromWX.Req showReq) { /// / private void goToShowMsg(ShowMessageFromWX.Req showReq) {
//// WXMediaMessage wxMsg = showReq.message; /// / WXMediaMessage wxMsg = showReq.message;
//// WXAppExtendObject obj = (WXAppExtendObject) wxMsg.mediaObject; /// / WXAppExtendObject obj = (WXAppExtendObject) wxMsg.mediaObject;
//// /// /
//// StringBuffer msg = new StringBuffer(); /// / StringBuffer msg = new StringBuffer();
//// msg.append("description: "); /// / msg.append("description: ");
//// msg.append(wxMsg.description); /// / msg.append(wxMsg.description);
//// msg.append("\n"); /// / msg.append("\n");
//// msg.append("extInfo: "); /// / msg.append("extInfo: ");
//// msg.append(obj.extInfo); /// / msg.append(obj.extInfo);
//// msg.append("\n"); /// / msg.append("\n");
//// msg.append("filePath: "); /// / msg.append("filePath: ");
//// msg.append(obj.filePath); /// / msg.append(obj.filePath);
//// /// /
//// Intent intent = new Intent(this, ShowFromWXActivity.class); /// / Intent intent = new Intent(this, ShowFromWXActivity.class);
//// intent.putExtra(Constants.ShowMsgActivity.STitle, wxMsg.title); /// / intent.putExtra(Constants.ShowMsgActivity.STitle, wxMsg.title);
//// intent.putExtra(Constants.ShowMsgActivity.SMessage, msg.toString()); /// / intent.putExtra(Constants.ShowMsgActivity.SMessage, msg.toString());
//// intent.putExtra(Constants.ShowMsgActivity.BAThumbData, wxMsg.thumbData); /// / intent.putExtra(Constants.ShowMsgActivity.BAThumbData, wxMsg.thumbData);
//// startActivity(intent); /// / startActivity(intent);
//// finish(); /// / finish();
//// } /// / }
private final String TAG = this.getClass().getSimpleName(); private final String TAG = this.getClass().getSimpleName();
@@ -212,15 +212,15 @@ public class WXEntryActivity extends Activity implements IWXAPIEventHandler{
switch (resp.errCode) { switch (resp.errCode) {
case BaseResp.ErrCode.ERR_OK: case BaseResp.ErrCode.ERR_OK:
//发送成功 //发送成功
ToastUtils.showShort("发送成功",resp.transaction); ToastUtils.showShort("发送成功", resp.transaction);
EventBus.getDefault().post(resp); EventBus.getDefault().post(resp);
break; break;
case BaseResp.ErrCode.ERR_USER_CANCEL: case BaseResp.ErrCode.ERR_USER_CANCEL:
//发送取消 //发送取消
ToastUtils.showShort("发送取消",resp); ToastUtils.showShort("发送取消", resp);
break; break;
case BaseResp.ErrCode.ERR_AUTH_DENIED: case BaseResp.ErrCode.ERR_AUTH_DENIED:
ToastUtils.showShort("发送被拒绝",resp); ToastUtils.showShort("发送被拒绝", resp);
//发送被拒绝 //发送被拒绝
break; break;
default: default:

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

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

14
app/src/main/res/layout/activity_launch_page.xml
View File

@@ -16,7 +16,7 @@
android:id="@+id/container" android:id="@+id/container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="#000" /> android:background="#000"/>
<FrameLayout <FrameLayout
@@ -36,7 +36,7 @@
app:cp_bg_color="@color/white" app:cp_bg_color="@color/white"
app:cp_cur_progress="0" app:cp_cur_progress="0"
app:cp_fg_color="#ff7200" app:cp_fg_color="#ff7200"
app:cp_stroke_width="2dp" /> app:cp_stroke_width="2dp"/>
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -44,7 +44,7 @@
android:gravity="center" android:gravity="center"
android:text="@string/recommend_skip" android:text="@string/recommend_skip"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="11sp" /> android:textSize="11sp"/>
</FrameLayout> </FrameLayout>
@@ -60,7 +60,7 @@
android:text="@string/recommend_skip" android:text="@string/recommend_skip"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="11sp" android:textSize="11sp"
android:visibility="invisible" /> android:visibility="invisible"/>
<LinearLayout <LinearLayout
android:id="@+id/ad_tip" android:id="@+id/ad_tip"
@@ -80,12 +80,12 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/a_067" android:text="@string/a_067"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="13sp" /> android:textSize="13sp"/>
<ImageView <ImageView
android:layout_width="13dp" android:layout_width="13dp"
android:layout_height="13dp" android:layout_height="13dp"
android:src="@mipmap/icon_arrow_right_3" /> android:src="@mipmap/icon_arrow_right_3"/>
</LinearLayout> </LinearLayout>
@@ -96,7 +96,7 @@
android:clickable="true" android:clickable="true"
android:src="@mipmap/screen" android:src="@mipmap/screen"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:visibility="visible" /> android:visibility="visible"/>
</FrameLayout> </FrameLayout>
</layout> </layout>

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

@@ -14,7 +14,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:src="@mipmap/log_bj" /> android:src="@mipmap/log_bj"/>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -34,15 +34,15 @@
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@mipmap/login_title" /> android:src="@mipmap/login_title"/>
<!-- <TextView--> <!-- <TextView-->
<!-- android:layout_width="wrap_content"--> <!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="@dimen/dp_30"--> <!-- android:layout_height="@dimen/dp_30"-->
<!-- android:text="@string/login_web_title"--> <!-- android:text="@string/login_web_title"-->
<!-- android:textColor="@color/color_FF333333"--> <!-- android:textColor="@color/color_FF333333"-->
<!-- android:textSize="20sp"--> <!-- android:textSize="20sp"-->
<!-- android:textStyle="bold" />--> <!-- android:textStyle="bold" />-->
</LinearLayout> </LinearLayout>
@@ -71,7 +71,7 @@
android:text="@string/login_title" android:text="@string/login_title"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="18sp" android:textSize="18sp"
android:textStyle="bold" /> android:textStyle="bold"/>
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
@@ -91,7 +91,7 @@
android:layout_height="@dimen/dp_20" android:layout_height="@dimen/dp_20"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginLeft="20dp" android:layout_marginLeft="20dp"
android:src="@mipmap/icon_login_user_new" /> android:src="@mipmap/icon_login_user_new"/>
<EditText <EditText
android:id="@+id/ed_phone" android:id="@+id/ed_phone"
@@ -108,7 +108,7 @@
android:singleLine="true" android:singleLine="true"
android:textColor="@color/black" android:textColor="@color/black"
android:textColorHint="@color/color_FFCCCCCC" android:textColorHint="@color/color_FFCCCCCC"
android:textSize="@dimen/sp_17" /> android:textSize="@dimen/sp_17"/>
</RelativeLayout> </RelativeLayout>
@@ -127,7 +127,7 @@
android:layout_height="@dimen/dp_20" android:layout_height="@dimen/dp_20"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginLeft="20dp" android:layout_marginLeft="20dp"
android:src="@mipmap/icon_login_code" /> android:src="@mipmap/icon_login_code"/>
<EditText <EditText
@@ -145,7 +145,7 @@
android:singleLine="true" android:singleLine="true"
android:textColor="@color/black" android:textColor="@color/black"
android:textColorHint="@color/color_FFCCCCCC" android:textColorHint="@color/color_FFCCCCCC"
android:textSize="@dimen/sp_16" /> android:textSize="@dimen/sp_16"/>
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -163,7 +163,7 @@
android:text="@string/login_send_code" android:text="@string/login_send_code"
android:textColor="#22BB79" android:textColor="#22BB79"
android:textSize="@dimen/sp_16" android:textSize="@dimen/sp_16"
tools:visibility="visible" /> tools:visibility="visible"/>
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>
@@ -184,7 +184,7 @@
android:layout_height="@dimen/dp_20" android:layout_height="@dimen/dp_20"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginLeft="20dp" android:layout_marginLeft="20dp"
android:src="@mipmap/icon_login_lick" /> android:src="@mipmap/icon_login_lick"/>
<EditText <EditText
@@ -202,7 +202,7 @@
android:singleLine="true" android:singleLine="true"
android:textColor="@color/black" android:textColor="@color/black"
android:textColorHint="@color/color_FFCCCCCC" android:textColorHint="@color/color_FFCCCCCC"
android:textSize="@dimen/sp_16" /> android:textSize="@dimen/sp_16"/>
<LinearLayout <LinearLayout
@@ -240,12 +240,11 @@
android:text="@string/login_btn_switch" android:text="@string/login_btn_switch"
android:textColor="#666666" android:textColor="#666666"
android:textSize="12sp" android:textSize="12sp"
android:textStyle="bold" /> android:textStyle="bold"/>
</RelativeLayout> </RelativeLayout>
<FrameLayout <FrameLayout
android:id="@+id/fl_login" android:id="@+id/fl_login"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -260,7 +259,7 @@
android:id="@+id/iv_login_bg" android:id="@+id/iv_login_bg"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/dp_42" android:layout_height="@dimen/dp_42"
android:src="@drawable/theme_bg" /> android:src="@drawable/theme_bg"/>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -270,7 +269,7 @@
android:gravity="center" android:gravity="center"
android:text="@string/login_btn_login" android:text="@string/login_btn_login"
android:textColor="@color/color_white" android:textColor="@color/color_white"
android:textSize="14sp" /> android:textSize="14sp"/>
</FrameLayout> </FrameLayout>
@@ -294,7 +293,7 @@
android:text="@string/login_btn_qt" android:text="@string/login_btn_qt"
android:textColor="@color/color_666666" android:textColor="@color/color_666666"
android:textSize="@dimen/sp_12" android:textSize="@dimen/sp_12"
tools:visibility="visible" /> tools:visibility="visible"/>
<LinearLayout <LinearLayout
android:id="@+id/ll_other_login" android:id="@+id/ll_other_login"
@@ -312,7 +311,7 @@
android:id="@+id/iv_weixin" android:id="@+id/iv_weixin"
android:layout_width="@dimen/dp_44" android:layout_width="@dimen/dp_44"
android:layout_height="44dp" android:layout_height="44dp"
android:src="@mipmap/sign_icon_wechat" /> android:src="@mipmap/sign_icon_wechat"/>
<ImageView <ImageView
android:id="@+id/iv_zfb" android:id="@+id/iv_zfb"
@@ -340,7 +339,7 @@
android:layout_height="@dimen/dp_15" android:layout_height="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_5" android:layout_marginEnd="@dimen/dp_5"
android:background="@drawable/selector_login_agreement" android:background="@drawable/selector_login_agreement"
android:button="@null" /> android:button="@null"/>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -348,7 +347,7 @@
android:text="我已阅读并同意" android:text="我已阅读并同意"
android:textColor="@color/color_FFA8A8A8" android:textColor="@color/color_FFA8A8A8"
android:textSize="@dimen/sp_11" android:textSize="@dimen/sp_11"
android:textStyle="bold" /> android:textStyle="bold"/>
<TextView <TextView
android:id="@+id/tv_ysxy" android:id="@+id/tv_ysxy"
@@ -357,7 +356,7 @@
android:text="《用户协议》" android:text="《用户协议》"
android:textColor="#22BB79" android:textColor="#22BB79"
android:textSize="@dimen/sp_11" android:textSize="@dimen/sp_11"
android:textStyle="bold" /> android:textStyle="bold"/>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -365,7 +364,7 @@
android:text="和" android:text="和"
android:textColor="@color/color_FFA8A8A8" android:textColor="@color/color_FFA8A8A8"
android:textSize="@dimen/sp_11" android:textSize="@dimen/sp_11"
android:textStyle="bold" /> android:textStyle="bold"/>
<TextView <TextView
android:id="@+id/tv_yhxy" android:id="@+id/tv_yhxy"
@@ -374,7 +373,7 @@
android:text="《隐私协议》" android:text="《隐私协议》"
android:textColor="#22BB79" android:textColor="#22BB79"
android:textSize="@dimen/sp_11" android:textSize="@dimen/sp_11"
android:textStyle="bold" /> android:textStyle="bold"/>
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>
</RelativeLayout> </RelativeLayout>

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