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

新的上架提交

Browse Source
This commit is contained in:
梁小江
2025-11-12 17:32:26 +08:00
parent c1d77850f1
commit 02715f1346
65 changed files with 815 additions and 736 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
app/releas/release/output-metadata.json Normal file
View File

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

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

@@ -7,120 +7,115 @@
<!-- 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 <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"
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"
@@ -150,30 +145,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"
@@ -181,21 +176,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"
@@ -208,28 +203,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,7 +39,6 @@ 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();
@@ -73,6 +72,7 @@ public class AppContext extends CommonAppContext {
// OpenInstall.init(context); // OpenInstall.init(context);
} }
/** /**

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

@@ -20,10 +20,9 @@ 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
@@ -40,9 +39,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);

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

@@ -62,7 +62,6 @@ 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() {
@@ -72,7 +71,6 @@ 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
@@ -93,7 +91,6 @@ 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;
@@ -129,7 +126,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();
@@ -195,10 +192,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;
} }
} }
@@ -216,7 +213,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就去登录、登录成功
@@ -255,6 +252,7 @@ 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();
@@ -400,8 +398,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("并授权获得号码")
@@ -433,6 +431,7 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
} }
@Override @Override
public void showLoadings() { public void showLoadings() {
showLoading(); showLoading();
@@ -463,22 +462,23 @@ 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
ToastUtils.show("请输入手机号"); ToastUtils.show("请输入手机号");
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)) {
ToastUtils.show("请输入验证码"); ToastUtils.show("请输入验证码");
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)) {
ToastUtils.show("请输入密码"); ToastUtils.show("请输入密码");
@@ -528,9 +528,9 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
ToastUtils.show("请输入手机号"); ToastUtils.show("请输入手机号");
return; return;
} }
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,12 +544,11 @@ 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;
@@ -563,13 +562,12 @@ 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();
@@ -577,7 +575,7 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
} }
} }
public void sendCodeSuccess(String phoneNumber) { public void sendCodeSuccess() {
com.blankj.utilcode.util.ToastUtils.showShort("短信验证码发送成功请注意查收"); com.blankj.utilcode.util.ToastUtils.showShort("短信验证码发送成功请注意查收");
mBinding.tvSendCode.setEnabled(false); mBinding.tvSendCode.setEnabled(false);
mBinding.tvSendCode.setAlpha(0.5f); mBinding.tvSendCode.setAlpha(0.5f);
@@ -606,6 +604,7 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
@Override @Override
public void sendCodeSuccess1(String s) { public void sendCodeSuccess1(String s) {
LogUtils.e(s); LogUtils.e(s);
sendCodeSuccess();
} }
@Override @Override
@@ -629,9 +628,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;
} }
@@ -646,14 +645,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,4 +106,5 @@ 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,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape android:shape="oval" <shape android:shape="oval" xmlns:android="http://schemas.android.com/apk/res/android">
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,8 +1,6 @@
<?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 <stroke android:color="@color/white" android:width="1dp"/>
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,11 +240,12 @@
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"
@@ -259,7 +260,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"
@@ -269,7 +270,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>
@@ -293,7 +294,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"
@@ -311,7 +312,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"
@@ -339,7 +340,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"
@@ -347,7 +348,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"
@@ -356,7 +357,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"
@@ -364,7 +365,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"
@@ -373,7 +374,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>

4
gradle.properties
View File

@@ -28,8 +28,8 @@ isBuildModule=false
#org.gradle.deamon=false #org.gradle.deamon=false
android.injected.testOnly=false android.injected.testOnly=false
APP_VERSION_NAME=1.0.5.9 APP_VERSION_NAME=1.0.6.2
APP_VERSION_CODE=49 APP_VERSION_CODE=52
org.gradle.jvm.toolchain.useLegacyAdapters=false org.gradle.jvm.toolchain.useLegacyAdapters=false
#org.gradle.java.home=C\:\\Users\\qx\\.jdks\\ms-17.0.15 #org.gradle.java.home=C\:\\Users\\qx\\.jdks\\ms-17.0.15

10
moduleUtil/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java
View File

@@ -165,11 +165,11 @@ public class CommonAppContext extends MultiDexApplication implements Applicatio
adjustFontScale(getResources().getConfiguration()); adjustFontScale(getResources().getConfiguration());
CrashHandler.init(this); CrashHandler.init(this);
if (currentEnvironment.getShelf()==1){ // if (currentEnvironment.getShelf()==1){
if (SpUtil.getShelf()!=1) { if (SpUtil.getShelf()!=0) {
SpUtil.setShelf(1); SpUtil.setShelf(1);
} }
} // }
} }
@@ -457,8 +457,8 @@ public class CommonAppContext extends MultiDexApplication implements Applicatio
// } // }
// mqttConnect=MqttConnect.getInstance(this,"tcp://1.13.181.248","android-"+ MqttClient.generateClientId()); // mqttConnect=MqttConnect.getInstance(this,"tcp://1.13.181.248","android-"+ MqttClient.generateClientId());
mqttConnect=MqttConnect.getInstance(this,"tcp://1.13.101.98","android-"+ MqttClient.generateClientId()); // mqttConnect=MqttConnect.getInstance(this,"tcp://1.13.101.98","android-"+ MqttClient.generateClientId());
mqttConnect.mqttClient(); // mqttConnect.mqttClient();
// 每次启动应用时重置状态 // 每次启动应用时重置状态
SpUtil.getInstance().setBooleanValue("youth_model_shown", false); SpUtil.getInstance().setBooleanValue("youth_model_shown", false);

9
moduleUtil/src/main/java/com/xscm/moduleutil/utils/CrashHandler.java
View File

@@ -1,10 +1,13 @@
package com.xscm.moduleutil.utils; package com.xscm.moduleutil.utils;
import android.content.Context; import android.content.Context;
import android.content.Intent;
import android.util.Log; import android.util.Log;
import com.alibaba.android.arouter.launcher.ARouter; import com.alibaba.android.arouter.launcher.ARouter;
import static com.blankj.utilcode.util.ActivityUtils.startActivity;
public class CrashHandler implements Thread.UncaughtExceptionHandler { public class CrashHandler implements Thread.UncaughtExceptionHandler {
private static CrashHandler instance; private static CrashHandler instance;
private Thread.UncaughtExceptionHandler defaultHandler; private Thread.UncaughtExceptionHandler defaultHandler;
@@ -36,6 +39,10 @@ public class CrashHandler implements Thread.UncaughtExceptionHandler {
private void restartApp() { private void restartApp() {
// 实现应用重启逻辑 // 实现应用重启逻辑
ARouter.getInstance().build(ARouteConstants.ME).navigation(); // ARouter.getInstance().build(ARouteConstants.ME).navigation();
Intent intent = new Intent("com.qxcm.qxlive.LAUNCH_PAGE");
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
startActivity(intent);
} }
} }

15
moduleUtil/src/main/java/com/xscm/moduleutil/utils/ImageUtils.java
View File

@@ -196,6 +196,21 @@ public class ImageUtils {
} }
Glide.with(mImageView).load(path).error(R.mipmap.default_avatar).placeholder(R.mipmap.default_avatar).centerCrop().diskCacheStrategy(DiskCacheStrategy.ALL).into(mImageView); Glide.with(mImageView).load(path).error(R.mipmap.default_avatar).placeholder(R.mipmap.default_avatar).centerCrop().diskCacheStrategy(DiskCacheStrategy.ALL).into(mImageView);
}
public static void loadHeadCCTask(String path, ImageView mImageView,int errorImage) {
if (mImageView == null) {
return;
}
Context context = mImageView.getContext();
if (context instanceof android.app.Activity) {
android.app.Activity activity = (android.app.Activity) context;
if (activity.isFinishing() || (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 && activity.isDestroyed())) {
return;
}
}
Glide.with(mImageView).load(path).error(errorImage).placeholder(errorImage).centerCrop().diskCacheStrategy(DiskCacheStrategy.ALL).into(mImageView);
} }
public static void loadCompressImg(String path, ImageView mImageView, int width, int height) { public static void loadCompressImg(String path, ImageView mImageView, int width, int height) {

2
moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java
View File

@@ -15,7 +15,7 @@ public enum EnvironmentEnum {
"3e8f3add448d4692bc1d04c75ffe801b", "3e8f3add448d4692bc1d04c75ffe801b",
"tcp://81.70.45.221", "tcp://81.70.45.221",
"https://vespa.qxyushen.top/h5", "https://vespa.qxyushen.top/h5",
1), 0),
TEST(//测试环境 TEST(//测试环境
"https://test.vespa.qxyushen.top/", "https://test.vespa.qxyushen.top/",
"6rdWuz058oq5OahdbFiGEybUcdahd12J83L34Uc7MrPIrxtFG+rXiwDvRcqNvjwbClbbmvMrmxKVkIysFByBsl0Qe9kqd2w8T/nhK5G6eXXlk2V9AjYCieIU+jRnjZBB+Cfechr6rCGJ2aeBARIsXcRPW7wm9WFK9euh5T+v6Pyte68yNaNdcYCll3+U4/uCEog7HygCnMIbAU+kqoPdmn2H+51YOHW+VsnsHd4w1+I3f8Tt0xLIXGM4GWnQueZ5GR46GTWiSYMy8dCIh9SPIMRyC91GosVcfGPMJSdcXqc=", "6rdWuz058oq5OahdbFiGEybUcdahd12J83L34Uc7MrPIrxtFG+rXiwDvRcqNvjwbClbbmvMrmxKVkIysFByBsl0Qe9kqd2w8T/nhK5G6eXXlk2V9AjYCieIU+jRnjZBB+Cfechr6rCGJ2aeBARIsXcRPW7wm9WFK9euh5T+v6Pyte68yNaNdcYCll3+U4/uCEog7HygCnMIbAU+kqoPdmn2H+51YOHW+VsnsHd4w1+I3f8Tt0xLIXGM4GWnQueZ5GR46GTWiSYMy8dCIh9SPIMRyC91GosVcfGPMJSdcXqc=",

57
moduleUtil/src/main/java/com/xscm/moduleutil/utils/logger/BaseUrlSwitcherInterceptor.java Normal file
View File

@@ -0,0 +1,57 @@
package com.xscm.moduleutil.utils.logger;
import okhttp3.HttpUrl;
import okhttp3.Interceptor;
import okhttp3.Request;
import okhttp3.Response;
import java.io.IOException;
import java.util.List;
/**
* com.xscm.moduleutil.utils.logger
* qx
* 2025/11/6
*/
public class BaseUrlSwitcherInterceptor implements Interceptor {
private List<String> baseUrls;
private int currentIndex = 0;
public BaseUrlSwitcherInterceptor(List<String> baseUrls) {
this.baseUrls = baseUrls;
}
@Override
public Response intercept(Chain chain) throws IOException {
Request request = chain.request();
HttpUrl originalHttpUrl = request.url();
// 获取当前应该使用的 baseUrl
String currentBaseUrl = baseUrls.get(currentIndex);
HttpUrl newBaseUrl = HttpUrl.parse(currentBaseUrl);
if (newBaseUrl == null) {
throw new IllegalArgumentException("Invalid base url: " + currentBaseUrl);
}
// 构建新的 HttpUrl
HttpUrl newUrl = originalHttpUrl.newBuilder()
.scheme(newBaseUrl.scheme())
.host(newBaseUrl.host())
.port(newBaseUrl.port())
.build();
Request.Builder builder = request.newBuilder().url(newUrl);
Request newRequest = builder.build();
// 尝试执行请求
try {
return chain.proceed(newRequest);
} catch (IOException e) {
// 如果请求失败，则切换到下一个 baseUrl 并重试
currentIndex = (currentIndex + 1) % baseUrls.size();
return intercept(chain); // 递归调用重新构建请求
}
}
}

