MIDI/midi-android
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改巡乐会动画

Browse Source
This commit is contained in:
梁小江
2025-09-26 23:57:00 +08:00
parent abed908e70
commit ea3f7e688c
7 changed files with 73 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/release/release/output-metadata.json
View File

@@ -11,9 +11,9 @@
"type": "SINGLE",
"filters": [],
"attributes": [],
"versionCode": 158,
"versionName": "1.0.5",
"outputFile": "秘地_1.0.5_158.apk"
"versionCode": 166,
"versionName": "1.1.3",
"outputFile": "秘地_1.1.3_166.apk"
}
],
"elementType": "File",
@@ -22,14 +22,14 @@
"minApi": 28,
"maxApi": 30,
"baselineProfiles": [
"baselineProfiles/1/秘地_1.0.5_158.dm"
"baselineProfiles/1/秘地_1.1.3_166.dm"
]
},
{
"minApi": 31,
"maxApi": 2147483647,
"baselineProfiles": [
"baselineProfiles/0/秘地_1.0.5_158.dm"
"baselineProfiles/0/秘地_1.1.3_166.dm"
]
}
],

4
gradle.properties
View File

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

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

@@ -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();
// 每次启动应用时重置状态

1
moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/TourClubDialogFragment.java
View File

@@ -422,7 +422,6 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
mBinding.gvXyz.setModel(xlhUser);
mBinding.qxDjs.setEndTime(endTime);
mBinding.tvNumber.setText("x"+(message.getText().getGift_num() != null ? message.getText().getGift_num() : "0"));
isDrawing=false;
}
}

4
moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentPrefs.java
View File

@@ -27,11 +27,11 @@ public class EnvironmentPrefs {
// 获取当前选择的环境，默认为 PRODUCTION
public EnvironmentEnum getSelectedEnvironment() {
String envName = sharedPreferences.getString(KEY_ENV, EnvironmentEnum.TEST.name());
String envName = sharedPreferences.getString(KEY_ENV, EnvironmentEnum.PRODUCTION.name());
try {
return EnvironmentEnum.valueOf(envName);
} catch (IllegalArgumentException e) {
return EnvironmentEnum.TEST; // 出错时默认返回生产环境
return EnvironmentEnum.PRODUCTION; // 出错时默认返回生产环境
}
}
}

28
moduleUtil/src/main/java/com/xscm/moduleutil/view/QXMeetUserView.java
View File

@@ -55,6 +55,21 @@ public class QXMeetUserView extends RelativeLayout {
setClipChildren(false);
setClipToPadding(false);
// 创建头像图片视图
headerImageView = new GifAvatarOvalView(context);
headerImageView.setScaleType(ImageView.ScaleType.FIT_CENTER); // 添加这一行
// headerImageView.setScaleType(ImageView.ScaleType.FIT_CENTER);
// headerImageView.setImageResource(R.mipmap.default_avatar);
int headerSize = getMeasuredWidth() - dpToPx(18); // self.width-9*2
LayoutParams headerParams = new LayoutParams(headerSize, headerSize);
headerParams.setMargins(0, 10, 0, 0);
headerParams.addRule(CENTER_IN_PARENT);
// 将头像添加到装饰视图之上
addView(headerImageView, headerParams);
// 创建装饰图片视图
dressImageView = new ImageView(context);
dressImageView.setScaleType(ImageView.ScaleType.FIT_CENTER);
@@ -66,19 +81,6 @@ public class QXMeetUserView extends RelativeLayout {
);
addView(dressImageView, dressParams);
// 创建头像图片视图
headerImageView = new GifAvatarOvalView(context);
headerImageView.setScaleType(ImageView.ScaleType.CENTER_CROP); // 添加这一行
// headerImageView.setScaleType(ImageView.ScaleType.FIT_CENTER);
// headerImageView.setImageResource(R.mipmap.default_avatar);
int headerSize = getMeasuredWidth() - dpToPx(18); // self.width-9*2
LayoutParams headerParams = new LayoutParams(headerSize, headerSize);
headerParams.setMargins(0, 10, 0, 0);
headerParams.addRule(CENTER_IN_PARENT);
// 将头像添加到装饰视图之上
addView(headerImageView, headerParams);
// 创建标签标签
tagLabel = new TextView(context);
tagLabel.setTextColor(0xFFFFE554); // RGB16(0xFFE554)

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

@@ -158,7 +158,7 @@ import java.util.Arrays
import java.util.Date
import java.util.stream.Collectors
@Route(path = ARouteConstants.ROOM_DETAILS )
@Route(path = ARouteConstants.ROOM_DETAILS)
class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
RoomContacts.View, PermissionCallbacks, OnMessageReceivedListener {
private var roomFragment: RoomFragment? = null
@@ -467,6 +467,41 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
/** 最小化 */
private fun showExitRoomDialog() {
if (mRoomInfoResp!!.room_info.type_id.equals("6")) {
val bottomSheet = ExitRoomBottomSheet.newInstance(false, true, true);
bottomSheet.setOnOptionSelectedListener(object : OnOptionSelectedListener {
override fun onMinimize() {
TODO("Not yet implemented")
}
override fun onExitRoom() {
// 调用退出房间方法
// MvpPre.quitRoom(roomId, SpUtil.getUserId() + "");
// 真正退出房间
// 调用退出房间方法
MessageListenerSingleton.quitGroup(roomId);
quit();
if (mRoomInfoResp!!.getRoom_info()
.getLabel_id() != null && mRoomInfoResp!!.getRoom_info().getLabel_id()
.equals("5")
) {
jiaR();
return;
} else {
performExitRoom(1);
}
// performExitRoom(1)
}
override fun onCancel() {
// 用户点击取消，不做任何事
}
})
return
}
val bottomSheet = ExitRoomBottomSheet.newInstance()
bottomSheet.setOnOptionSelectedListener(object : OnOptionSelectedListener {
override fun onMinimize() {
@@ -482,6 +517,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
// 处理最小化逻辑
minimizeToBackground()
}
@@ -800,7 +836,6 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
}
override fun onFail(e: Throwable) {
LogUtils.e("Network request preparation failed: " + e.message)
// 即使准备失败，也尝试执行网络请求
@@ -2202,6 +2237,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
lastSwitchedRoomId = pendingRoomId!!
AgoraManager.getInstance(OkDownloadProvider.context).lastRoomId =
messageEvent.roomId
// RoomManager.getInstance().fetchRoomDataAndEnter(this,pendingRoomId, "")
}
}
pendingRoomId = null
@@ -3981,11 +4017,17 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
"上一个房间的roonid" + AgoraManager.getInstance(OkDownloadProvider.context).lastRoomId
)
// MvpPre.getRoomIn(AgoraManager.getInstance(context).getLastRoomId(), "");
ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "电影房")
.withString("roomId", AgoraManager.getInstance(OkDownloadProvider.context).lastRoomId)
.navigation()
// ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "电影房")
// .withString("roomId", AgoraManager.getInstance(OkDownloadProvider.context).lastRoomId)
// .navigation()
RoomManager.getInstance().fetchRoomDataAndEnter(
this,
AgoraManager.getInstance(OkDownloadProvider.context).lastRoomId,
""
)
AgoraManager.getInstance(OkDownloadProvider.context).lastRoomId = ""
// setviewyc(true);
// exitFullScreen()
}
override fun userGuanzSuccess(s: String) {