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

合并module 1

Browse Source
This commit is contained in:
骆召亮
2025-10-28 16:56:13 +08:00
parent de05b70310
commit 28bd8e9eb6
583 changed files with 1391 additions and 3329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -185,12 +185,6 @@
<!-- android:launchMode="singleTop"--> <!-- android:launchMode="singleTop"-->
<!-- android:screenOrientation="behind" />--> <!-- android:screenOrientation="behind" />-->
<activity
android:name="com.cmic.sso.sdk.activity.LoginAuthActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:launchMode="singleTop"
android:screenOrientation="behind"
android:theme="@style/authsdk_activity_dialog" />
<activity <activity
android:name=".wxapi.WXEntryActivity" android:name=".wxapi.WXEntryActivity"

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

@@ -11,7 +11,6 @@ import androidx.annotation.Nullable;
import com.alibaba.android.arouter.launcher.ARouter; import com.alibaba.android.arouter.launcher.ARouter;
import com.qxcm.qxlive.databinding.ActivityLaunchPageBinding; import com.qxcm.qxlive.databinding.ActivityLaunchPageBinding;
import com.xscm.modulelogin.activity.ImproveInfoActivity;
import com.xscm.moduleutil.activity.BaseAppCompatActivity; import com.xscm.moduleutil.activity.BaseAppCompatActivity;
import com.xscm.moduleutil.activity.WebViewActivity; import com.xscm.moduleutil.activity.WebViewActivity;
import com.xscm.moduleutil.base.AppStateListener; import com.xscm.moduleutil.base.AppStateListener;

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

@@ -5,9 +5,9 @@ import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import com.blankj.utilcode.util.ToastUtils; import com.blankj.utilcode.util.ToastUtils;
import com.xscm.modulelogin.activity.ImproveInfoActivity; import com.xscm.modulemain.activity.login.activity.ImproveInfoActivity;
import com.xscm.modulelogin.activity.SwitchAccountsActivity; import com.xscm.modulemain.activity.login.activity.SwitchAccountsActivity;
import com.xscm.modulemain.activity.MainActivity; import com.xscm.modulemain.activity.main.activity.MainActivity;
import com.xscm.moduleutil.base.CommonAppContext; import com.xscm.moduleutil.base.CommonAppContext;
import com.xscm.moduleutil.bean.UserBean; import com.xscm.moduleutil.bean.UserBean;
import com.xscm.moduleutil.http.BaseObserver; import com.xscm.moduleutil.http.BaseObserver;

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

@@ -28,11 +28,10 @@ import com.mobile.auth.gatewayauth.PreLoginResultListener;
import com.mobile.auth.gatewayauth.TokenResultListener; import com.mobile.auth.gatewayauth.TokenResultListener;
import com.mobile.auth.gatewayauth.model.TokenRet; import com.mobile.auth.gatewayauth.model.TokenRet;
import com.qxcm.qxlive.databinding.ActivityPasswordLoginBinding; import com.qxcm.qxlive.databinding.ActivityPasswordLoginBinding;
import com.xscm.modulelogin.activity.ImproveInfoActivity; import com.xscm.modulemain.activity.login.activity.ImproveInfoActivity;
import com.xscm.modulelogin.even.LoginFinishEvent; import com.xscm.modulemain.activity.login.present.LoginContacter;
import com.xscm.modulelogin.present.LoginContacter; import com.xscm.modulemain.activity.login.present.LoginPresenter;
import com.xscm.modulelogin.present.LoginPresenter; import com.xscm.modulemain.activity.main.activity.MainActivity;
import com.xscm.modulemain.activity.MainActivity;
import com.xscm.moduleutil.activity.BaseMvpActivity; import com.xscm.moduleutil.activity.BaseMvpActivity;
import com.xscm.moduleutil.base.CommonAppContext; import com.xscm.moduleutil.base.CommonAppContext;
import com.xscm.moduleutil.bean.ThemeBean; import com.xscm.moduleutil.bean.ThemeBean;
@@ -136,7 +135,7 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
} }
@Subscribe(threadMode = ThreadMode.MAIN) @Subscribe(threadMode = ThreadMode.MAIN)
public void finishEvent(LoginFinishEvent event) { public void finishEvent() {
finish(); finish();
} }

1
moduleLogin/.gitignore vendored
View File

@@ -1 +0,0 @@
/build

51
moduleLogin/build.gradle
View File

@@ -1,51 +0,0 @@
plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
}
android {
namespace 'com.xscm.modulelogin'
compileSdk 35
defaultConfig {
minSdk 24
targetSdk 35
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
dataBinding {
enabled = true
}
kotlinOptions {
jvmTarget = '11'
}
}
dependencies {
implementation libs.appcompat
implementation libs.material
implementation libs.activity
implementation libs.constraintlayout
implementation project(':modulemain')
implementation project(':modulevocal')
testImplementation libs.junit
androidTestImplementation libs.ext.junit
androidTestImplementation libs.espresso.core
implementation project(":moduleUtil")
}
apply plugin: 'com.alibaba.arouter' // ⚠️ 添加这一行

21
moduleLogin/proguard-rules.pro vendored
View File

@@ -1,21 +0,0 @@
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}
# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable
# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile

24
moduleLogin/src/main/AndroidManifest.xml
View File

@@ -1,24 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application android:allowBackup="true">
<activity
android:name=".activity.SwitchAccountsActivity"
android:exported="true"
/>
<activity
android:name=".activity.ImproveInfoActivity"
android:exported="true"
/>
<activity
android:name=".activity.ForgetPasswordActivity"
android:exported="true"
/>
<activity
android:name=".activity.LoginActivity"
android:screenOrientation="portrait" />
</application>
</manifest>

4
moduleLogin/src/main/java/com/xscm/modulelogin/even/LoginFinishEvent.java
View File

@@ -1,4 +0,0 @@
package com.xscm.modulelogin.even;
public class LoginFinishEvent {
}

170
moduleLogin/src/main/res/drawable/ic_launcher_background.xml
View File

@@ -1,170 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path
android:fillColor="#3DDC84"
android:pathData="M0,0h108v108h-108z" />
<path
android:fillColor="#00000000"
android:pathData="M9,0L9,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,0L19,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M29,0L29,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M39,0L39,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M49,0L49,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M59,0L59,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M69,0L69,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M79,0L79,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M89,0L89,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M99,0L99,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,9L108,9"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,19L108,19"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,29L108,29"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,39L108,39"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,49L108,49"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,59L108,59"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,69L108,69"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,79L108,79"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,89L108,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,99L108,99"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,29L89,29"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,39L89,39"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,49L89,49"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,59L89,59"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,69L89,69"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,79L89,79"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M29,19L29,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M39,19L39,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M49,19L49,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M59,19L59,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M69,19L69,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M79,19L79,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
</vector>

30
moduleLogin/src/main/res/drawable/ic_launcher_foreground.xml
View File

@@ -1,30 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="85.84757"
android:endY="92.4963"
android:startX="42.9492"
android:startY="49.59793"
android:type="linear">
<item
android:color="#44000000"
android:offset="0.0" />
<item
android:color="#00000000"
android:offset="1.0" />
</gradient>
</aapt:attr>
</path>
<path
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
android:strokeWidth="1"
android:strokeColor="#00000000" />
</vector>

6
moduleLogin/src/main/res/values-en-rUs/strings.xml
View File

@@ -1,6 +0,0 @@
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
<string name="recommend_skip">Skip</string>
</resources>

10
moduleLogin/src/main/res/values/colors.xml
View File

@@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="purple_200">#FFBB86FC</color>
<color name="purple_500">#FF6200EE</color>
<color name="purple_700">#FF3700B3</color>
<color name="teal_200">#FF03DAC5</color>
<color name="teal_700">#FF018786</color>
<color name="black">#FF000000</color>
<color name="white">#FFFFFFFF</color>
</resources>

3
moduleLogin/src/main/res/values/strings.xml
View File

@@ -1,3 +0,0 @@
<resources>
</resources>

2
moduleUtil/build.gradle
View File

@@ -222,7 +222,7 @@ dependencies {
api 'com.qcloud.cos:cos-android:5.9.+' api 'com.qcloud.cos:cos-android:5.9.+'
api project(':Loadinglibrary') api project(':Loadinglibrary')
api project(':moduletablayout')
// room数据库 // room数据库
// def room_version = "2.5.0" // def room_version = "2.5.0"
// implementation "androidx.room:room-runtime:$room_version" // implementation "androidx.room:room-runtime:$room_version"

1
modulecircle/.gitignore vendored
View File

@@ -1 +0,0 @@
/build

64
modulecircle/build.gradle
View File

@@ -1,64 +0,0 @@
plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
}
android {
namespace 'com.example.modulecircle'
compileSdk 35
defaultConfig {
minSdk 24
targetSdk 35
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
javaCompileOptions {
annotationProcessorOptions {
arguments = [
AROUTER_MODULE_NAME: project.getName()
]
}
}
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
dataBinding {
enabled = true
}
kotlinOptions {
jvmTarget = '11'
}
}
dependencies {
implementation libs.appcompat
implementation libs.material
implementation libs.activity
implementation libs.constraintlayout
testImplementation libs.junit
androidTestImplementation libs.ext.junit
androidTestImplementation libs.espresso.core
implementation(libs.arouter.api.v150)
//annotationProcessor
annotationProcessor libs.arouter.compiler
implementation project(':moduleUtil')
implementation project(':moduletablayout')
implementation project(':modulevocal')
}
apply plugin: 'com.alibaba.arouter' // ⚠️ 添加这一行

21
modulecircle/proguard-rules.pro vendored
View File

@@ -1,21 +0,0 @@
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}
# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable
# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile

27
modulecircle/src/main/AndroidManifest.xml
View File

@@ -1,27 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true">
<activity
android:name=".activity.DynamicDetailActivity"
android:exported="false"
android:windowSoftInputMode="stateHidden|adjustResize"
android:screenOrientation="portrait"/>
<activity
android:name=".activity.DynamicListActivity"
android:exported="false"
android:windowSoftInputMode="stateHidden|adjustResize"/>
<activity
android:name=".activity.ReleaseActivity"
android:exported="false"
/>
</application>
</manifest>

170
modulecircle/src/main/res/drawable/ic_launcher_background.xml
View File

@@ -1,170 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path
android:fillColor="#3DDC84"
android:pathData="M0,0h108v108h-108z" />
<path
android:fillColor="#00000000"
android:pathData="M9,0L9,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,0L19,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M29,0L29,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M39,0L39,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M49,0L49,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M59,0L59,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M69,0L69,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M79,0L79,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M89,0L89,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M99,0L99,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,9L108,9"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,19L108,19"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,29L108,29"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,39L108,39"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,49L108,49"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,59L108,59"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,69L108,69"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,79L108,79"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,89L108,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,99L108,99"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,29L89,29"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,39L89,39"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,49L89,49"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,59L89,59"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,69L89,69"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,79L89,79"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M29,19L29,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M39,19L39,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M49,19L49,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M59,19L59,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M69,19L69,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M79,19L79,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
</vector>

30
modulecircle/src/main/res/drawable/ic_launcher_foreground.xml
View File

@@ -1,30 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="85.84757"
android:endY="92.4963"
android:startX="42.9492"
android:startY="49.59793"
android:type="linear">
<item
android:color="#44000000"
android:offset="0.0" />
<item
android:color="#00000000"
android:offset="1.0" />
</gradient>
</aapt:attr>
</path>
<path
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
android:strokeWidth="1"
android:strokeColor="#00000000" />
</vector>

10
modulecircle/src/main/res/values/colors.xml
View File

@@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="purple_200">#FFBB86FC</color>
<color name="purple_500">#FF6200EE</color>
<color name="purple_700">#FF3700B3</color>
<color name="teal_200">#FF03DAC5</color>
<color name="teal_700">#FF018786</color>
<color name="black">#FF000000</color>
<color name="white">#FFFFFFFF</color>
</resources>

4
modulecircle/src/main/res/values/strings.xml
View File

@@ -1,4 +0,0 @@
<resources>
<!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment">Hello blank fragment</string>
</resources>

22
modulemain/build.gradle
View File