BIN
moduleUtil/src/main/res/mipmap-hdpi/cp_tx_k.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.4 KiB

BIN
moduleUtil/src/main/res/mipmap-hdpi/cp_tx_k.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
moduleUtil/src/main/res/mipmap-hdpi/ranking_user_cp_k.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 0 B

BIN
moduleUtil/src/main/res/mipmap-xhdpi/cp_tx_k.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.8 KiB

BIN
moduleUtil/src/main/res/mipmap-xhdpi/cp_tx_k.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
moduleUtil/src/main/res/mipmap-xhdpi/hourly_d.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 365 B

After

Width:  |  Height:  |  Size: 0 B

BIN
moduleUtil/src/main/res/mipmap-xhdpi/hourly_xlh_status.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 0 B

BIN
moduleUtil/src/main/res/mipmap-xhdpi/ranking_user_cp_k.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 0 B

BIN
moduleUtil/src/main/res/mipmap-xhdpi/top1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 0 B

BIN
moduleUtil/src/main/res/mipmap-xhdpi/top2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 0 B

BIN
moduleUtil/src/main/res/mipmap-xhdpi/top3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 0 B

BIN
moduleUtil/src/main/res/mipmap-xxhdpi/cp_tx_k.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 12 KiB

BIN
moduleUtil/src/main/res/mipmap-xxhdpi/cp_tx_k.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.6 KiB

