From 8589a7265b19c1564bad9c7f396ae5a8f484cbaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com> Date: Sun, 28 Sep 2025 11:20:12 +0800 Subject: [PATCH] =?UTF-8?q?1=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=BD=93=E8=85=BE?= =?UTF-8?q?=E8=AE=AFim=E5=87=BA=E7=8E=B0=E8=B4=A6=E5=8F=B7=E8=A2=AB?= =?UTF-8?q?=E6=8C=A4=E6=8E=89=EF=BC=8C=E8=AE=A9=E9=80=80=E5=87=BA=E5=BA=94?= =?UTF-8?q?=E7=94=A8=202=EF=BC=9A=E6=9B=B4=E6=94=B9=E5=AE=98=E6=96=B9?= =?UTF-8?q?=E5=85=AC=E5=91=8A=EF=BC=8C=E7=B3=BB=E7=BB=9F=E6=B6=88=E6=81=AF?= =?UTF-8?q?=EF=BC=8C=E5=87=BA=E7=8E=B0=E4=B8=8A=E6=BB=91=E4=B8=8D=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/deploymentTargetSelector.xml | 4 +-- app/build.gradle | 21 ++++++------ .../moduleutil/activity/BaseMvpActivity.java | 9 ++++++ .../activity/news/OfficialNoticeActivity.java | 13 +------- .../moduleutil/base/CommonAppContext.java | 8 +++-- .../utils/config/EnvironmentPrefs.java | 32 ++++++++++++++++--- .../moduleroom/activity/RoomActivity.kt | 8 +++-- 7 files changed, 62 insertions(+), 33 deletions(-) diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml index 518c6bc..7037c85 100644 --- a/.idea/deploymentTargetSelector.xml +++ b/.idea/deploymentTargetSelector.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 2a42e8e..9c42717 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -25,7 +25,8 @@ android { javaCompileOptions { annotationProcessorOptions { arguments = [ - AROUTER_MODULE_NAME: project.getName() +// AROUTER_MODULE_NAME: project.getName() + AROUTER_MODULE_NAME: android.defaultConfig.applicationId ] } } @@ -55,7 +56,7 @@ android { } buildTypes { release { - minifyEnabled true + minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' signingConfig signingConfigs.release @@ -77,7 +78,9 @@ android { debug { debuggable true - minifyEnabled true + minifyEnabled false +// applicationIdSuffix ".test" // 为测试包添加包名后缀 +// resValue("string", "app_name", "秘地测试版") proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' signingConfig signingConfigs.debug @@ -116,7 +119,7 @@ android { } kotlinOptions { - jvmTarget = '17' + jvmTarget = '11' } dexOptions { dexInProcess true @@ -144,13 +147,7 @@ dependencies { implementation files('libs/logger-2.2.2-release.aar') implementation files('libs/main-2.2.3-release.aar') - implementation files('libs/WbCloudFaceLiveSdk-face-v6.6.2-8e4718fc.aar') - implementation files('libs/WbCloudNormal-v5.1.10-4e3e198.aar') - - implementation(libs.arouter.api.v150) - //annotationProcessor - annotationProcessor libs.arouter.compiler implementation project(':modulevocal') // 必须 annotationProcessor project(':modulevocal') // 关键！ @@ -158,6 +155,10 @@ dependencies { api project(":moduleLogin") implementation project(':modulemain') + implementation(libs.arouter.api.v150) + //annotationProcessor + annotationProcessor libs.arouter.compiler + //aar的名称，例如：WbCloudFaceLiveSdk-v6.0.0-1234567.aar，填入'WbCloudFaceLiveSdk-v6.0.0-1234567' // implementation(name: 'WbCloudFaceLiveSdk-face-v6.6.2-8e4718fc', ext: 'aar') ////2. 云normal SDK， diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/activity/BaseMvpActivity.java b/moduleUtil/src/main/java/com/xscm/moduleutil/activity/BaseMvpActivity.java index 7d6872f..dcc5907 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/activity/BaseMvpActivity.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/activity/BaseMvpActivity.java @@ -14,6 +14,7 @@ import androidx.core.content.ContextCompat; import androidx.databinding.ViewDataBinding; import com.blankj.utilcode.util.LogUtils; +import com.blankj.utilcode.util.ToastUtils; import com.tencent.imsdk.v2.V2TIMConversationListener; import com.tencent.imsdk.v2.V2TIMConversationManager; import com.tencent.imsdk.v2.V2TIMSDKListener; @@ -146,6 +147,14 @@ public abstract class BaseMvpActivity

mAdapter; private String type; - private boolean isRefresh = true; // 添加标志位区分刷新和加载更多 @Override protected void initData() { @@ -49,14 +48,12 @@ public class OfficialNoticeActivity extends BaseMvpActivity newsList) { - if (isRefresh) { - // 下拉刷新 - mAdapter.setNewData(newsList); - } else { - // 上拉加载更多 - if (newsList!=null) { - mAdapter.addData(newsList); - } - } + mAdapter.setNewData(newsList); } @Override diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java b/moduleUtil/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java index aa679c0..96c1635 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java @@ -434,8 +434,8 @@ public class CommonAppContext extends MultiDexApplication implements Applicatio // startService(mqttServiceIntent); // } - mqttConnect=MqttConnect.getInstance(this,"tcp://1.13.181.248","android-"+ MqttClient.generateClientId()); -// mqttConnect=MqttConnect.getInstance(this,"tcp://62.234.12.147","android-"+ MqttClient.generateClientId()); +// mqttConnect=MqttConnect.getInstance(this,"tcp://1.13.181.248","android-"+ MqttClient.generateClientId()); + mqttConnect=MqttConnect.getInstance(this,"tcp://62.234.12.147","android-"+ MqttClient.generateClientId()); mqttConnect.mqttClient(); // 每次启动应用时重置状态 @@ -789,7 +789,7 @@ public class CommonAppContext extends MultiDexApplication implements Applicatio @Override public void onActivityStarted(@NonNull Activity activity) { - + AppLifecycleUtil.onAppFrontGround(); } @Override @@ -801,6 +801,7 @@ public class CommonAppContext extends MultiDexApplication implements Applicatio } // handleAppForeground(activity); // AppStateManager.setRoomActivityMinimized(false); + AppLifecycleUtil.onAppFrontGround(); } activityCount++; } @@ -813,6 +814,7 @@ public class CommonAppContext extends MultiDexApplication implements Applicatio if (appStateListener != null) { appStateListener.onAppBackground(); } + AppLifecycleUtil.onAppBackGround(); // handleAppBackground(activity); // AppStateManager.setRoomActivityMinimized( true); } diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentPrefs.java b/moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentPrefs.java index 43c35bc..a1d591a 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentPrefs.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentPrefs.java @@ -3,6 +3,9 @@ package com.xscm.moduleutil.utils.config; import android.content.Context; import android.content.SharedPreferences; +import com.blankj.utilcode.BuildConfig; +import com.xscm.moduleutil.base.CommonAppContext; + /** *@author *@data @@ -25,13 +28,34 @@ public class EnvironmentPrefs { editor.apply(); } - // 获取当前选择的环境，默认为 PRODUCTION + // 获取当前选择的环境，默认根据构建变体决定 public EnvironmentEnum getSelectedEnvironment() { - String envName = sharedPreferences.getString(KEY_ENV, EnvironmentEnum.TEST.name()); +// // 检查是否是debug版本（开发版本） +// if (BuildConfig.DEBUG) { +// return EnvironmentEnum.TEST; +// } +// +// // 检查flavor类型 +// if ("dev".equals(BuildConfig.FLAVOR)) { +// return EnvironmentEnum.TEST; +// } +// +// // 检查包名判断是否为开发版本 +// try { +// String packageName = CommonAppContext.getInstance().getPackageName(); +// if (packageName.contains(".test") || packageName.contains(".dev")) { +// return EnvironmentEnum.TEST; +// } +// } catch (Exception e) { +// // 忽略异常 +// } + + // 默认使用生产环境 + String envName = sharedPreferences.getString(KEY_ENV, EnvironmentEnum.PRODUCTION.name()); try { return EnvironmentEnum.valueOf(envName); } catch (IllegalArgumentException e) { - return EnvironmentEnum.TEST; // 出错时默认返回生产环境 + return EnvironmentEnum.PRODUCTION; // 出错时默认返回生产环境 } } -} +} \ No newline at end of file diff --git a/moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.kt b/moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.kt index c3579b9..49e5a84 100644 --- a/moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.kt +++ b/moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.kt @@ -126,6 +126,7 @@ import com.xscm.moduleutil.event.SurfaceEvent import com.xscm.moduleutil.event.UnreadCountEvent import com.xscm.moduleutil.http.BaseObserver import com.xscm.moduleutil.http.RetrofitClient +import com.xscm.moduleutil.interfaces.AppLifecycleUtil import com.xscm.moduleutil.interfaces.OnMusicItemClickListener import com.xscm.moduleutil.listener.MessageListenerSingleton import com.xscm.moduleutil.listener.MessageListenerSingleton.OnMessageReceivedListener @@ -160,7 +161,8 @@ import java.util.stream.Collectors @Route(path = ARouteConstants.ROOM_DETAILS) class RoomActivity : BaseMvpActivity(), - RoomContacts.View, PermissionCallbacks, OnMessageReceivedListener { + RoomContacts.View, PermissionCallbacks, OnMessageReceivedListener + { private var roomFragment: RoomFragment? = null var commonPageAdapter: CommonPageAdapter? = null private var mRoomBean: RoomBean? = null @@ -4355,7 +4357,7 @@ class RoomActivity : BaseMvpActivity(), * 停止保活 */ private fun stopkeepLiveService() { - val isStartService = isServiceExisted(this, "com.example.modulerroom.RoomPlayService") + val isStartService = isServiceExisted(this, "com.example.modulerroom.service.RoomPlayService") if (isStartService) { val stopIntent = Intent( this, @@ -4422,4 +4424,6 @@ class RoomActivity : BaseMvpActivity(), private const val CLICK_DELAY: Long = 500 // 延迟时间，单位毫秒 private val AUDIO_PERMISSIONS = arrayOf(Manifest.permission.RECORD_AUDIO) } + + } \ No newline at end of file