@@ -38,6 +38,10 @@ android {
kotlinOptions { kotlinOptions {
jvmTarget = '11' jvmTarget = '11'
} }
buildFeatures {
viewBinding true
}
} }
dependencies { dependencies {
@@ -46,11 +50,11 @@ dependencies {
implementation libs.material implementation libs.material
implementation libs.activity implementation libs.activity
implementation libs.constraintlayout implementation libs.constraintlayout
implementation project(':modulevoice') // implementation project(':modulevoice')
implementation project(':modulecircle') // implementation project(':modulecircle')
implementation project(':modulevocal') // implementation project(':modulevocal')
implementation project(':modulenews') // implementation project(':modulenews')
implementation project(':moduleroom') // implementation project(':moduleroom')
testImplementation libs.junit testImplementation libs.junit
androidTestImplementation libs.ext.junit androidTestImplementation libs.ext.junit
@@ -62,5 +66,13 @@ dependencies {
annotationProcessor libs.arouter.compiler annotationProcessor libs.arouter.compiler
implementation libs.permissionx implementation libs.permissionx
implementation files('libs/WbCloudFaceLiveSdk-face-v6.6.2-8e4718fc.aar')
implementation files('libs/WbCloudNormal-v5.1.10-4e3e198.aar')
api project(':tuiconversation')
api project(':tuichat')
api project(":moduleUtil")
} }
apply plugin: 'com.alibaba.arouter' // ⚠️ 添加这一行 apply plugin: 'com.alibaba.arouter' // ⚠️ 添加这一行

0
modulevocal/libs/WbCloudFaceLiveSdk-face-v6.6.2-8e4718fc.aar → modulemain/libs/WbCloudFaceLiveSdk-face-v6.6.2-8e4718fc.aar
View File

0
modulevocal/libs/WbCloudNormal-v5.1.10-4e3e198.aar → modulemain/libs/WbCloudNormal-v5.1.10-4e3e198.aar
View File

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

@@ -1,16 +1,186 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"> <manifest xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 前台定位权限 --> <!-- 前台定位权限 -->
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/> <!-- 后台定位权限（Android 10+） --> <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <!-- 后台定位权限（Android 10+） -->
<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/> <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
<application> <application>
<activity
android:name=".activity.login.activity.SwitchAccountsActivity"
android:exported="false" />
<activity
android:name=".activity.login.activity.ImproveInfoActivity"
android:exported="false" />
<activity
android:name=".activity.login.activity.ForgetPasswordActivity"
android:exported="false" />
<activity <activity
android:name=".activity.MainActivity" android:name=".activity.login.activity.LoginActivity"
android:configChanges="fontScale" android:exported="false" />
android:screenOrientation="portrait">
</activity> <activity
android:name=".activity.main.activity.MainActivity"
android:configChanges="fontScale" />
<activity
android:name=".activity.room.activity.RoomActivity"
android:alwaysRetainTaskState="true"
android:configChanges="orientation|screenSize|keyboardHidden"
android:enableOnBackInvokedCallback="false"
android:excludeFromRecents="false"
android:exported="false"
android:launchMode="singleTask"
android:screenOrientation="portrait"
android:theme="@style/TransparentActivityTheme"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".activity.room.activity.RedResultActivity"
android:exported="true" />
<activity
android:name=".activity.room.activity.SearchActivity"
android:exported="false" />
<activity
android:name=".activity.room.activity.RankingListActivity"
android:exported="false" />
<activity
android:name=".activity.room.activity.PopularRoomActivity"
android:exported="false" />
<activity
android:name=".activity.plaza.activity.DynamicDetailActivity"
android:exported="false"
android:windowSoftInputMode="stateHidden|adjustResize" />
<activity
android:name=".activity.plaza.activity.DynamicListActivity"
android:exported="false"
android:windowSoftInputMode="stateHidden|adjustResize" />
<activity
android:name=".activity.plaza.activity.ReleaseActivity"
android:exported="false" />
<activity
android:name=".activity.user.activity.AboutUsActivity"
android:exported="false" />
<activity
android:name=".activity.user.activity.WithdrawalListActivity"
android:exported="false" />
<activity
android:name=".activity.user.activity.GiftBoxRecordActivity"
android:exported="false" />
<activity
android:name=".activity.user.activity.BindCardDetailsActivity"
android:exported="false" />
<activity
android:name=".activity.user.activity.BindCardActivity"
android:exported="false" />
<activity
android:name=".activity.user.activity.AlbumDetailActivity"
android:exported="false" />
<activity
android:name=".activity.user.activity.SettingActivity"
android:exported="false" />
<activity
android:name=".activity.user.activity.CreateAlbumActivity"
android:exported="false" />
<activity
android:name=".activity.user.activity.RevenueActivity"
android:exported="false" />
<activity
android:name=".activity.user.activity.DailyTasksActivity"
android:exported="false" />
<activity
android:name=".activity.user.activity.UserHomepageActivity"
android:exported="false" />
<activity
android:name=".activity.user.activity.MyBagActivity"
android:exported="false" />
<activity
android:name=".activity.user.activity.BriefIntroductionActivity"
android:exported="false" />
<activity
android:name=".activity.user.activity.ChangeNicknameActivity"
android:exported="false" />
<activity
android:name=".activity.user.activity.CurrencyExchangeActivity"
android:exported="false" />
<activity
android:name=".activity.user.activity.WithdrawalActivity"
android:exported="false" />
<activity
android:name=".activity.user.activity.RechargeActivity"
android:exported="false" />
<activity
android:name=".activity.user.activity.MyMoneyActivity"
android:exported="false" />
<activity
android:name=".activity.user.activity.EditUserInfoActivity"
android:exported="false" />
<activity
android:name=".activity.user.activity.ChangPassActivity"
android:exported="false" />
<activity
android:name=".activity.user.activity.PersonalityActivity"
android:exported="false" />
<activity
android:name=".activity.user.activity.RealDetailActivity"
android:exported="false" />
<activity
android:name=".activity.user.activity.RoomAllowanceDetailActivity"
android:exported="false" />
<activity
android:name=".activity.user.activity.RoomAllowanceActivity"
android:exported="false" />
<activity
android:name=".activity.user.activity.RoomDetailsActivity"
android:exported="false" />
<activity
android:name=".activity.user.activity.CreatedRoomActivity"
android:exported="false" />
<activity
android:name=".activity.user.activity.MyRoomActivity"
android:exported="false" />
<activity
android:name=".activity.user.activity.PhoneReplacementActivity"
android:exported="false" />
<activity
android:name=".activity.user.activity.BlacklistActivity"
android:exported="false" />
<activity
android:name=".activity.user.activity.MessageReminderActivity"
android:exported="false" />
<activity
android:name=".activity.user.activity.NotificationActivity"
android:exported="false" />
<activity
android:name=".activity.user.activity.UnderageActivity"
android:exported="true" />
<activity
android:name=".activity.user.activity.RealNameActivity"
android:exported="false" />
<service
android:name=".service.MediaProjectionService"
android:foregroundServiceType="mediaProjection" />
<service
android:name=".service.ForegroundService"
android:enabled="true"
android:exported="true"
android:foregroundServiceType="microphone|camera|mediaPlayback" />
<service
android:name=".service.CancelNoticeService"
android:enabled="true"
android:exported="true" />
</application> </application>
</manifest> </manifest>

25
moduleLogin/src/main/java/com/xscm/modulelogin/activity/ForgetPasswordActivity.java → modulemain/src/main/java/com/xscm/modulemain/activity/login/activity/ForgetPasswordActivity.java
View File

@@ -1,4 +1,4 @@
package com.xscm.modulelogin.activity; package com.xscm.modulemain.activity.login.activity;
import android.os.CountDownTimer; import android.os.CountDownTimer;
import android.text.TextUtils; import android.text.TextUtils;
@@ -6,11 +6,10 @@ import android.view.View;
import com.blankj.utilcode.util.LogUtils; import com.blankj.utilcode.util.LogUtils;
import com.blankj.utilcode.util.ToastUtils; import com.blankj.utilcode.util.ToastUtils;
import com.xscm.modulelogin.R; import com.xscm.modulemain.R;
import com.xscm.modulelogin.databinding.ActivityForgetPasswordBinding; import com.xscm.modulemain.activity.login.present.LoginContacter;
import com.xscm.modulelogin.databinding.ActivityLoginBinding; import com.xscm.modulemain.activity.login.present.LoginPresenter;
import com.xscm.modulelogin.present.LoginContacter; import com.xscm.modulemain.databinding.ActivityForgetPasswordBinding;
import com.xscm.modulelogin.present.LoginPresenter;
import com.xscm.moduleutil.activity.BaseMvpActivity; import com.xscm.moduleutil.activity.BaseMvpActivity;
import com.xscm.moduleutil.bean.ThemeBean; import com.xscm.moduleutil.bean.ThemeBean;
import com.xscm.moduleutil.bean.UserBean; import com.xscm.moduleutil.bean.UserBean;
@@ -39,7 +38,7 @@ public class ForgetPasswordActivity extends BaseMvpActivity<LoginPresenter, Acti
if (v.getId() == R.id.tv_send_code) { if (v.getId() == R.id.tv_send_code) {
String phone = mBinding.edPhone.getText().toString().trim(); String phone = mBinding.edPhone.getText().toString().trim();
if (TextUtils.isEmpty(phone)) { if (TextUtils.isEmpty(phone)) {
com.blankj.utilcode.util.ToastUtils.showShort("请输入手机号"); ToastUtils.showShort("请输入手机号");
return; return;
} }
sendCodeSuccess(phone); sendCodeSuccess(phone);
@@ -51,23 +50,23 @@ public class ForgetPasswordActivity extends BaseMvpActivity<LoginPresenter, Acti
String password = mBinding.editTextNewPassword.getText().toString().trim(); String password = mBinding.editTextNewPassword.getText().toString().trim();
String confirmPassword = mBinding.editTextConfirmPassword.getText().toString().trim(); String confirmPassword = mBinding.editTextConfirmPassword.getText().toString().trim();
if (TextUtils.isEmpty(phone)){ if (TextUtils.isEmpty(phone)){
com.blankj.utilcode.util.ToastUtils.showShort("请输入手机号"); ToastUtils.showShort("请输入手机号");
return; return;
} }
if (TextUtils.isEmpty(code)){ if (TextUtils.isEmpty(code)){
com.blankj.utilcode.util.ToastUtils.showShort("请输入验证码"); ToastUtils.showShort("请输入验证码");
return; return;
} }
if (TextUtils.isEmpty(password)){ if (TextUtils.isEmpty(password)){
com.blankj.utilcode.util.ToastUtils.showShort("请输入密码"); ToastUtils.showShort("请输入密码");
return; return;
} }
if (TextUtils.isEmpty(confirmPassword)){ if (TextUtils.isEmpty(confirmPassword)){
com.blankj.utilcode.util.ToastUtils.showShort("两次密码不一致"); ToastUtils.showShort("两次密码不一致");
return; return;
} }
if (!password.equals(confirmPassword)){ if (!password.equals(confirmPassword)){
com.blankj.utilcode.util.ToastUtils.showShort("两次密码不一致"); ToastUtils.showShort("两次密码不一致");
return; return;
} }
MvpPre.forgotPassword(password,phone,code); MvpPre.forgotPassword(password,phone,code);
@@ -81,7 +80,7 @@ public class ForgetPasswordActivity extends BaseMvpActivity<LoginPresenter, Acti
} }
} }
public void sendCodeSuccess(String phoneNumber) { public void sendCodeSuccess(String phoneNumber) {
com.blankj.utilcode.util.ToastUtils.showShort("短信验证码发送成功请注意查收"); ToastUtils.showShort("短信验证码发送成功请注意查收");
mBinding.tvSendCode.setEnabled(false); mBinding.tvSendCode.setEnabled(false);
mBinding.tvSendCode.setAlpha(0.5f); mBinding.tvSendCode.setAlpha(0.5f);
releaseTimer(); releaseTimer();

13
moduleLogin/src/main/java/com/xscm/modulelogin/activity/ImproveInfoActivity.java → modulemain/src/main/java/com/xscm/modulemain/activity/login/activity/ImproveInfoActivity.java
View File

@@ -1,4 +1,4 @@
package com.xscm.modulelogin.activity; package com.xscm.modulemain.activity.login.activity;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
@@ -11,11 +11,11 @@ import com.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.config.PictureConfig; import com.luck.picture.lib.config.PictureConfig;
import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.entity.LocalMedia;
import com.luck.picture.lib.style.PictureSelectorStyle; import com.luck.picture.lib.style.PictureSelectorStyle;
import com.xscm.modulelogin.R; import com.xscm.modulemain.R;
import com.xscm.modulelogin.databinding.ActivityImproveInfoBinding; import com.xscm.modulemain.activity.login.contacts.ImproveInfoContacts;
import com.xscm.modulelogin.present.ImproveInfoContacts; import com.xscm.modulemain.activity.login.contacts.ImproveInfoPresenter;
import com.xscm.modulelogin.present.ImproveInfoPresenter; import com.xscm.modulemain.activity.main.activity.MainActivity;
import com.xscm.modulemain.activity.MainActivity; import com.xscm.modulemain.databinding.ActivityImproveInfoBinding;
import com.xscm.moduleutil.activity.BaseMvpActivity; import com.xscm.moduleutil.activity.BaseMvpActivity;
import com.xscm.moduleutil.bean.UserBean; import com.xscm.moduleutil.bean.UserBean;
import com.xscm.moduleutil.utils.DateSelectDialog; import com.xscm.moduleutil.utils.DateSelectDialog;
@@ -25,7 +25,6 @@ import com.xscm.moduleutil.utils.ImageUtils;
import com.xscm.moduleutil.utils.SpUtil; import com.xscm.moduleutil.utils.SpUtil;
import com.xscm.moduleutil.widget.Constants; import com.xscm.moduleutil.widget.Constants;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
import java.io.File; import java.io.File;

25
moduleLogin/src/main/java/com/xscm/modulelogin/activity/LoginActivity.java → modulemain/src/main/java/com/xscm/modulemain/activity/login/activity/LoginActivity.java
View File

@@ -1,4 +1,4 @@
package com.xscm.modulelogin.activity; package com.xscm.modulemain.activity.login.activity;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.app.Activity; import android.app.Activity;
@@ -15,21 +15,20 @@ import androidx.annotation.Nullable;
import com.alipay.sdk.app.AuthTask; import com.alipay.sdk.app.AuthTask;
import com.blankj.utilcode.util.LogUtils; import com.blankj.utilcode.util.LogUtils;
import com.blankj.utilcode.util.ToastUtils; import com.blankj.utilcode.util.ToastUtils;
import com.xscm.modulelogin.R;
import com.xscm.modulelogin.databinding.ActivityLoginBinding;
import com.xscm.modulelogin.even.LoginFinishEvent;
import com.xscm.modulelogin.present.LoginContacter;
import com.xscm.modulelogin.present.LoginPresenter;
import com.xscm.moduleutil.activity.BaseMvpActivity;
import com.xscm.moduleutil.bean.ThemeBean;
import com.xscm.moduleutil.bean.UserBean;
import com.xscm.moduleutil.utils.BarUtils;
import com.xscm.moduleutil.utils.PreferencesUtils;
import com.xscm.moduleutil.base.CommonAppContext;
import com.tencent.mm.opensdk.modelbase.BaseResp; import com.tencent.mm.opensdk.modelbase.BaseResp;
import com.tencent.mm.opensdk.modelmsg.SendAuth; import com.tencent.mm.opensdk.modelmsg.SendAuth;
import com.tencent.mm.opensdk.openapi.IWXAPI; import com.tencent.mm.opensdk.openapi.IWXAPI;
import com.tencent.mm.opensdk.openapi.WXAPIFactory; import com.tencent.mm.opensdk.openapi.WXAPIFactory;
import com.xscm.modulemain.R;
import com.xscm.modulemain.activity.login.present.LoginContacter;
import com.xscm.modulemain.activity.login.present.LoginPresenter;
import com.xscm.modulemain.databinding.ActivityLoginBinding;
import com.xscm.moduleutil.activity.BaseMvpActivity;
import com.xscm.moduleutil.base.CommonAppContext;
import com.xscm.moduleutil.bean.ThemeBean;
import com.xscm.moduleutil.bean.UserBean;
import com.xscm.moduleutil.utils.BarUtils;
import com.xscm.moduleutil.utils.PreferencesUtils;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.Subscribe;
@@ -72,7 +71,7 @@ public class LoginActivity extends BaseMvpActivity<LoginPresenter, ActivityLogin
} }
@Subscribe(threadMode = ThreadMode.MAIN) @Subscribe(threadMode = ThreadMode.MAIN)
public void finishEvent(LoginFinishEvent event) { public void finishEvent() {
finish(); finish();
} }