BIN
moduleUtil/src/main/res/mipmap-xxhdpi/dcl.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 0 B

BIN
moduleUtil/src/main/res/mipmap-xxhdpi/dcl2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 0 B

BIN
moduleUtil/src/main/res/mipmap-xxhdpi/dcl3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 0 B

BIN
moduleUtil/src/main/res/mipmap-xxhdpi/dcl4.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 0 B

BIN
moduleUtil/src/main/res/mipmap-xxhdpi/dcl5.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 0 B

BIN
moduleUtil/src/main/res/mipmap-xxhdpi/dcl6.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 0 B

BIN
moduleUtil/src/main/res/mipmap-xxhdpi/hourly_djs.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.8 KiB

After

Width:  |  Height:  |  Size: 0 B

BIN
moduleUtil/src/main/res/mipmap-xxhdpi/hourly_num.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 0 B

BIN
moduleUtil/src/main/res/mipmap-xxhdpi/hourly_wh.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 848 B

After

Width:  |  Height:  |  Size: 0 B

BIN
moduleUtil/src/main/res/mipmap-xxhdpi/ranking_user_cp_k.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 0 B

BIN
moduleUtil/src/main/res/mipmap-xxxhdpi/me_edit.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 0 B

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

@@ -331,7 +331,7 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
mBinding.ivGuanbi.setOnClickListener(this); mBinding.ivGuanbi.setOnClickListener(this);
mBinding.riv.setOnClickListener(this); mBinding.riv.setOnClickListener(this);
// mBinding.ivShouchl.setOnClickListener( this); // mBinding.ivShouchl.setOnClickListener( this);
requestGpsPermissions(); // requestGpsPermissions();
} }
@Override @Override

6
modulemain/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
modulemain/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
modulemain/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
modulemain/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
modulemain/src/main/res/mipmap-mdpi/ic_launcher.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 982 B

BIN
modulemain/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
modulemain/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
modulemain/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
modulemain/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
modulemain/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
modulemain/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
modulemain/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

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

@@ -108,8 +108,8 @@ import java.util.*
import java.util.stream.Collectors import java.util.stream.Collectors
@Route(path = ARouteConstants.ROOM_DETAILS) @Route(path = ARouteConstants.ROOM_DETAILS)
class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(), class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(), RoomContacts.View, PermissionCallbacks,
RoomContacts.View, PermissionCallbacks, OnMessageReceivedListener, QXRedPacketManager.QXRedPacketManagerDelegate { OnMessageReceivedListener, QXRedPacketManager.QXRedPacketManagerDelegate {
private var roomFragment: RoomFragment? = null private var roomFragment: RoomFragment? = null
var commonPageAdapter: CommonPageAdapter? = null var commonPageAdapter: CommonPageAdapter? = null
private var mRoomBean: RoomBean? = null private var mRoomBean: RoomBean? = null
@@ -1184,7 +1184,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
override fun initData() { override fun initData() {
if (!EasyPermissions.hasPermissions(this, *permissions)) { if (!EasyPermissions.hasPermissions(this, *permissions)) {
PermissionDescriptionHelper.addPermissionDescription(false,mBinding?.root as ViewGroup,permissions) PermissionDescriptionHelper.addPermissionDescription(false, mBinding?.root as ViewGroup, permissions)
EasyPermissions.requestPermissions( EasyPermissions.requestPermissions(
this, "请开启录音使用权限", this, "请开启录音使用权限",
1, *permissions 1, *permissions
@@ -1702,9 +1702,10 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
toPitNumber: String, toPitNumber: String,
messageEvent: RoomMessageEvent messageEvent: RoomMessageEvent
) { ) {
if ("9" == toPitNumber && messageEvent.text.fromUserInfo.user_id == SpUtil.getUserId()) {
mRoomInfoResp!!.user_info.pit_number = Integer.parseInt(toPitNumber) mRoomInfoResp!!.user_info.pit_number = Integer.parseInt(toPitNumber)
if ("9" == toPitNumber && messageEvent.text.user_id.equals(SpUtil.getUserId().toString())) {
mBinding!!.roomTop.rl.visibility = View.VISIBLE mBinding!!.roomTop.rl.visibility = View.VISIBLE
ivSoundEffects(true) ivSoundEffects(true)
} else { } else {
@@ -1740,6 +1741,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
if (mRoomInfoResp!!.user_info.pit_number == 9) { if (mRoomInfoResp!!.user_info.pit_number == 9) {
mBinding!!.roomTop.rl.visibility = View.VISIBLE mBinding!!.roomTop.rl.visibility = View.VISIBLE
ivSoundEffects(true) ivSoundEffects(true)
setRoleType(3, 9)
} }
} }
@@ -1943,9 +1945,8 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
aBoolean = true aBoolean = true
ivWheatFeeding(com.xscm.moduleutil.R.mipmap.room_wheat_feeding) ivWheatFeeding(com.xscm.moduleutil.R.mipmap.room_wheat_feeding)
setBoolean(aBoolean) setBoolean(aBoolean)
if (mRoomInfoResp!!.user_info != null) {
mRoomInfoResp!!.user_info.pit_number = 0 mRoomInfoResp?.user_info?.pit_number = 0
}
setRoleType(0, 0) setRoleType(0, 0)
switchMic(2) switchMic(2)
} }
@@ -1969,9 +1970,9 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
if ("9" == pitNumber) { if ("9" == pitNumber) {
if (userId == currentUserId) { if (userId == currentUserId) {
mRoomInfoResp!!.room_info.pit_list[0] = getPitBean2(messageEvent, "9") mRoomInfoResp!!.room_info.pit_list[0] = getPitBean2(messageEvent, "9")
if (mRoomInfoResp!!.user_info != null) { // if (mRoomInfoResp!!.user_info != null) {
mRoomInfoResp!!.user_info.pit_number = 0 // mRoomInfoResp!!.user_info.pit_number = 0
} // }
} }
} else if ("888" == pitNumber) { } else if ("888" == pitNumber) {
mRoomInfoResp!!.room_auction = null mRoomInfoResp!!.room_auction = null
@@ -2916,7 +2917,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
* *
* @param type * @param type
*/ */
// @Override // @Override
fun switchMic(type: Int) { fun switchMic(type: Int) {
if (type == 1) { if (type == 1) {
mBinding!!.ivMic.setImageResource(com.xscm.moduleutil.R.mipmap.room_microphone) mBinding!!.ivMic.setImageResource(com.xscm.moduleutil.R.mipmap.room_microphone)
@@ -3078,14 +3079,17 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
switchMic(2) // 关闭麦克风 switchMic(2) // 关闭麦克风
} }
} }
pit_number == 888 -> { pit_number == 888 -> {
rl_mic?.visibility = View.VISIBLE rl_mic?.visibility = View.VISIBLE
switchMic(2) // 关闭麦克风 switchMic(2) // 关闭麦克风
} }
pit_number == -1 -> { pit_number == -1 -> {
rl_mic?.visibility = View.VISIBLE rl_mic?.visibility = View.VISIBLE
switchMic(1) // 打开麦克风 switchMic(1) // 打开麦克风
} }
else -> { else -> {
rl_mic?.visibility = View.GONE rl_mic?.visibility = View.GONE
switchMic(2) // 关闭麦克风 switchMic(2) // 关闭麦克风
@@ -3102,7 +3106,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
if ("1" != typeId) { if ("1" != typeId) {
rl_more?.visibility = View.GONE rl_more?.visibility = View.GONE
} }
if ("1"==typeId && "2" == labelId){ if ("1" == typeId && "2" == labelId) {
rl_misc?.visibility = View.VISIBLE rl_misc?.visibility = View.VISIBLE
} }
} }
@@ -4565,6 +4569,4 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
} }
} }
} }
} }