12
moduleLogin/src/main/java/com/xscm/modulelogin/activity/SwitchAccountsActivity.java → modulemain/src/main/java/com/xscm/modulemain/activity/login/activity/SwitchAccountsActivity.java
View File

@@ -1,4 +1,4 @@
package com.xscm.modulelogin.activity; package com.xscm.modulemain.activity.login.activity;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
@@ -6,11 +6,11 @@ import android.util.Log;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import com.xscm.modulelogin.R; import com.xscm.modulemain.R;
import com.xscm.modulelogin.adapter.SwitchAccountsAdapter; import com.xscm.modulemain.activity.login.present.LoginContacter;
import com.xscm.modulelogin.databinding.ActivitySwitchAccountsBinding; import com.xscm.modulemain.activity.login.present.LoginPresenter;
import com.xscm.modulelogin.present.LoginContacter; import com.xscm.modulemain.adapter.SwitchAccountsAdapter;
import com.xscm.modulelogin.present.LoginPresenter; import com.xscm.modulemain.databinding.ActivitySwitchAccountsBinding;
import com.xscm.moduleutil.activity.BaseMvpActivity; import com.xscm.moduleutil.activity.BaseMvpActivity;
import com.xscm.moduleutil.bean.ThemeBean; import com.xscm.moduleutil.bean.ThemeBean;
import com.xscm.moduleutil.bean.UserBean; import com.xscm.moduleutil.bean.UserBean;

3
moduleLogin/src/main/java/com/xscm/modulelogin/present/ImproveInfoContacts.java → modulemain/src/main/java/com/xscm/modulemain/activity/login/contacts/ImproveInfoContacts.java
View File

@@ -1,8 +1,7 @@
package com.xscm.modulelogin.present; package com.xscm.modulemain.activity.login.contacts;
import android.app.Activity; import android.app.Activity;
import com.xscm.moduleutil.activity.IPresenter; import com.xscm.moduleutil.activity.IPresenter;
import com.xscm.moduleutil.activity.IView; import com.xscm.moduleutil.activity.IView;
import com.xscm.moduleutil.bean.UserBean; import com.xscm.moduleutil.bean.UserBean;

3
moduleLogin/src/main/java/com/xscm/modulelogin/present/ImproveInfoPresenter.java → modulemain/src/main/java/com/xscm/modulemain/activity/login/contacts/ImproveInfoPresenter.java
View File

@@ -1,8 +1,7 @@
package com.xscm.modulelogin.present; package com.xscm.modulemain.activity.login.contacts;
import android.content.Context; import android.content.Context;
import com.hjq.toast.ToastUtils; import com.hjq.toast.ToastUtils;
import com.xscm.moduleutil.base.CommonAppContext; import com.xscm.moduleutil.base.CommonAppContext;
import com.xscm.moduleutil.bean.UserBean; import com.xscm.moduleutil.bean.UserBean;

2
moduleLogin/src/main/java/com/xscm/modulelogin/present/LoginContacter.java → modulemain/src/main/java/com/xscm/modulemain/activity/login/present/LoginContacter.java
View File

@@ -1,4 +1,4 @@
package com.xscm.modulelogin.present; package com.xscm.modulemain.activity.login.present;
import android.app.Activity; import android.app.Activity;

10
moduleLogin/src/main/java/com/xscm/modulelogin/present/LoginPresenter.java → modulemain/src/main/java/com/xscm/modulemain/activity/login/present/LoginPresenter.java
View File

@@ -1,22 +1,20 @@
package com.xscm.modulelogin.present; package com.xscm.modulemain.activity.login.present;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import com.alibaba.android.arouter.launcher.ARouter;
import com.blankj.utilcode.util.AppUtils; import com.blankj.utilcode.util.AppUtils;
import com.blankj.utilcode.util.ToastUtils; import com.blankj.utilcode.util.ToastUtils;
import com.xscm.modulelogin.activity.ImproveInfoActivity; import com.xscm.modulemain.activity.login.activity.ImproveInfoActivity;
import com.xscm.modulelogin.activity.SwitchAccountsActivity; import com.xscm.modulemain.activity.login.activity.SwitchAccountsActivity;
import com.xscm.modulemain.activity.MainActivity; import com.xscm.modulemain.activity.main.activity.MainActivity;
import com.xscm.moduleutil.activity.WebViewActivity; import com.xscm.moduleutil.activity.WebViewActivity;
import com.xscm.moduleutil.base.CommonAppContext; import com.xscm.moduleutil.base.CommonAppContext;
import com.xscm.moduleutil.bean.ThemeBean; import com.xscm.moduleutil.bean.ThemeBean;
import com.xscm.moduleutil.bean.UserBean; import com.xscm.moduleutil.bean.UserBean;
import com.xscm.moduleutil.http.BaseObserver; import com.xscm.moduleutil.http.BaseObserver;
import com.xscm.moduleutil.presenter.BasePresenter; import com.xscm.moduleutil.presenter.BasePresenter;
import com.xscm.moduleutil.utils.ARouteConstants;
import com.xscm.moduleutil.utils.SpUtil; import com.xscm.moduleutil.utils.SpUtil;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;

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

@@ -1,4 +1,4 @@
package com.xscm.modulemain.activity; package com.xscm.modulemain.activity.main.activity;
import android.Manifest; import android.Manifest;
import android.content.Context; import android.content.Context;
@@ -29,17 +29,17 @@ import com.blankj.utilcode.util.FragmentUtils;
import com.blankj.utilcode.util.LogUtils; import com.blankj.utilcode.util.LogUtils;
import com.blankj.utilcode.util.ToastUtils; import com.blankj.utilcode.util.ToastUtils;
import com.bumptech.glide.Glide; import com.bumptech.glide.Glide;
import com.example.modulecircle.fragment.CircleFragment; import com.xscm.modulemain.activity.msg.fragment.NewsFragment;
import com.example.modulenews.fragment.NewsFragment; import com.xscm.modulemain.activity.user.fragment.VocalRangeFragment;
import com.example.modulevocal.fragment.VocalRangeFragment; import com.xscm.modulemain.activity.plaza.fragment.CircleFragment;
import com.example.modulevoice.fragment.VoiceFragment; import com.xscm.modulemain.activity.room.fragment.VoiceFragment;
import com.permissionx.guolindev.PermissionX; import com.permissionx.guolindev.PermissionX;
import com.permissionx.guolindev.callback.RequestCallback; import com.permissionx.guolindev.callback.RequestCallback;
import com.stx.xhb.xbanner.XBanner; import com.stx.xhb.xbanner.XBanner;
import com.xscm.modulemain.R; import com.xscm.modulemain.R;
import com.xscm.modulemain.contacts.HomeContacts; import com.xscm.modulemain.activity.main.contacts.HomeContacts;
import com.xscm.modulemain.databinding.ActivityMainBinding; import com.xscm.modulemain.databinding.ActivityMainBinding;
import com.xscm.modulemain.presenter.HomePresenter; import com.xscm.modulemain.activity.main.presenter.HomePresenter;
import com.xscm.moduleutil.activity.BaseMvpActivity; import com.xscm.moduleutil.activity.BaseMvpActivity;
import com.xscm.moduleutil.adapter.AppUpdateDialog; import com.xscm.moduleutil.adapter.AppUpdateDialog;
import com.xscm.moduleutil.base.CommonAppContext; import com.xscm.moduleutil.base.CommonAppContext;

2
modulemain/src/main/java/com/xscm/modulemain/contacts/HomeContacts.java → modulemain/src/main/java/com/xscm/modulemain/activity/main/contacts/HomeContacts.java
View File

@@ -1,4 +1,4 @@
package com.xscm.modulemain.contacts; package com.xscm.modulemain.activity.main.contacts;
import android.app.Activity; import android.app.Activity;

6
modulemain/src/main/java/com/xscm/modulemain/presenter/HomePresenter.java → modulemain/src/main/java/com/xscm/modulemain/activity/main/presenter/HomePresenter.java
View File

@@ -1,4 +1,4 @@
package com.xscm.modulemain.presenter; package com.xscm.modulemain.activity.main.presenter;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; import android.content.Context;
@@ -11,18 +11,16 @@ import android.provider.Settings;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi; import androidx.annotation.RequiresApi;
import com.xscm.modulemain.contacts.HomeContacts; import com.xscm.modulemain.activity.main.contacts.HomeContacts;
import com.xscm.moduleutil.bean.*; import com.xscm.moduleutil.bean.*;
import com.xscm.moduleutil.bean.room.RoomOnline; import com.xscm.moduleutil.bean.room.RoomOnline;
import com.xscm.moduleutil.http.BaseObserver; import com.xscm.moduleutil.http.BaseObserver;
import com.xscm.moduleutil.presenter.BasePresenter; import com.xscm.moduleutil.presenter.BasePresenter;
import com.xscm.moduleutil.utils.GsonUtils;
import com.xscm.moduleutil.utils.SpUtil; import com.xscm.moduleutil.utils.SpUtil;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
import java.util.List;
import io.reactivex.disposables.Disposable; import io.reactivex.disposables.Disposable;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

2
modulenews/src/main/java/com/example/modulenews/contacts/NewsContacts.java → modulemain/src/main/java/com/xscm/modulemain/activity/msg/contacts/NewsContacts.java
View File

@@ -1,4 +1,4 @@
package com.example.modulenews.contacts; package com.xscm.modulemain.activity.msg.contacts;
import android.app.Activity; import android.app.Activity;

24
modulenews/src/main/java/com/example/modulenews/fragment/NewsFragment.java → modulemain/src/main/java/com/xscm/modulemain/activity/msg/fragment/NewsFragment.java
View File