10
moduleroom/src/main/java/com/example/moduleroom/dialog/RoomSettingFragment.java
View File

@@ -380,11 +380,11 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
// 房主显示全部 // 房主显示全部
if (roleLevel == 1) { if (roleLevel == 1) {
if (onMic) { if (onMic) {
if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy|| type == RoomSettingBean.QXRoomSettingTypeRoomMyDress || type == RoomSettingBean.QXRoomSettingTypeRoomTypeLianG ) { if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy|| type == RoomSettingBean.QXRoomSettingTypeRoomMyDress ) {
return false; return false;
} }
} else { } else {
if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy|| type == RoomSettingBean.QXRoomSettingTypeRoomMyDress || type == RoomSettingBean.QXRoomSettingTypeRoomTypeLianG) { if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy|| type == RoomSettingBean.QXRoomSettingTypeRoomMyDress ) {
return false; return false;
} }
} }
@@ -397,11 +397,11 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
type == RoomSettingBean.QXRoomSettingTypeRoomClearMessage || type == QXRoomSettingTypeRoomOrderMic || type == RoomSettingBean.QXRoomSettingTypeRoomFloatingScreen type == RoomSettingBean.QXRoomSettingTypeRoomClearMessage || type == QXRoomSettingTypeRoomOrderMic || type == RoomSettingBean.QXRoomSettingTypeRoomFloatingScreen
|| type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomBgImage || type == -1) { || type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomBgImage || type == -1) {
if (onMic) { if (onMic) {
if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy || type == RoomSettingBean.QXRoomSettingTypeRoomMyDress || type == RoomSettingBean.QXRoomSettingTypeRoomTypeLianG) { if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy || type == RoomSettingBean.QXRoomSettingTypeRoomMyDress ) {
return false; return false;
} }
} else { } else {
if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy || type == RoomSettingBean.QXRoomSettingTypeRoomMyDress || type == RoomSettingBean.QXRoomSettingTypeRoomTypeLianG) { if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy || type == RoomSettingBean.QXRoomSettingTypeRoomMyDress ) {
return false; return false;
} }
} }
@@ -412,7 +412,7 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
) { ) {
return true; return true;
} else { } else {
if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy || type == RoomSettingBean.QXRoomSettingTypeRoomMyDress || type == RoomSettingBean.QXRoomSettingTypeRoomTypeLianG) { if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy || type == RoomSettingBean.QXRoomSettingTypeRoomMyDress ) {
return false; return false;
} }
} }

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

@@ -16,7 +16,6 @@ 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;
@@ -71,7 +70,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 并加入房间

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

@@ -38,8 +38,9 @@ public class TaskBoxAdapter extends BaseQuickAdapter<GiftBoxBean.GiftBean, BaseV
TextView giftTitle = helper.getView(R.id.tv_title); TextView giftTitle = helper.getView(R.id.tv_title);
giftName.setText(item.getName()); giftName.setText(item.getName());
giftTitle.setText(item.getTitle()); giftTitle.setText(item.getTitle());
ImageUtils.loadHeadCC(item.getIcon(), helper.getView(R.id.task_box));
if (position == 0) { if (position == 0) {
ImageUtils.loadHeadCCTask(item.getIcon(), helper.getView(R.id.task_box),com.xscm.moduleutil.R.mipmap.task_cj);
itemView.setBackgroundColor(mContext.getResources().getColor(com.xscm.moduleutil.R.color.color_FCE4ED)); // 红色 itemView.setBackgroundColor(mContext.getResources().getColor(com.xscm.moduleutil.R.color.color_FCE4ED)); // 红色
giftName.setTextColor(mContext.getResources().getColor(com.xscm.moduleutil.R.color.color_E24171)); giftName.setTextColor(mContext.getResources().getColor(com.xscm.moduleutil.R.color.color_E24171));
setSpannableText(giftTitle, "最高可获得%d金币", Integer.parseInt(item.getHighest_gain()),com.xscm.moduleutil.R.color.color_E24171); setSpannableText(giftTitle, "最高可获得%d金币", Integer.parseInt(item.getHighest_gain()),com.xscm.moduleutil.R.color.color_E24171);
@@ -47,6 +48,7 @@ public class TaskBoxAdapter extends BaseQuickAdapter<GiftBoxBean.GiftBean, BaseV
} else if (position == 1) { } else if (position == 1) {
ImageUtils.loadHeadCCTask(item.getIcon(), helper.getView(R.id.task_box),com.xscm.moduleutil.R.mipmap.task_gj);
itemView.setBackgroundColor(mContext.getResources().getColor(com.xscm.moduleutil.R.color.color_FDE8AE)); // 黄色 itemView.setBackgroundColor(mContext.getResources().getColor(com.xscm.moduleutil.R.color.color_FDE8AE)); // 黄色
giftName.setTextColor(mContext.getResources().getColor(com.xscm.moduleutil.R.color.color_F35F07)); giftName.setTextColor(mContext.getResources().getColor(com.xscm.moduleutil.R.color.color_F35F07));
setSpannableText(giftTitle, "最高可获得%d金币", Integer.parseInt(item.getHighest_gain()),com.xscm.moduleutil.R.color.color_F35F07); setSpannableText(giftTitle, "最高可获得%d金币", Integer.parseInt(item.getHighest_gain()),com.xscm.moduleutil.R.color.color_F35F07);

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

@@ -64,7 +64,7 @@
android:layout_marginStart="@dimen/dp_4" android:layout_marginStart="@dimen/dp_4"
android:layout_toRightOf="@+id/im_1" android:layout_toRightOf="@+id/im_1"
android:gravity="left|center" android:gravity="left|center"
android:text="111111000" tools:text="111111000"
android:textColor="@color/color_FF333333" android:textColor="@color/color_FF333333"
android:textSize="@dimen/sp_28" /> android:textSize="@dimen/sp_28" />
</RelativeLayout> </RelativeLayout>

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

@@ -60,7 +60,7 @@
android:layout_marginStart="@dimen/dp_4" android:layout_marginStart="@dimen/dp_4"
android:layout_toRightOf="@+id/im_1" android:layout_toRightOf="@+id/im_1"
android:gravity="left|center" android:gravity="left|center"
android:text="111111000" tools:text="111111000"
android:textColor="@color/colorWhite100" android:textColor="@color/colorWhite100"
android:textSize="@dimen/sp_28" /> android:textSize="@dimen/sp_28" />
</RelativeLayout> </RelativeLayout>

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

@@ -65,7 +65,7 @@
android:layout_marginStart="@dimen/dp_4" android:layout_marginStart="@dimen/dp_4"
android:layout_toRightOf="@+id/im_1" android:layout_toRightOf="@+id/im_1"
android:gravity="left|center" android:gravity="left|center"
android:text="111111000" tools:text="111111000"
android:textColor="@color/colorWhite100" android:textColor="@color/colorWhite100"
android:textSize="@dimen/sp_28" /> android:textSize="@dimen/sp_28" />
</RelativeLayout> </RelativeLayout>

10
timcommon/build/generated/source/buildConfig/debug/com/tencent/qcloud/tuikit/timcommon/BuildConfig.java
View File

@@ -1,10 +0,0 @@
/**
* Automatically generated file. DO NOT MODIFY
*/
package com.tencent.qcloud.tuikit.timcommon;
public final class BuildConfig {
public static final boolean DEBUG = Boolean.parseBoolean("true");
public static final String LIBRARY_PACKAGE_NAME = "com.tencent.qcloud.tuikit.timcommon";
public static final String BUILD_TYPE = "debug";
}

2
tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/TUIC2CChatFragment.java
View File

@@ -119,7 +119,7 @@ public class TUIC2CChatFragment extends TUIBaseChatFragment {
@Override @Override
public boolean onMenuItemClick(android.view.MenuItem item) { public boolean onMenuItemClick(android.view.MenuItem item) {
if ("举报".equals(item.getTitle())) { if ("举报".equals(item.getTitle())) {
ARouter.getInstance().build("/moduleUtil/WebViewActivity").withString("url", "https://vespa.qxyushen.top/h5/web/index.html#/pages/feedback/report?id="+getToken()+"&fromType=1&fromId="+ getUserInfo().getUser_id()).navigation(); ARouter.getInstance().build("/moduleUtil/WebViewActivity").withString("url", "http://1.13.101.98/h5/web/index.html#/pages/feedback/report?id="+getToken()+"&fromType=1&fromId="+ getUserInfo().getUser_id()).navigation();
return true; return true;
} }
return false; return false;

10
tuiconversation/build/generated/source/buildConfig/debug/com/tencent/qcloud/tuikit/tuiconversation/BuildConfig.java
View File

@@ -1,10 +0,0 @@
/**
* Automatically generated file. DO NOT MODIFY
*/
package com.tencent.qcloud.tuikit.tuiconversation;
public final class BuildConfig {
public static final boolean DEBUG = Boolean.parseBoolean("true");
public static final String LIBRARY_PACKAGE_NAME = "com.tencent.qcloud.tuikit.tuiconversation";
public static final String BUILD_TYPE = "debug";
}