@@ -1,4 +1,4 @@
package com.example.modulenews.fragment; package com.xscm.modulemain.activity.msg.fragment;
import android.content.Intent; import android.content.Intent;
@@ -6,21 +6,19 @@ import android.view.View;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import com.example.modulenews.R; import com.xscm.modulemain.R;
import com.example.modulenews.contacts.NewsContacts; import com.tencent.imsdk.v2.V2TIMConversation;
import com.example.modulenews.databinding.FragmentNewsBinding; import com.tencent.qcloud.tuicore.TUIConstants;
import com.example.modulenews.presenter.NewsPresenter; import com.tencent.qcloud.tuikit.tuichat.classicui.page.TUIC2CChatActivity;
import com.tencent.imsdk.v2.V2TIMManager; import com.tencent.qcloud.tuikit.tuiconversation.classicui.page.TUIConversationFragment;
import com.tencent.imsdk.v2.V2TIMValueCallback; import com.xscm.modulemain.activity.msg.contacts.NewsContacts;
import com.xscm.modulemain.activity.msg.presenter.NewsPresenter;
import com.xscm.modulemain.databinding.FragmentNewsBinding;
import com.xscm.moduleutil.activity.news.OfficialNoticeActivity; import com.xscm.moduleutil.activity.news.OfficialNoticeActivity;
import com.xscm.moduleutil.adapter.MyFragmentPagerAdapter; import com.xscm.moduleutil.adapter.MyFragmentPagerAdapter;
import com.xscm.moduleutil.base.BaseMvpFragment; import com.xscm.moduleutil.base.BaseMvpFragment;
import com.xscm.moduleutil.base.CommonAppContext; import com.xscm.moduleutil.base.CommonAppContext;
import com.xscm.moduleutil.bean.NewsDataBean; import com.xscm.moduleutil.bean.NewsDataBean;
import com.tencent.imsdk.v2.V2TIMConversation;
import com.tencent.qcloud.tuicore.TUIConstants;
import com.tencent.qcloud.tuikit.tuichat.classicui.page.TUIC2CChatActivity;
import com.tencent.qcloud.tuikit.tuiconversation.classicui.page.TUIConversationFragment;
import com.xscm.moduleutil.bean.UserInfo; import com.xscm.moduleutil.bean.UserInfo;
import com.xscm.moduleutil.event.UnreadCountEvent; import com.xscm.moduleutil.event.UnreadCountEvent;
import com.xscm.moduleutil.utils.SpUtil; import com.xscm.moduleutil.utils.SpUtil;
@@ -66,10 +64,10 @@ public class NewsFragment extends BaseMvpFragment<NewsPresenter, FragmentNewsBin
protected void initView () { protected void initView () {
List<Fragment> fragments = new ArrayList<>(); List<Fragment> fragments = new ArrayList<>();
// 添加 tuiconversation 组件提供的经典版会话界面 // 添加 tuiconversation 组件提供的经典版会话界面
fragments.add(new TUIConversationFragment()); fragments.add(new TUIConversationFragment());
// 添加 tuicontact 组件提供的经典版联系人界面 // 添加 tuicontact 组件提供的经典版联系人界面
// fragments.add(new TUIContactFragment()); // fragments.add(new TUIContactFragment());
// FragmentAdapter fragmentAdapter = new FragmentAdapter(this); // FragmentAdapter fragmentAdapter = new FragmentAdapter(this);

4
modulenews/src/main/java/com/example/modulenews/presenter/NewsPresenter.java → modulemain/src/main/java/com/xscm/modulemain/activity/msg/presenter/NewsPresenter.java
View File

@@ -1,8 +1,8 @@
package com.example.modulenews.presenter; package com.xscm.modulemain.activity.msg.presenter;
import android.content.Context; import android.content.Context;
import com.example.modulenews.contacts.NewsContacts; import com.xscm.modulemain.activity.msg.contacts.NewsContacts;
import com.xscm.moduleutil.bean.NewsDataBean; import com.xscm.moduleutil.bean.NewsDataBean;
import com.xscm.moduleutil.bean.UserInfo; import com.xscm.moduleutil.bean.UserInfo;
import com.xscm.moduleutil.http.BaseObserver; import com.xscm.moduleutil.http.BaseObserver;

10
modulecircle/src/main/java/com/example/modulecircle/activity/DynamicDetailActivity.java → modulemain/src/main/java/com/xscm/modulemain/activity/plaza/activity/DynamicDetailActivity.java
View File

@@ -1,4 +1,4 @@
package com.example.modulecircle.activity; package com.xscm.modulemain.activity.plaza.activity;
import android.content.ClipData; import android.content.ClipData;
import android.content.ClipboardManager; import android.content.ClipboardManager;
@@ -20,11 +20,11 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.facade.annotation.Route;
import com.alibaba.android.arouter.launcher.ARouter; import com.alibaba.android.arouter.launcher.ARouter;
import com.blankj.utilcode.util.ToastUtils; import com.blankj.utilcode.util.ToastUtils;
import com.example.modulecircle.R; import com.xscm.modulemain.R;
import com.example.modulecircle.contacts.CircleContacts; import com.xscm.modulemain.databinding.ActivityDynamicDetailBinding;
import com.example.modulecircle.databinding.ActivityDynamicDetailBinding;
import com.example.modulecircle.presenter.CirclePresenter;
import com.google.android.material.bottomsheet.BottomSheetDialog; import com.google.android.material.bottomsheet.BottomSheetDialog;
import com.xscm.modulemain.activity.plaza.contacts.CircleContacts;
import com.xscm.modulemain.activity.plaza.presenter.CirclePresenter;
import com.xscm.moduleutil.activity.BaseMvpActivity; import com.xscm.moduleutil.activity.BaseMvpActivity;
import com.xscm.moduleutil.adapter.CirleListAdapter; import com.xscm.moduleutil.adapter.CirleListAdapter;
import com.xscm.moduleutil.adapter.CommentAdapter; import com.xscm.moduleutil.adapter.CommentAdapter;

13
modulecircle/src/main/java/com/example/modulecircle/activity/DynamicListActivity.java → modulemain/src/main/java/com/xscm/modulemain/activity/plaza/activity/DynamicListActivity.java
View File

@@ -1,4 +1,4 @@
package com.example.modulecircle.activity; package com.xscm.modulemain.activity.plaza.activity;
import android.content.Intent; import android.content.Intent;
import android.text.SpannableString; import android.text.SpannableString;
@@ -8,12 +8,11 @@ import android.text.style.LeadingMarginSpan;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.facade.annotation.Route;
import com.alibaba.android.arouter.launcher.ARouter; import com.xscm.modulemain.R;
import com.example.modulecircle.R; import com.xscm.modulemain.databinding.ActivityDynamicListBinding;
import com.example.modulecircle.contacts.CircleContacts; import com.xscm.modulemain.activity.user.activity.UserHomepageActivity;
import com.example.modulecircle.databinding.ActivityDynamicListBinding; import com.xscm.modulemain.activity.plaza.contacts.CircleContacts;
import com.example.modulecircle.presenter.CirclePresenter; import com.xscm.modulemain.activity.plaza.presenter.CirclePresenter;
import com.example.modulevocal.activity.UserHomepageActivity;
import com.xscm.moduleutil.activity.BaseMvpActivity; import com.xscm.moduleutil.activity.BaseMvpActivity;
import com.xscm.moduleutil.adapter.CirleListAdapter; import com.xscm.moduleutil.adapter.CirleListAdapter;
import com.xscm.moduleutil.base.RoomManager; import com.xscm.moduleutil.base.RoomManager;

15
modulecircle/src/main/java/com/example/modulecircle/activity/ReleaseActivity.java → modulemain/src/main/java/com/xscm/modulemain/activity/plaza/activity/ReleaseActivity.java
View File

@@ -1,4 +1,4 @@
package com.example.modulecircle.activity; package com.xscm.modulemain.activity.plaza.activity;
import android.Manifest; import android.Manifest;
import android.app.Activity; import android.app.Activity;
@@ -22,16 +22,15 @@ import androidx.recyclerview.widget.RecyclerView;
import com.blankj.utilcode.util.ToastUtils; import com.blankj.utilcode.util.ToastUtils;
import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseQuickAdapter;
import com.example.modulecircle.R; import com.xscm.modulemain.R;
import com.example.modulecircle.contacts.ReleaseContract; import com.xscm.modulemain.adapter.MultiSelectAdapter;
import com.example.modulecircle.databinding.ActivityReleaseBinding; import com.xscm.modulemain.databinding.ActivityReleaseBinding;
import com.example.modulecircle.adapter.MultiSelectAdapter;
import com.example.modulecircle.presenter.ReleasePresenter;
import com.example.modulevocal.activity.EditUserInfoActivity;
import com.google.android.material.bottomsheet.BottomSheetDialog; import com.google.android.material.bottomsheet.BottomSheetDialog;
import com.luck.picture.lib.basic.PictureSelector; import com.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.config.PictureConfig; import com.luck.picture.lib.config.PictureConfig;
import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.entity.LocalMedia;
import com.xscm.modulemain.activity.plaza.contacts.ReleaseContract;
import com.xscm.modulemain.activity.plaza.presenter.ReleasePresenter;
import com.xscm.moduleutil.activity.BaseMvpActivity; import com.xscm.moduleutil.activity.BaseMvpActivity;
import com.xscm.moduleutil.adapter.UserPhotoWallAdapter; import com.xscm.moduleutil.adapter.UserPhotoWallAdapter;
import com.xscm.moduleutil.bean.HeatedBean; import com.xscm.moduleutil.bean.HeatedBean;
@@ -93,7 +92,7 @@ public class ReleaseActivity extends BaseMvpActivity<ReleasePresenter, ActivityR
public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) { public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
String item = list.get(position); String item = list.get(position);
int id = view.getId(); int id = view.getId();
if (id == com.example.modulevocal.R.id.iv_close) { if (id == R.id.iv_close) {
uploadedUrls.remove(item); uploadedUrls.remove(item);
updateAdapterData(); updateAdapterData();
} else { } else {

2
modulecircle/src/main/java/com/example/modulecircle/contacts/CircleContacts.java → modulemain/src/main/java/com/xscm/modulemain/activity/plaza/contacts/CircleContacts.java
View File

@@ -1,4 +1,4 @@
package com.example.modulecircle.contacts; package com.xscm.modulemain.activity.plaza.contacts;
import android.app.Activity; import android.app.Activity;

2
modulecircle/src/main/java/com/example/modulecircle/contacts/ReleaseContract.java → modulemain/src/main/java/com/xscm/modulemain/activity/plaza/contacts/ReleaseContract.java
View File

@@ -1,4 +1,4 @@
package com.example.modulecircle.contacts; package com.xscm.modulemain.activity.plaza.contacts;
import android.app.Activity; import android.app.Activity;

25
modulecircle/src/main/java/com/example/modulecircle/fragment/CircleCategoryFragment.java → modulemain/src/main/java/com/xscm/modulemain/activity/plaza/fragment/CircleCategoryFragment.java
View File

@@ -1,23 +1,24 @@
package com.example.modulecircle.fragment; package com.xscm.modulemain.activity.plaza.fragment;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import com.alibaba.android.arouter.launcher.ARouter; import com.alibaba.android.arouter.launcher.ARouter;
import com.example.modulecircle.R; import com.xscm.modulemain.R;
import com.example.modulecircle.activity.DynamicListActivity; import com.xscm.modulemain.adapter.CirleCategoryBannerAdapter;
import com.example.modulecircle.adapter.CirleCategoryBannerAdapter; import com.xscm.modulemain.databinding.FragmentCircleCategoryBinding;
import com.scwang.smartrefresh.layout.api.RefreshLayout;
import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
import com.xscm.modulemain.activity.plaza.activity.DynamicListActivity;
import com.xscm.modulemain.activity.plaza.contacts.CircleContacts;
import com.xscm.modulemain.activity.plaza.presenter.CirclePresenter;
import com.xscm.moduleutil.adapter.CirleListAdapter; import com.xscm.moduleutil.adapter.CirleListAdapter;
import com.example.modulecircle.contacts.CircleContacts;
import com.example.modulecircle.databinding.FragmentCircleCategoryBinding;
import com.example.modulecircle.presenter.CirclePresenter;
import com.xscm.moduleutil.base.BaseMvpFragment; import com.xscm.moduleutil.base.BaseMvpFragment;
import com.xscm.moduleutil.base.RoomManager; import com.xscm.moduleutil.base.RoomManager;
import com.xscm.moduleutil.bean.BaseListData; import com.xscm.moduleutil.bean.BaseListData;
@@ -30,8 +31,6 @@ import com.xscm.moduleutil.utils.ARouteConstants;
import com.xscm.moduleutil.utils.ChatLauncher; import com.xscm.moduleutil.utils.ChatLauncher;
import com.xscm.moduleutil.widget.dialog.RewardGiftDialogFragment; import com.xscm.moduleutil.widget.dialog.RewardGiftDialogFragment;
import com.xscm.moduleutil.widget.dialog.ShareDialog; import com.xscm.moduleutil.widget.dialog.ShareDialog;
import com.scwang.smartrefresh.layout.api.RefreshLayout;
import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
import com.zhpan.bannerview.indicator.DrawableIndicator; import com.zhpan.bannerview.indicator.DrawableIndicator;
import com.zhpan.indicator.base.IIndicator; import com.zhpan.indicator.base.IIndicator;
import com.zhpan.indicator.enums.IndicatorSlideMode; import com.zhpan.indicator.enums.IndicatorSlideMode;

12
modulecircle/src/main/java/com/example/modulecircle/fragment/CircleFragment.java → modulemain/src/main/java/com/xscm/modulemain/activity/plaza/fragment/CircleFragment.java
View File

@@ -1,4 +1,4 @@
package com.example.modulecircle.fragment; package com.xscm.modulemain.activity.plaza.fragment;
import android.content.Intent; import android.content.Intent;
@@ -9,11 +9,11 @@ import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentStatePagerAdapter; import androidx.fragment.app.FragmentStatePagerAdapter;
import com.example.modulecircle.R; import com.xscm.modulemain.R;
import com.example.modulecircle.activity.ReleaseActivity; import com.xscm.modulemain.databinding.FragmentCircleBinding;
import com.example.modulecircle.contacts.CircleContacts; import com.xscm.modulemain.activity.plaza.activity.ReleaseActivity;
import com.example.modulecircle.databinding.FragmentCircleBinding; import com.xscm.modulemain.activity.plaza.contacts.CircleContacts;
import com.example.modulecircle.presenter.CirclePresenter; import com.xscm.modulemain.activity.plaza.presenter.CirclePresenter;
import com.xscm.moduleutil.base.BaseMvpFragment; import com.xscm.moduleutil.base.BaseMvpFragment;
import com.xscm.moduleutil.bean.CircleListBean; import com.xscm.moduleutil.bean.CircleListBean;
import com.xscm.moduleutil.bean.CommentBean; import com.xscm.moduleutil.bean.CommentBean;

20
modulecircle/src/main/java/com/example/modulecircle/fragment/ExpandColumnFragment.java → modulemain/src/main/java/com/xscm/modulemain/activity/plaza/fragment/ExpandColumnFragment.java
View File

@@ -1,17 +1,19 @@
package com.example.modulecircle.fragment; package com.xscm.modulemain.activity.plaza.fragment;
import android.view.View;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import android.view.View;
import com.alibaba.android.arouter.launcher.ARouter; import com.alibaba.android.arouter.launcher.ARouter;
import com.blankj.utilcode.util.LogUtils; import com.blankj.utilcode.util.LogUtils;
import com.example.modulecircle.R; import com.xscm.modulemain.R;
import com.example.modulecircle.adapter.ExpandColumnAdapter; import com.xscm.modulemain.adapter.ExpandColumnAdapter;
import com.example.modulecircle.contacts.CircleContacts; import com.xscm.modulemain.databinding.FragmentExpandColumnBinding;
import com.example.modulecircle.databinding.FragmentExpandColumnBinding; import com.scwang.smartrefresh.layout.api.RefreshLayout;
import com.example.modulecircle.presenter.CirclePresenter; import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
import com.xscm.modulemain.activity.plaza.contacts.CircleContacts;
import com.xscm.modulemain.activity.plaza.presenter.CirclePresenter;
import com.xscm.moduleutil.base.BaseMvpFragment; import com.xscm.moduleutil.base.BaseMvpFragment;
import com.xscm.moduleutil.base.RoomManager; import com.xscm.moduleutil.base.RoomManager;
import com.xscm.moduleutil.bean.CircleListBean; import com.xscm.moduleutil.bean.CircleListBean;
@@ -20,8 +22,6 @@ import com.xscm.moduleutil.bean.ExpandColumnBean;
import com.xscm.moduleutil.bean.HeatedBean; import com.xscm.moduleutil.bean.HeatedBean;
import com.xscm.moduleutil.utils.ARouteConstants; import com.xscm.moduleutil.utils.ARouteConstants;
import com.xscm.moduleutil.utils.ChatLauncher; import com.xscm.moduleutil.utils.ChatLauncher;
import com.scwang.smartrefresh.layout.api.RefreshLayout;
import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
import org.angmarch.views.NiceSpinner; import org.angmarch.views.NiceSpinner;
import org.angmarch.views.OnSpinnerItemSelectedListener; import org.angmarch.views.OnSpinnerItemSelectedListener;

4
modulecircle/src/main/java/com/example/modulecircle/presenter/CirclePresenter.java → modulemain/src/main/java/com/xscm/modulemain/activity/plaza/presenter/CirclePresenter.java
View File

@@ -1,8 +1,8 @@
package com.example.modulecircle.presenter; package com.xscm.modulemain.activity.plaza.presenter;
import android.content.Context; import android.content.Context;
import com.example.modulecircle.contacts.CircleContacts; import com.xscm.modulemain.activity.plaza.contacts.CircleContacts;
import com.xscm.moduleutil.bean.CircleListBean; import com.xscm.moduleutil.bean.CircleListBean;
import com.xscm.moduleutil.bean.CommentBean; import com.xscm.moduleutil.bean.CommentBean;
import com.xscm.moduleutil.bean.ExpandColumnBean; import com.xscm.moduleutil.bean.ExpandColumnBean;

4
modulecircle/src/main/java/com/example/modulecircle/presenter/ReleasePresenter.java → modulemain/src/main/java/com/xscm/modulemain/activity/plaza/presenter/ReleasePresenter.java
View File

@@ -1,9 +1,9 @@
package com.example.modulecircle.presenter; package com.xscm.modulemain.activity.plaza.presenter;
import android.content.Context; import android.content.Context;
import com.example.modulecircle.contacts.ReleaseContract;
import com.hjq.toast.ToastUtils; import com.hjq.toast.ToastUtils;
import com.xscm.modulemain.activity.plaza.contacts.ReleaseContract;
import com.xscm.moduleutil.base.CommonAppContext; import com.xscm.moduleutil.base.CommonAppContext;
import com.xscm.moduleutil.bean.HeatedBean; import com.xscm.moduleutil.bean.HeatedBean;
import com.xscm.moduleutil.http.BaseObserver; import com.xscm.moduleutil.http.BaseObserver;

19
modulevoice/src/main/java/com/example/modulevoice/activity/PopularRoomActivity.java → modulemain/src/main/java/com/xscm/modulemain/activity/room/activity/PopularRoomActivity.java
View File

@@ -1,20 +1,23 @@
package com.example.modulevoice.activity; package com.xscm.modulemain.activity.room.activity;
import android.view.View; import android.view.View;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.GridLayoutManager;
import com.example.modulevoice.R;
import com.example.modulevoice.adapter.PopularRoomAdapter;
import com.example.modulevoice.contacts.VoiceCategoryContacts;
import com.example.modulevoice.databinding.ActivityPopularRoomBinding;
import com.example.modulevoice.presenter.VoiceCategoryPresenter;
import com.scwang.smartrefresh.layout.api.RefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout;
import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener; import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
import com.xscm.modulemain.R;
import com.xscm.modulemain.activity.room.contacts.VoiceCategoryContacts;
import com.xscm.modulemain.activity.room.presenter.VoiceCategoryPresenter;
import com.xscm.modulemain.adapter.PopularRoomAdapter;
import com.xscm.modulemain.databinding.ActivityPopularRoomBinding;
import com.xscm.moduleutil.activity.BaseMvpActivity; import com.xscm.moduleutil.activity.BaseMvpActivity;
import com.xscm.moduleutil.base.CommonAppContext; import com.xscm.moduleutil.base.CommonAppContext;
import com.xscm.moduleutil.base.RoomManager; import com.xscm.moduleutil.base.RoomManager;
import com.xscm.moduleutil.bean.*; import com.xscm.moduleutil.bean.BannerModel;
import com.xscm.moduleutil.bean.room.RoomOnline; import com.xscm.moduleutil.bean.RoomTypeModel;
import com.xscm.moduleutil.bean.TopRoom;
import com.xscm.moduleutil.listener.MessageListenerSingleton; import com.xscm.moduleutil.listener.MessageListenerSingleton;
import com.xscm.moduleutil.utils.ClickUtils; import com.xscm.moduleutil.utils.ClickUtils;

12
modulevoice/src/main/java/com/example/modulevoice/activity/RankingListActivity.java → modulemain/src/main/java/com/xscm/modulemain/activity/room/activity/RankingListActivity.java
View File

@@ -1,19 +1,15 @@
package com.example.modulevoice.activity; package com.xscm.modulemain.activity.room.activity;
import android.annotation.SuppressLint;
import android.graphics.Color; import android.graphics.Color;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.TypedValue; import android.util.TypedValue;
import android.view.Gravity; import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.TextView; import android.widget.TextView;
import com.example.modulevoice.R;
import com.example.modulevoice.activity.ui.main.SectionsPagerAdapter;
import com.example.modulevoice.databinding.ActivityRankingListBinding;
import com.google.android.material.tabs.TabLayout; import com.google.android.material.tabs.TabLayout;
import com.google.android.material.tabs.TabLayoutMediator; import com.xscm.modulemain.R;
import com.xscm.modulemain.adapter.SectionsPagerAdapter;
import com.xscm.modulemain.databinding.ActivityRankingListBinding;
import com.xscm.moduleutil.activity.BaseAppCompatActivity; import com.xscm.moduleutil.activity.BaseAppCompatActivity;
/** /**
*@author lxj *@author lxj

18
moduleroom/src/main/java/com/example/moduleroom/activity/RedResultActivity.java → modulemain/src/main/java/com/xscm/modulemain/activity/room/activity/RedResultActivity.java
View File

@@ -1,22 +1,22 @@
package com.example.moduleroom.activity; package com.xscm.modulemain.activity.room.activity;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import com.alibaba.android.arouter.facade.annotation.Autowired;
import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.facade.annotation.Route;
import com.example.moduleroom.R;
import com.example.moduleroom.adapter.RedAdapter;
import com.example.moduleroom.contacts.RedEnvelopesContacts;
import com.example.moduleroom.databinding.FragmentRedBinding;
import com.example.moduleroom.fragment.RedViewModel;
import com.example.moduleroom.presenter.RedEnvelopesPresenter;
import com.scwang.smartrefresh.layout.api.RefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout;
import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener; import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
import com.xscm.modulemain.R;
import com.xscm.modulemain.activity.room.contacts.RedEnvelopesContacts;
import com.xscm.modulemain.activity.room.fragment.RedViewModel;
import com.xscm.modulemain.activity.room.presenter.RedEnvelopesPresenter;
import com.xscm.modulemain.adapter.RedAdapter;
import com.xscm.modulemain.databinding.FragmentRedBinding;
import com.xscm.moduleutil.activity.BaseMvpActivity; import com.xscm.moduleutil.activity.BaseMvpActivity;
import com.xscm.moduleutil.base.BaseMvpFragment;
import com.xscm.moduleutil.bean.RedpacketDetail; import com.xscm.moduleutil.bean.RedpacketDetail;
import com.xscm.moduleutil.utils.ARouteConstants; import com.xscm.moduleutil.utils.ARouteConstants;
import com.xscm.moduleutil.utils.ImageUtils; import com.xscm.moduleutil.utils.ImageUtils;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
/** /**

45
moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.kt → modulemain/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt
View File

@@ -1,4 +1,4 @@
package com.example.moduleroom.activity package com.xscm.modulemain.activity.room.activity
import android.Manifest import android.Manifest
import android.annotation.SuppressLint import android.annotation.SuppressLint
@@ -37,16 +37,7 @@ import com.blankj.utilcode.util.LogUtils
import com.blankj.utilcode.util.ThreadUtils import com.blankj.utilcode.util.ThreadUtils
import com.blankj.utilcode.util.TimeUtils import com.blankj.utilcode.util.TimeUtils
import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseQuickAdapter
import com.example.moduleroom.R import com.xscm.modulemain.dialog.*
import com.example.moduleroom.contacts.RoomContacts
import com.example.moduleroom.databinding.ActivityRoomBinding
import com.example.moduleroom.dialog.*
import com.example.moduleroom.dialog.ExitRoomBottomSheet.OnOptionSelectedListener
import com.example.moduleroom.fragment.*
import com.example.moduleroom.presenter.RoomPresenter
import com.example.moduleroom.service.ForegroundService
import com.example.moduleroom.service.RoomPlayService
import com.google.common.collect.Sets.SetView
import com.hjq.toast.ToastUtils import com.hjq.toast.ToastUtils
import com.liulishuo.okdownload.OkDownloadProvider import com.liulishuo.okdownload.OkDownloadProvider
import com.orhanobut.logger.Logger import com.orhanobut.logger.Logger
@@ -56,6 +47,32 @@ import com.tencent.imsdk.v2.V2TIMManager
import com.tencent.imsdk.v2.V2TIMSDKListener import com.tencent.imsdk.v2.V2TIMSDKListener
import com.tencent.imsdk.v2.V2TIMUserFullInfo import com.tencent.imsdk.v2.V2TIMUserFullInfo
import com.tencent.imsdk.v2.V2TIMValueCallback import com.tencent.imsdk.v2.V2TIMValueCallback
import com.xscm.modulemain.R
import com.xscm.modulemain.activity.room.contacts.RoomContacts
import com.xscm.modulemain.activity.room.fragment.PublicScreenEaseChatFragment
import com.xscm.modulemain.activity.room.fragment.RedEnvelopesFragment
import com.xscm.modulemain.activity.room.fragment.RoomCabinFragment
import com.xscm.modulemain.activity.room.fragment.RoomChartsFragment
import com.xscm.modulemain.activity.room.fragment.RoomFragment
import com.xscm.modulemain.activity.room.fragment.RoomNoticeDialogFragment
import com.xscm.modulemain.activity.room.fragment.RoomPasswordSetDialogFragment
import com.xscm.modulemain.activity.room.presenter.RoomPresenter
import com.xscm.modulemain.databinding.ActivityRoomBinding
import com.xscm.modulemain.dialog.ExitRoomBottomSheet
import com.xscm.modulemain.dialog.FriendsDialogFragment
import com.xscm.modulemain.dialog.HourlyChartDialog
import com.xscm.modulemain.dialog.PublishCommentDialogFragment
import com.xscm.modulemain.dialog.RedBagSendDialog
import com.xscm.modulemain.dialog.RedListDialog
import com.xscm.modulemain.dialog.RequestDialogFragment
import com.xscm.modulemain.dialog.RoomGiftDialogFragment
import com.xscm.modulemain.dialog.RoomMessageDialogFragment
import com.xscm.modulemain.dialog.RoomOnlineDialogFragment
import com.xscm.modulemain.dialog.RoomPkDialogFragment
import com.xscm.modulemain.dialog.RoomSettingFragment
import com.xscm.modulemain.dialog.SoundEffectsDialogFragment
import com.xscm.modulemain.service.ForegroundService
import com.xscm.modulemain.service.RoomPlayService
import com.xscm.moduleutil.activity.BaseMvpActivity import com.xscm.moduleutil.activity.BaseMvpActivity
import com.xscm.moduleutil.adapter.CommonPageAdapter import com.xscm.moduleutil.adapter.CommonPageAdapter
import com.xscm.moduleutil.adapter.LikeUserAdapter import com.xscm.moduleutil.adapter.LikeUserAdapter
@@ -361,7 +378,8 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
private fun showExitRoomDialog() { private fun showExitRoomDialog() {
if (mRoomInfoResp?.room_info?.type_id.equals("6")) { if (mRoomInfoResp?.room_info?.type_id.equals("6")) {
val bottomSheet = ExitRoomBottomSheet.newInstance(false, true, true); val bottomSheet = ExitRoomBottomSheet.newInstance(false, true, true);
bottomSheet.setOnOptionSelectedListener(object : OnOptionSelectedListener { bottomSheet.setOnOptionSelectedListener(object :
ExitRoomBottomSheet.OnOptionSelectedListener {
override fun onMinimize() { override fun onMinimize() {
} }
@@ -394,7 +412,8 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
} }
val bottomSheet = ExitRoomBottomSheet.newInstance() val bottomSheet = ExitRoomBottomSheet.newInstance()
bottomSheet.setOnOptionSelectedListener(object : OnOptionSelectedListener { bottomSheet.setOnOptionSelectedListener(object :
ExitRoomBottomSheet.OnOptionSelectedListener {
override fun onMinimize() { override fun onMinimize() {
// 处理最小化逻辑，比如不销毁 Activity，仅移至后台 // 处理最小化逻辑，比如不销毁 Activity，仅移至后台
minimizeToBackground() minimizeToBackground()

18
modulevoice/src/main/java/com/example/modulevoice/activity/SearchActivity.java → modulemain/src/main/java/com/xscm/modulemain/activity/room/activity/SearchActivity.java
View File

@@ -1,4 +1,4 @@
package com.example.modulevoice.activity; package com.xscm.modulemain.activity.room.activity;
import android.text.Editable; import android.text.Editable;
import android.text.TextWatcher; import android.text.TextWatcher;
@@ -10,14 +10,14 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import com.alibaba.android.arouter.launcher.ARouter; import com.alibaba.android.arouter.launcher.ARouter;
import com.blankj.utilcode.util.StringUtils; import com.blankj.utilcode.util.StringUtils;
import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseQuickAdapter;
import com.example.modulevoice.R; import com.xscm.modulemain.R;
import com.example.modulevoice.adapter.SearchHistoryAdapter; import com.xscm.modulemain.adapter.SearchHistoryAdapter;
import com.example.modulevoice.adapter.SearchRecordAdapter; import com.xscm.modulemain.adapter.SearchRecordAdapter;
import com.example.modulevoice.adapter.SearchRoomResultAdapter; import com.xscm.modulemain.adapter.SearchRoomResultAdapter;
import com.example.modulevoice.adapter.SearchUserResultAdapter; import com.xscm.modulemain.adapter.SearchUserResultAdapter;
import com.example.modulevoice.contacts.SearchContacts; import com.xscm.modulemain.activity.room.contacts.SearchContacts;
import com.example.modulevoice.databinding.ActivitySearchBinding; import com.xscm.modulemain.databinding.ActivitySearchBinding;
import com.example.modulevoice.presenter.SearchPresenter; import com.xscm.modulemain.activity.room.presenter.SearchPresenter;
import com.google.android.flexbox.FlexDirection; import com.google.android.flexbox.FlexDirection;
import com.google.android.flexbox.FlexWrap; import com.google.android.flexbox.FlexWrap;
import com.google.android.flexbox.FlexboxLayoutManager; import com.google.android.flexbox.FlexboxLayoutManager;

2
moduleroom/src/main/java/com/example/moduleroom/contacts/BidListContacts.java → modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/BidListContacts.java
View File

@@ -1,4 +1,4 @@
package com.example.moduleroom.contacts; package com.xscm.modulemain.activity.room.contacts;
import android.app.Activity; import android.app.Activity;

2
moduleroom/src/main/java/com/example/moduleroom/contacts/CardRelationshipContacts.java → modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/CardRelationshipContacts.java
View File

@@ -1,4 +1,4 @@
package com.example.moduleroom.contacts; package com.xscm.modulemain.activity.room.contacts;
import android.app.Activity; import android.app.Activity;

3
moduleroom/src/main/java/com/example/moduleroom/contacts/DataListContacts.java → modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/DataListContacts.java
View File

@@ -1,8 +1,7 @@
package com.example.moduleroom.contacts; package com.xscm.modulemain.activity.room.contacts;
import android.app.Activity; import android.app.Activity;
import com.xscm.moduleutil.activity.IPresenter; import com.xscm.moduleutil.activity.IPresenter;
import com.xscm.moduleutil.activity.IView; import com.xscm.moduleutil.activity.IView;
import com.xscm.moduleutil.bean.CharmRankingResp; import com.xscm.moduleutil.bean.CharmRankingResp;

2
moduleroom/src/main/java/com/example/moduleroom/contacts/FriendshipRoomContacts.java → modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/FriendshipRoomContacts.java
View File

@@ -1,4 +1,4 @@
package com.example.moduleroom.contacts; package com.xscm.modulemain.activity.room.contacts;
import android.app.Activity; import android.app.Activity;

3
modulevoice/src/main/java/com/example/modulevoice/contacts/HotListContacts.java → modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/HotListContacts.java
View File

@@ -1,8 +1,7 @@
package com.example.modulevoice.contacts; package com.xscm.modulemain.activity.room.contacts;
import android.app.Activity; import android.app.Activity;
import com.xscm.moduleutil.activity.IPresenter; import com.xscm.moduleutil.activity.IPresenter;
import com.xscm.moduleutil.activity.IView; import com.xscm.moduleutil.activity.IView;
import com.xscm.moduleutil.bean.HomeBean; import com.xscm.moduleutil.bean.HomeBean;

2
moduleroom/src/main/java/com/example/moduleroom/contacts/HourlyChartContacts.java → modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/HourlyChartContacts.java
View File

@@ -1,4 +1,4 @@
package com.example.moduleroom.contacts; package com.xscm.modulemain.activity.room.contacts;
import android.app.Activity; import android.app.Activity;

2
moduleroom/src/main/java/com/example/moduleroom/contacts/PkTimeContract.java → modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/PkTimeContract.java
View File

@@ -1,4 +1,4 @@
package com.example.moduleroom.contacts; package com.xscm.modulemain.activity.room.contacts;
import android.app.Activity; import android.app.Activity;

2
modulevoice/src/main/java/com/example/modulevoice/contacts/PlaceholderContacts.java → modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/PlaceholderContacts.java
View File

@@ -1,4 +1,4 @@
package com.example.modulevoice.contacts; package com.xscm.modulemain.activity.room.contacts;
import android.app.Activity; import android.app.Activity;

2
moduleroom/src/main/java/com/example/moduleroom/contacts/PublicScreenEaseChatContacts.java → modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/PublicScreenEaseChatContacts.java
View File

@@ -1,4 +1,4 @@
package com.example.moduleroom.contacts; package com.xscm.modulemain.activity.room.contacts;
import android.app.Activity; import android.app.Activity;

2
moduleroom/src/main/java/com/example/moduleroom/contacts/PublishCommentContacts.java → modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/PublishCommentContacts.java
View File

@@ -1,4 +1,4 @@
package com.example.moduleroom.contacts; package com.xscm.modulemain.activity.room.contacts;
import android.app.Activity; import android.app.Activity;

3
moduleroom/src/main/java/com/example/moduleroom/contacts/RedEnvelopesContacts.java → modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RedEnvelopesContacts.java
View File

@@ -1,6 +1,7 @@
package com.example.moduleroom.contacts; package com.xscm.modulemain.activity.room.contacts;
import android.app.Activity; import android.app.Activity;
import com.xscm.moduleutil.activity.IPresenter; import com.xscm.moduleutil.activity.IPresenter;
import com.xscm.moduleutil.activity.IView; import com.xscm.moduleutil.activity.IView;
import com.xscm.moduleutil.bean.RedpacketDetail; import com.xscm.moduleutil.bean.RedpacketDetail;

2
moduleroom/src/main/java/com/example/moduleroom/contacts/RequestContacts.java → modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RequestContacts.java
View File

@@ -1,4 +1,4 @@
package com.example.moduleroom.contacts; package com.xscm.modulemain.activity.room.contacts;
import android.app.Activity; import android.app.Activity;

2
moduleroom/src/main/java/com/example/moduleroom/contacts/RoomAuctionContacts.java → modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomAuctionContacts.java
View File

@@ -1,4 +1,4 @@
package com.example.moduleroom.contacts; package com.xscm.modulemain.activity.room.contacts;
import android.app.Activity; import android.app.Activity;

2
moduleroom/src/main/java/com/example/moduleroom/contacts/RoomBackgroundContacts.java → modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomBackgroundContacts.java
View File

@@ -1,4 +1,4 @@
package com.example.moduleroom.contacts; package com.xscm.modulemain.activity.room.contacts;
import android.app.Activity; import android.app.Activity;

2
moduleroom/src/main/java/com/example/moduleroom/contacts/RoomCabinContacts.java → modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomCabinContacts.java
View File

@@ -1,4 +1,4 @@
package com.example.moduleroom.contacts; package com.xscm.modulemain.activity.room.contacts;
import android.app.Activity; import android.app.Activity;

2
moduleroom/src/main/java/com/example/moduleroom/contacts/RoomCharmDialogContacts.java → modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomCharmDialogContacts.java
View File

@@ -1,4 +1,4 @@
package com.example.moduleroom.contacts; package com.xscm.modulemain.activity.room.contacts;
import android.app.Activity; import android.app.Activity;

2
moduleroom/src/main/java/com/example/moduleroom/contacts/RoomChartsContacts.java → modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomChartsContacts.java
View File

@@ -1,4 +1,4 @@
package com.example.moduleroom.contacts; package com.xscm.modulemain.activity.room.contacts;
import android.app.Activity; import android.app.Activity;

6
moduleroom/src/main/java/com/example/moduleroom/contacts/RoomCloseContacts.java → modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomCloseContacts.java
View File

@@ -1,14 +1,10 @@
package com.example.moduleroom.contacts; package com.xscm.modulemain.activity.room.contacts;
import android.app.Activity; import android.app.Activity;
import com.xscm.moduleutil.activity.IPresenter; import com.xscm.moduleutil.activity.IPresenter;
import com.xscm.moduleutil.activity.IView; import com.xscm.moduleutil.activity.IView;
import com.xscm.moduleutil.bean.GiftUserWallBean;
import com.xscm.moduleutil.bean.RoomRelationBean; import com.xscm.moduleutil.bean.RoomRelationBean;
import com.xscm.moduleutil.bean.room.CloseBean;
import com.xscm.moduleutil.bean.room.RoomConcernDean;
import java.util.List; import java.util.List;

2
moduleroom/src/main/java/com/example/moduleroom/contacts/RoomContacts.java → modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomContacts.java
View File

@@ -1,4 +1,4 @@
package com.example.moduleroom.contacts; package com.xscm.modulemain.activity.room.contacts;
import android.app.Activity; import android.app.Activity;

3
moduleroom/src/main/java/com/example/moduleroom/contacts/RoomHostContacts.java → modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomHostContacts.java
View File

@@ -1,8 +1,7 @@
package com.example.moduleroom.contacts; package com.xscm.modulemain.activity.room.contacts;
import android.app.Activity; import android.app.Activity;
import com.xscm.moduleutil.activity.IPresenter; import com.xscm.moduleutil.activity.IPresenter;
import com.xscm.moduleutil.activity.IView; import com.xscm.moduleutil.activity.IView;
import com.xscm.moduleutil.bean.HostBean; import com.xscm.moduleutil.bean.HostBean;

2
moduleroom/src/main/java/com/example/moduleroom/contacts/RoomPasswordSetContacts.java → modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomPasswordSetContacts.java
View File

@@ -1,4 +1,4 @@
package com.example.moduleroom.contacts; package com.xscm.modulemain.activity.room.contacts;
import android.app.Activity; import android.app.Activity;

2
moduleroom/src/main/java/com/example/moduleroom/contacts/RoomPkContacts.java → modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomPkContacts.java
View File

@@ -1,4 +1,4 @@
package com.example.moduleroom.contacts; package com.xscm.modulemain.activity.room.contacts;
import android.app.Activity; import android.app.Activity;

2
moduleroom/src/main/java/com/example/moduleroom/contacts/RoomSettingContacts.java → modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomSettingContacts.java
View File

@@ -1,4 +1,4 @@
package com.example.moduleroom.contacts; package com.xscm.modulemain.activity.room.contacts;
import android.app.Activity; import android.app.Activity;

2
moduleroom/src/main/java/com/example/moduleroom/contacts/RoomUserContacts.java → modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomUserContacts.java
View File

@@ -1,4 +1,4 @@
package com.example.moduleroom.contacts; package com.xscm.modulemain.activity.room.contacts;
import android.app.Activity; import android.app.Activity;

4
modulevoice/src/main/java/com/example/modulevoice/contacts/SearchContacts.java → modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/SearchContacts.java
View File

@@ -1,12 +1,10 @@
package com.example.modulevoice.contacts; package com.xscm.modulemain.activity.room.contacts;
import android.app.Activity; import android.app.Activity;
import com.xscm.moduleutil.activity.IPresenter; import com.xscm.moduleutil.activity.IPresenter;
import com.xscm.moduleutil.activity.IView; import com.xscm.moduleutil.activity.IView;
import com.xscm.moduleutil.bean.RecordSection; import com.xscm.moduleutil.bean.RecordSection;
import com.xscm.moduleutil.bean.RoomSearchResp;
import com.xscm.moduleutil.bean.SearchAll; import com.xscm.moduleutil.bean.SearchAll;
import java.util.List; import java.util.List;

2
moduleroom/src/main/java/com/example/moduleroom/contacts/SingSongContacts.java → modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/SingSongContacts.java
View File

@@ -1,4 +1,4 @@
package com.example.moduleroom.contacts; package com.xscm.modulemain.activity.room.contacts;
import android.app.Activity; import android.app.Activity;

3
moduleroom/src/main/java/com/example/moduleroom/contacts/UserGiftWallConacts.java → modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/UserGiftWallConacts.java
View File

@@ -1,8 +1,7 @@
package com.example.moduleroom.contacts; package com.xscm.modulemain.activity.room.contacts;
import android.app.Activity; import android.app.Activity;
import com.xscm.moduleutil.activity.IPresenter; import com.xscm.moduleutil.activity.IPresenter;
import com.xscm.moduleutil.activity.IView; import com.xscm.moduleutil.activity.IView;
import com.xscm.moduleutil.bean.GiftUserWallBean; import com.xscm.moduleutil.bean.GiftUserWallBean;

3
modulevoice/src/main/java/com/example/modulevoice/contacts/VoiceCategoryContacts.java → modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/VoiceCategoryContacts.java
View File

@@ -1,8 +1,7 @@
package com.example.modulevoice.contacts; package com.xscm.modulemain.activity.room.contacts;
import android.app.Activity; import android.app.Activity;
import com.xscm.moduleutil.activity.IPresenter; import com.xscm.moduleutil.activity.IPresenter;
import com.xscm.moduleutil.activity.IView; import com.xscm.moduleutil.activity.IView;
import com.xscm.moduleutil.bean.BannerModel; import com.xscm.moduleutil.bean.BannerModel;

2
modulevoice/src/main/java/com/example/modulevoice/contacts/VoiceContacts.java → modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/VoiceContacts.java
View File

@@ -1,4 +1,4 @@
package com.example.modulevoice.contacts; package com.xscm.modulemain.activity.room.contacts;
import android.app.Activity; import android.app.Activity;

2
moduleroom/src/main/java/com/example/moduleroom/contacts/WheatContacts.java → modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/WheatContacts.java
View File

@@ -1,4 +1,4 @@
package com.example.moduleroom.contacts; package com.xscm.modulemain.activity.room.contacts;
import android.app.Activity; import android.app.Activity;

30
moduleroom/src/main/java/com/example/moduleroom/fragment/FriendshipRoomFragment.java → modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/FriendshipRoomFragment.java
View File

@@ -1,4 +1,4 @@
package com.example.moduleroom.fragment; package com.xscm.modulemain.activity.room.fragment;
import static android.view.View.GONE; import static android.view.View.GONE;
import static android.view.View.VISIBLE; import static android.view.View.VISIBLE;
@@ -6,10 +6,6 @@ import static android.view.View.VISIBLE;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.graphics.Color; import android.graphics.Color;
import android.os.Bundle; import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.os.CountDownTimer; import android.os.CountDownTimer;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import android.view.Gravity; import android.view.Gravity;
@@ -20,20 +16,22 @@ import android.widget.PopupWindow;
import android.widget.Switch; import android.widget.Switch;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.blankj.utilcode.util.LogUtils; import com.blankj.utilcode.util.LogUtils;
import com.blankj.utilcode.util.ToastUtils; import com.blankj.utilcode.util.ToastUtils;
import com.example.moduleroom.R;
import com.example.moduleroom.activity.RoomActivity;
import com.example.moduleroom.contacts.FriendshipRoomContacts;
import com.example.moduleroom.databinding.FragmentFriendshipRoomBinding;
import com.example.moduleroom.dialog.RoomCharmDialog;
import com.example.moduleroom.dialog.RoomConcernDialogFragment;
import com.example.moduleroom.dialog.RoomGiftDialogFragment;
import com.example.moduleroom.dialog.RoomOnlineDialogFragment;
import com.example.moduleroom.dialog.RoomUserInfoFragment;
import com.example.moduleroom.presenter.FriendshipRoomPresenter;
import com.example.moduleroom.presenter.SingSongPresenter;
import com.orhanobut.logger.Logger; import com.orhanobut.logger.Logger;
import com.xscm.modulemain.R;
import com.xscm.modulemain.activity.room.activity.RoomActivity;
import com.xscm.modulemain.activity.room.contacts.FriendshipRoomContacts;
import com.xscm.modulemain.activity.room.presenter.FriendshipRoomPresenter;
import com.xscm.modulemain.databinding.FragmentFriendshipRoomBinding;
import com.xscm.modulemain.dialog.RoomCharmDialog;
import com.xscm.modulemain.dialog.RoomConcernDialogFragment;
import com.xscm.modulemain.dialog.RoomGiftDialogFragment;
import com.xscm.modulemain.dialog.RoomOnlineDialogFragment;
import com.xscm.modulemain.dialog.RoomUserInfoFragment;
import com.xscm.moduleutil.base.BaseRoomFragment; import com.xscm.moduleutil.base.BaseRoomFragment;
import com.xscm.moduleutil.base.CommonAppContext; import com.xscm.moduleutil.base.CommonAppContext;
import com.xscm.moduleutil.bean.RoomMessageEvent; import com.xscm.moduleutil.bean.RoomMessageEvent;

20
modulevoice/src/main/java/com/example/modulevoice/fragment/HotListFragment.java → modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/HotListFragment.java
View File

@@ -1,4 +1,4 @@
package com.example.modulevoice.fragment; package com.xscm.modulemain.activity.room.fragment;
import android.os.Bundle; import android.os.Bundle;
import android.view.View; import android.view.View;
@@ -7,13 +7,13 @@ import androidx.annotation.NonNull;
import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.GridLayoutManager;
import com.alibaba.android.arouter.launcher.ARouter; import com.alibaba.android.arouter.launcher.ARouter;
import com.chad.library.adapter.base.BaseQuickAdapter; import com.xscm.modulemain.R;
import com.example.moduleroom.activity.RoomActivity; import com.xscm.modulemain.adapter.HotAdapter;
import com.example.modulevoice.R; import com.xscm.modulemain.activity.room.contacts.HotListContacts;
import com.example.modulevoice.adapter.HotAdapter; import com.xscm.modulemain.databinding.FragmentHotListBinding;
import com.example.modulevoice.contacts.HotListContacts; import com.xscm.modulemain.activity.room.presenter.HotListPresenter;
import com.example.modulevoice.databinding.FragmentHotListBinding; import com.scwang.smartrefresh.layout.api.RefreshLayout;
import com.example.modulevoice.presenter.HotListPresenter; import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
import com.xscm.moduleutil.base.BaseMvpFragment; import com.xscm.moduleutil.base.BaseMvpFragment;
import com.xscm.moduleutil.base.CommonAppContext; import com.xscm.moduleutil.base.CommonAppContext;
import com.xscm.moduleutil.base.RoomManager; import com.xscm.moduleutil.base.RoomManager;
@@ -22,8 +22,6 @@ import com.xscm.moduleutil.bean.TopRoom;
import com.xscm.moduleutil.bean.room.RoomInfoResp; import com.xscm.moduleutil.bean.room.RoomInfoResp;
import com.xscm.moduleutil.listener.MessageListenerSingleton; import com.xscm.moduleutil.listener.MessageListenerSingleton;
import com.xscm.moduleutil.utils.ARouteConstants; import com.xscm.moduleutil.utils.ARouteConstants;
import com.scwang.smartrefresh.layout.api.RefreshLayout;
import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
import com.xscm.moduleutil.utils.ClickUtils; import com.xscm.moduleutil.utils.ClickUtils;
import java.util.ArrayList; import java.util.ArrayList;
@@ -40,7 +38,7 @@ public class HotListFragment extends BaseMvpFragment<HotListPresenter, FragmentH
public HotListFragment(VoiceCategoryFragment voiceCategoryFragment){ public HotListFragment(VoiceCategoryFragment voiceCategoryFragment){
this.voiceCategoryFragment = voiceCategoryFragment; this.voiceCategoryFragment = voiceCategoryFragment;
} }
public static HotListFragment newInstance(VoiceCategoryFragment voiceCategoryFragment,String type, String tag) { public static HotListFragment newInstance(VoiceCategoryFragment voiceCategoryFragment, String type, String tag) {
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putString("label_id", type); args.putString("label_id", type);
args.putString("tag", tag); args.putString("tag", tag);

14
moduleroom/src/main/java/com/example/moduleroom/fragment/MusicSongListFragment.java → modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/MusicSongListFragment.java
View File

@@ -1,4 +1,4 @@
package com.example.moduleroom.fragment; package com.xscm.modulemain.activity.room.fragment;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
@@ -15,10 +15,12 @@ import com.blankj.utilcode.util.LogUtils;
import com.blankj.utilcode.util.ToastUtils; import com.blankj.utilcode.util.ToastUtils;
import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder; import com.chad.library.adapter.base.BaseViewHolder;
import com.example.moduleroom.R; import com.xscm.modulemain.R;
import com.example.moduleroom.contacts.RequestContacts; import com.xscm.modulemain.databinding.FragmentMuiscSongBinding;
import com.example.moduleroom.databinding.FragmentMuiscSongBinding; import com.scwang.smartrefresh.layout.api.RefreshLayout;
import com.example.moduleroom.presenter.RequestPresenter; import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
import com.xscm.modulemain.activity.room.contacts.RequestContacts;
import com.xscm.modulemain.activity.room.presenter.RequestPresenter;
import com.xscm.moduleutil.base.BaseMvpFragment; import com.xscm.moduleutil.base.BaseMvpFragment;
import com.xscm.moduleutil.bean.MusicSongBean; import com.xscm.moduleutil.bean.MusicSongBean;
import com.xscm.moduleutil.bean.SongMusicBean; import com.xscm.moduleutil.bean.SongMusicBean;
@@ -29,8 +31,6 @@ import com.xscm.moduleutil.utils.ColorManager;
import com.xscm.moduleutil.utils.ImageUtils; import com.xscm.moduleutil.utils.ImageUtils;
import com.xscm.moduleutil.utils.SpUtil; import com.xscm.moduleutil.utils.SpUtil;
import com.xscm.moduleutil.utils.TimeUtils; import com.xscm.moduleutil.utils.TimeUtils;
import com.scwang.smartrefresh.layout.api.RefreshLayout;
import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;

41
moduleroom/src/main/java/com/example/moduleroom/fragment/PublicScreenEaseChatFragment.java → modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/PublicScreenEaseChatFragment.java
View File

@@ -1,4 +1,4 @@
package com.example.moduleroom.fragment; package com.xscm.modulemain.activity.room.fragment;
import android.content.Context; import android.content.Context;
import android.graphics.Color; import android.graphics.Color;
@@ -16,25 +16,32 @@ import androidx.recyclerview.widget.RecyclerView;
import com.blankj.utilcode.util.GsonUtils; import com.blankj.utilcode.util.GsonUtils;
import com.blankj.utilcode.util.LogUtils; import com.blankj.utilcode.util.LogUtils;
import com.example.moduleroom.R;
import com.example.moduleroom.activity.RoomActivity;
import com.example.moduleroom.adapter.EaseChatAdapter;
import com.example.moduleroom.contacts.PublicScreenEaseChatContacts;
import com.example.moduleroom.databinding.RoomFragementTransEaseChatBinding;
import com.example.moduleroom.dialog.RoomUserInfoFragment;
import com.xscm.moduleutil.bean.*;
import com.xscm.moduleutil.bean.room.*;
import com.xscm.moduleutil.event.RoomTaskEvent;
import com.xscm.moduleutil.listener.MessageListenerSingleton;
import com.example.moduleroom.presenter.PublicScreenEaseChatPresenter;
import com.xscm.moduleutil.base.BaseMvpFragment;
import com.xscm.moduleutil.event.RoomJoinMountModel;
import com.xscm.moduleutil.rtc.MusicPlayBean;
import com.xscm.moduleutil.utils.SpUtil;
import com.xscm.moduleutil.utils.logger.Logger;
import com.tencent.imsdk.v2.V2TIMManager; import com.tencent.imsdk.v2.V2TIMManager;
import com.tencent.imsdk.v2.V2TIMMessage; import com.tencent.imsdk.v2.V2TIMMessage;
import com.tencent.imsdk.v2.V2TIMSendCallback; import com.tencent.imsdk.v2.V2TIMSendCallback;
import com.xscm.modulemain.R;
import com.xscm.modulemain.activity.room.activity.RoomActivity;
import com.xscm.modulemain.activity.room.contacts.PublicScreenEaseChatContacts;
import com.xscm.modulemain.activity.room.presenter.PublicScreenEaseChatPresenter;
import com.xscm.modulemain.adapter.EaseChatAdapter;
import com.xscm.modulemain.databinding.RoomFragementTransEaseChatBinding;
import com.xscm.modulemain.dialog.RoomUserInfoFragment;
import com.xscm.moduleutil.base.BaseMvpFragment;
import com.xscm.moduleutil.bean.RoomInputEvent;
import com.xscm.moduleutil.bean.RoomMessageEvent;
import com.xscm.moduleutil.bean.RoomSettingEvent;
import com.xscm.moduleutil.bean.UserInfo;
import com.xscm.moduleutil.bean.room.Children;
import com.xscm.moduleutil.bean.room.EMMessageInfo;
import com.xscm.moduleutil.bean.room.EmotionDeatils;
import com.xscm.moduleutil.bean.room.RoomInfoResp;
import com.xscm.moduleutil.bean.room.RoomUserBean;
import com.xscm.moduleutil.event.RoomJoinMountModel;
import com.xscm.moduleutil.event.RoomTaskEvent;
import com.xscm.moduleutil.listener.MessageListenerSingleton;
import com.xscm.moduleutil.rtc.MusicPlayBean;
import com.xscm.moduleutil.utils.SpUtil;
import com.xscm.moduleutil.utils.logger.Logger;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.Subscribe;

16
moduleroom/src/main/java/com/example/moduleroom/fragment/RankingChildFragment.java → modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RankingChildFragment.java
View File

@@ -1,4 +1,4 @@
package com.example.moduleroom.fragment; package com.xscm.modulemain.activity.room.fragment;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log; import android.util.Log;
@@ -11,18 +11,16 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import com.alibaba.android.arouter.launcher.ARouter;
import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseQuickAdapter;
import com.example.moduleroom.R; import com.xscm.modulemain.R;
import com.example.moduleroom.adapter.RankingCharmListAdapter; import com.xscm.modulemain.adapter.RankingCharmListAdapter;
import com.example.moduleroom.contacts.DataListContacts; import com.xscm.modulemain.databinding.RoomRankingChildBinding;
import com.example.moduleroom.databinding.RoomRankingChildBinding; import com.xscm.modulemain.dialog.RoomUserInfoFragment;
import com.example.moduleroom.dialog.RoomUserInfoFragment; import com.xscm.modulemain.activity.room.contacts.DataListContacts;
import com.example.moduleroom.presenter.DataListPresenter; import com.xscm.modulemain.activity.room.presenter.DataListPresenter;
import com.xscm.moduleutil.base.BaseMvpFragment; import com.xscm.moduleutil.base.BaseMvpFragment;
import com.xscm.moduleutil.bean.CharmRankingResp; import com.xscm.moduleutil.bean.CharmRankingResp;
import com.xscm.moduleutil.bean.room.RoomInfoResp; import com.xscm.moduleutil.bean.room.RoomInfoResp;
import com.xscm.moduleutil.utils.ARouteConstants;
import com.xscm.moduleutil.utils.ImageUtils; import com.xscm.moduleutil.utils.ImageUtils;
import com.xscm.moduleutil.utils.StringUtil; import com.xscm.moduleutil.utils.StringUtil;
import com.xscm.moduleutil.widget.CommonEmptyView; import com.xscm.moduleutil.widget.CommonEmptyView;

7
moduleroom/src/main/java/com/example/moduleroom/fragment/RankingParentFragment.java → modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RankingParentFragment.java
View File

@@ -1,12 +1,11 @@
package com.example.moduleroom.fragment; package com.xscm.modulemain.activity.room.fragment;
import android.os.Bundle; import android.os.Bundle;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import com.xscm.modulemain.R;
import com.example.moduleroom.R; import com.xscm.modulemain.databinding.RoomRankingParentBinding;
import com.example.moduleroom.databinding.RoomRankingParentBinding;
import com.xscm.moduleutil.activity.IPresenter; import com.xscm.moduleutil.activity.IPresenter;
import com.xscm.moduleutil.adapter.MyFragmentPagerAdapter; import com.xscm.moduleutil.adapter.MyFragmentPagerAdapter;
import com.xscm.moduleutil.base.BaseMvpFragment; import com.xscm.moduleutil.base.BaseMvpFragment;

21
moduleroom/src/main/java/com/example/moduleroom/fragment/RedEnvelopesFragment.java → modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RedEnvelopesFragment.java
View File

@@ -1,4 +1,9 @@
package com.example.moduleroom.fragment; package com.xscm.modulemain.activity.room.fragment;
import static com.xscm.moduleutil.event.RedEnvelopeStatus.QXRedBagDrawTypeCollect;
import static com.xscm.moduleutil.event.RedEnvelopeStatus.QXRedBagDrawTypeOpen;
import static com.xscm.moduleutil.event.RedEnvelopeStatus.QXRedBagDrawTypePwdSend;
import static com.xscm.moduleutil.event.RedEnvelopeStatus.QXRedBagDrawTypeTimeDown;
import android.content.Context; import android.content.Context;
import android.os.CountDownTimer; import android.os.CountDownTimer;
@@ -6,14 +11,16 @@ import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.Window; import android.view.Window;
import android.view.WindowManager; import android.view.WindowManager;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import com.alibaba.android.arouter.launcher.ARouter; import com.alibaba.android.arouter.launcher.ARouter;
import com.blankj.utilcode.util.ScreenUtils; import com.blankj.utilcode.util.ScreenUtils;
import com.blankj.utilcode.util.TimeUtils; import com.blankj.utilcode.util.TimeUtils;
import com.blankj.utilcode.util.ToastUtils; import com.blankj.utilcode.util.ToastUtils;
import com.example.moduleroom.R; import com.xscm.modulemain.R;
import com.example.moduleroom.activity.RoomActivity; import com.xscm.modulemain.activity.room.activity.RoomActivity;
import com.example.moduleroom.databinding.FragmentRedEnvelopesBinding; import com.xscm.modulemain.databinding.FragmentRedEnvelopesBinding;
import com.xscm.moduleutil.bean.RedPackGrab; import com.xscm.moduleutil.bean.RedPackGrab;
import com.xscm.moduleutil.bean.RedPacketInfo; import com.xscm.moduleutil.bean.RedPacketInfo;
import com.xscm.moduleutil.bean.UserInfo; import com.xscm.moduleutil.bean.UserInfo;
@@ -22,15 +29,13 @@ import com.xscm.moduleutil.http.BaseObserver;
import com.xscm.moduleutil.http.RetrofitClient; import com.xscm.moduleutil.http.RetrofitClient;
import com.xscm.moduleutil.utils.ARouteConstants; import com.xscm.moduleutil.utils.ARouteConstants;
import com.xscm.moduleutil.utils.ImageUtils; import com.xscm.moduleutil.utils.ImageUtils;
import com.xscm.moduleutil.utils.QXRedPacketManager;
import com.xscm.moduleutil.view.QXRedBagSendView; import com.xscm.moduleutil.view.QXRedBagSendView;
import com.xscm.moduleutil.widget.dialog.BaseDialog; import com.xscm.moduleutil.widget.dialog.BaseDialog;
import com.xscm.moduleutil.widget.floatingView.IFloatingView;
import io.reactivex.disposables.Disposable;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import static com.xscm.moduleutil.event.RedEnvelopeStatus.*; import io.reactivex.disposables.Disposable;
/** /**
* @author xscm * @author xscm

2
moduleroom/src/main/java/com/example/moduleroom/fragment/RedViewModel.java → modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RedViewModel.java
View File

@@ -1,4 +1,4 @@
package com.example.moduleroom.fragment; package com.xscm.modulemain.activity.room.fragment;
import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModel;

19
moduleroom/src/main/java/com/example/moduleroom/fragment/RelationshipFragment.java → modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RelationshipFragment.java
View File

@@ -1,22 +1,21 @@
package com.example.moduleroom.fragment; package com.xscm.modulemain.activity.room.fragment;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.view.Gravity;
import android.view.View;
import android.view.Window;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentManager;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import android.view.Gravity; import com.xscm.modulemain.R;
import android.view.View; import com.xscm.modulemain.adapter.RelationshipAdapter;
import android.view.Window; import com.xscm.modulemain.databinding.FragmentRelationshipBinding;
import com.xscm.modulemain.activity.room.contacts.RoomUserContacts;
import com.example.moduleroom.R; import com.xscm.modulemain.activity.room.presenter.RoomUserPresenter;
import com.example.moduleroom.adapter.RelationshipAdapter;
import com.example.moduleroom.contacts.RoomUserContacts;
import com.example.moduleroom.databinding.FragmentRelationshipBinding;
import com.example.moduleroom.presenter.RoomUserPresenter;
import com.xscm.moduleutil.base.BaseMvpDialogFragment; import com.xscm.moduleutil.base.BaseMvpDialogFragment;
import com.xscm.moduleutil.bean.RelationCardBean; import com.xscm.moduleutil.bean.RelationCardBean;
import com.xscm.moduleutil.bean.RelationshipBean; import com.xscm.moduleutil.bean.RelationshipBean;

27
moduleroom/src/main/java/com/example/moduleroom/fragment/RequestFragment.java → modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RequestFragment.java
View File

@@ -1,25 +1,26 @@
package com.example.moduleroom.fragment; package com.xscm.modulemain.activity.room.fragment;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager;
import android.text.Editable; import android.text.Editable;
import android.text.TextWatcher; import android.text.TextWatcher;
import android.view.View; import android.view.View;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager;
import com.blankj.utilcode.util.LogUtils; import com.blankj.utilcode.util.LogUtils;
import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder; import com.chad.library.adapter.base.BaseViewHolder;
import com.example.moduleroom.R; import com.xscm.modulemain.R;
import com.example.moduleroom.contacts.RequestContacts; import com.xscm.modulemain.databinding.FragmentRequestBinding;
import com.example.moduleroom.databinding.FragmentRequestBinding;
import com.example.moduleroom.presenter.RequestPresenter;
import com.hjq.toast.ToastUtils; import com.hjq.toast.ToastUtils;
import com.scwang.smartrefresh.layout.api.RefreshLayout;
import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
import com.xscm.modulemain.activity.room.contacts.RequestContacts;
import com.xscm.modulemain.activity.room.presenter.RequestPresenter;
import com.xscm.moduleutil.base.BaseMvpFragment; import com.xscm.moduleutil.base.BaseMvpFragment;
import com.xscm.moduleutil.bean.MusicSongBean; import com.xscm.moduleutil.bean.MusicSongBean;
import com.xscm.moduleutil.bean.SongMusicBean; import com.xscm.moduleutil.bean.SongMusicBean;
@@ -30,8 +31,6 @@ import com.xscm.moduleutil.utils.ColorManager;
import com.xscm.moduleutil.utils.ImageUtils; import com.xscm.moduleutil.utils.ImageUtils;
import com.xscm.moduleutil.utils.SpUtil; import com.xscm.moduleutil.utils.SpUtil;
import com.xscm.moduleutil.utils.TimeUtils; import com.xscm.moduleutil.utils.TimeUtils;
import com.scwang.smartrefresh.layout.api.RefreshLayout;
import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.Subscribe;
@@ -64,12 +63,12 @@ public class RequestFragment extends BaseMvpFragment<RequestPresenter, FragmentR
@Override @Override
public void upSong(String S) { public void upSong(String S) {
com.hjq.toast.ToastUtils.show(S); ToastUtils.show(S);
} }
@Override @Override
public void song(List<SongMusicBean> music) { public void song(List<SongMusicBean> music) {
com.hjq.toast.ToastUtils.show("操作成功"); ToastUtils.show("操作成功");
} }
public interface OnRequestFragmentListener { public interface OnRequestFragmentListener {

26
moduleroom/src/main/java/com/example/moduleroom/fragment/RoomAuctionFragment.java → modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomAuctionFragment.java
View File

@@ -1,4 +1,4 @@
package com.example.moduleroom.fragment; package com.xscm.modulemain.activity.room.fragment;
import static android.view.View.GONE; import static android.view.View.GONE;
import static android.view.View.INVISIBLE; import static android.view.View.INVISIBLE;
@@ -21,20 +21,20 @@ import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
import com.blankj.utilcode.util.LogUtils; import com.blankj.utilcode.util.LogUtils;
import com.example.moduleroom.R; import com.xscm.modulemain.R;
import com.example.moduleroom.activity.RoomActivity; import com.xscm.modulemain.activity.room.activity.RoomActivity;
import com.example.moduleroom.contacts.RoomAuctionContacts; import com.xscm.modulemain.databinding.FragmentRoomAuctionBinding;
import com.example.moduleroom.databinding.FragmentRoomAuctionBinding; import com.xscm.modulemain.dialog.BidListDialogFragment;
import com.example.moduleroom.dialog.BidListDialogFragment; import com.xscm.modulemain.dialog.CardRelationshipFragment;
import com.example.moduleroom.dialog.CardRelationshipFragment; import com.xscm.modulemain.dialog.CustomCenterDialogFragment;
import com.example.moduleroom.dialog.CustomCenterDialogFragment; import com.xscm.modulemain.dialog.RoomCharmDialog;
import com.example.moduleroom.dialog.RoomCharmDialog; import com.xscm.modulemain.dialog.RoomGiftDialogFragment;
import com.example.moduleroom.dialog.RoomGiftDialogFragment; import com.xscm.modulemain.dialog.RoomOnlineDialogFragment;
import com.example.moduleroom.dialog.RoomOnlineDialogFragment; import com.xscm.modulemain.dialog.RoomUserInfoFragment;
import com.example.moduleroom.dialog.RoomUserInfoFragment;
import com.example.moduleroom.presenter.RoomAuctionPresenterTow;
import com.hjq.toast.ToastUtils; import com.hjq.toast.ToastUtils;
import com.orhanobut.logger.Logger; import com.orhanobut.logger.Logger;
import com.xscm.modulemain.activity.room.contacts.RoomAuctionContacts;
import com.xscm.modulemain.activity.room.presenter.RoomAuctionPresenterTow;
import com.xscm.moduleutil.base.BaseMvpFragment; import com.xscm.moduleutil.base.BaseMvpFragment;
import com.xscm.moduleutil.base.CommonAppContext; import com.xscm.moduleutil.base.CommonAppContext;
import com.xscm.moduleutil.bean.RoomMessageEvent; import com.xscm.moduleutil.bean.RoomMessageEvent;

10
moduleroom/src/main/java/com/example/moduleroom/fragment/RoomBackgroundDialogFragment.java → modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomBackgroundDialogFragment.java
View File

@@ -1,4 +1,4 @@
package com.example.moduleroom.fragment; package com.xscm.modulemain.activity.room.fragment;
import static android.app.Activity.RESULT_OK; import static android.app.Activity.RESULT_OK;
@@ -17,13 +17,13 @@ import androidx.recyclerview.widget.GridLayoutManager;
import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder; import com.chad.library.adapter.base.BaseViewHolder;
import com.example.moduleroom.R; import com.xscm.modulemain.R;
import com.example.moduleroom.contacts.RoomBackgroundContacts; import com.xscm.modulemain.databinding.RoomFragementDialogRoomBackgroundBinding;
import com.example.moduleroom.databinding.RoomFragementDialogRoomBackgroundBinding;
import com.example.moduleroom.presenter.RoomBackgroundPresenter;
import com.luck.picture.lib.basic.PictureSelector; import com.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.config.PictureConfig; import com.luck.picture.lib.config.PictureConfig;
import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.entity.LocalMedia;
import com.xscm.modulemain.activity.room.contacts.RoomBackgroundContacts;
import com.xscm.modulemain.activity.room.presenter.RoomBackgroundPresenter;
import com.xscm.moduleutil.base.BaseMvpDialogFragment; import com.xscm.moduleutil.base.BaseMvpDialogFragment;
import com.xscm.moduleutil.bean.RoomBgBean; import com.xscm.moduleutil.bean.RoomBgBean;
import com.xscm.moduleutil.dialog.ConfirmDialog; import com.xscm.moduleutil.dialog.ConfirmDialog;

24
moduleroom/src/main/java/com/example/moduleroom/fragment/RoomCabinFragment.java → modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomCabinFragment.java
View File

@@ -1,14 +1,10 @@
package com.example.moduleroom.fragment; package com.xscm.modulemain.activity.room.fragment;
import static android.view.View.GONE; import static android.view.View.GONE;
import static android.view.View.VISIBLE; import static android.view.View.VISIBLE;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.media.projection.MediaProjection;
import android.media.projection.MediaProjectionManager;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.CountDownTimer; import android.os.CountDownTimer;
@@ -19,8 +15,6 @@ import android.view.SurfaceView;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import androidx.activity.result.ActivityResultLauncher;
import androidx.activity.result.contract.ActivityResultContracts;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
@@ -29,15 +23,15 @@ import androidx.core.app.NotificationManagerCompat;
import com.blankj.utilcode.util.LogUtils; import com.blankj.utilcode.util.LogUtils;
import com.blankj.utilcode.util.ObjectUtils; import com.blankj.utilcode.util.ObjectUtils;
import com.blankj.utilcode.util.TimeUtils; import com.blankj.utilcode.util.TimeUtils;
import com.example.moduleroom.R; import com.xscm.modulemain.R;
import com.example.moduleroom.activity.RoomActivity; import com.xscm.modulemain.activity.room.activity.RoomActivity;
import com.example.moduleroom.contacts.RoomCabinContacts; import com.xscm.modulemain.databinding.RoomCabinFragmentBinding;
import com.example.moduleroom.databinding.RoomCabinFragmentBinding; import com.xscm.modulemain.dialog.ExitRoomBottomSheet;
import com.example.moduleroom.dialog.ExitRoomBottomSheet; import com.xscm.modulemain.dialog.RoomGiftDialogFragment;
import com.example.moduleroom.dialog.RoomGiftDialogFragment;
import com.example.moduleroom.presenter.RoomCabinPresenter;
import com.hjq.toast.ToastUtils; import com.hjq.toast.ToastUtils;
import com.orhanobut.logger.Logger; import com.orhanobut.logger.Logger;
import com.xscm.modulemain.activity.room.contacts.RoomCabinContacts;
import com.xscm.modulemain.activity.room.presenter.RoomCabinPresenter;
import com.xscm.moduleutil.base.BaseRoomFragment; import com.xscm.moduleutil.base.BaseRoomFragment;
import com.xscm.moduleutil.base.CommonAppContext; import com.xscm.moduleutil.base.CommonAppContext;
import com.xscm.moduleutil.bean.RoomMessageEvent; import com.xscm.moduleutil.bean.RoomMessageEvent;
@@ -49,7 +43,6 @@ import com.xscm.moduleutil.event.CabinEvent;
import com.xscm.moduleutil.event.RoomBeckoningEvent; import com.xscm.moduleutil.event.RoomBeckoningEvent;
import com.xscm.moduleutil.listener.MessageListenerSingleton; import com.xscm.moduleutil.listener.MessageListenerSingleton;
import com.xscm.moduleutil.rtc.AgoraManager; import com.xscm.moduleutil.rtc.AgoraManager;
import com.xscm.moduleutil.utils.ImageUtils;
import com.xscm.moduleutil.utils.SpUtil; import com.xscm.moduleutil.utils.SpUtil;
import com.xscm.moduleutil.widget.SharedViewModel; import com.xscm.moduleutil.widget.SharedViewModel;
import com.xscm.moduleutil.widget.dialog.CommonDialog; import com.xscm.moduleutil.widget.dialog.CommonDialog;
@@ -65,7 +58,6 @@ import io.agora.rtc2.Constants;
import io.agora.rtc2.IRtcEngineEventHandler; import io.agora.rtc2.IRtcEngineEventHandler;
import io.agora.rtc2.RtcEngine; import io.agora.rtc2.RtcEngine;
import io.agora.rtc2.RtcEngineEx; import io.agora.rtc2.RtcEngineEx;
import io.agora.rtc2.ScreenCaptureParameters;
import io.agora.rtc2.video.VideoCanvas; import io.agora.rtc2.video.VideoCanvas;
/** /**

15
moduleroom/src/main/java/com/example/moduleroom/fragment/RoomChartsFragment.java → modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomChartsFragment.java
View File

@@ -1,22 +1,21 @@
package com.example.moduleroom.fragment; package com.xscm.modulemain.activity.room.fragment;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import androidx.annotation.NonNull;
import android.view.Gravity; import android.view.Gravity;
import android.view.View; import android.view.View;
import android.view.Window; import android.view.Window;
import android.view.WindowManager; import android.view.WindowManager;
import androidx.annotation.NonNull;
import com.blankj.utilcode.util.FragmentUtils; import com.blankj.utilcode.util.FragmentUtils;
import com.example.moduleroom.R; import com.xscm.modulemain.R;
import com.example.moduleroom.contacts.RoomChartsContacts; import com.xscm.modulemain.databinding.FragmentRoomChartsBinding;
import com.example.moduleroom.databinding.FragmentRoomChartsBinding;
import com.example.moduleroom.presenter.RoomChartsPresenter;
import com.example.moduletablayout.listener.CustomTabEntity; import com.example.moduletablayout.listener.CustomTabEntity;
import com.example.moduletablayout.listener.OnTabSelectListener; import com.example.moduletablayout.listener.OnTabSelectListener;
import com.xscm.modulemain.activity.room.contacts.RoomChartsContacts;
import com.xscm.modulemain.activity.room.presenter.RoomChartsPresenter;
import com.xscm.moduleutil.base.BaseMvpDialogFragment; import com.xscm.moduleutil.base.BaseMvpDialogFragment;
import com.xscm.moduleutil.bean.room.RoomInfoResp; import com.xscm.moduleutil.bean.room.RoomInfoResp;

Some files were not shown because too many files have changed in this diff Show More