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

1:修改马迎新春的弹框提示，展示背景

Browse Source
This commit is contained in:
梁小江
2026-01-30 14:25:45 +08:00
parent 48506a075e
commit 88ce3ac161
12 changed files with 158 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
BaseModule/src/main/java/com/xscm/moduleutil/bean/room/refining/LiveBean.kt
View File

@@ -90,7 +90,8 @@ data class MonsterEndBean(
val total_gift_price: Int,
val win_count: Int,
val win_number: Int,
val win_type_name: String
val win_type_name: String,
val base_image: String
)
data class OpenMonsterBean(

12
BaseModule/src/main/java/com/xscm/moduleutil/service/MqttInitCallback.java
View File

@@ -95,12 +95,12 @@ public class MqttInitCallback implements MqttCallback {
EventBus.getDefault().post(monsterInfo.data);
break;
case 3032:
RealTimeMessages<OpenMonsterBean> openMonster =
GsonUtils.fromJson(
message,
new TypeToken<RealTimeMessages<OpenMonsterBean>>() {}.getType()
);
EventBus.getDefault().post(openMonster.data);
// RealTimeMessages<OpenMonsterBean> openMonster =
// GsonUtils.fromJson(
// message,
// new TypeToken<RealTimeMessages<OpenMonsterBean>>() {}.getType()
// );
// EventBus.getDefault().post(openMonster.data);
break;
case 3033:
RealTimeMessages<MonsterEndBean> monsterEndBean =

60
BaseModule/src/main/java/com/xscm/moduleutil/utils/ImageLoader.java
View File

@@ -65,16 +65,16 @@ public class ImageLoader {
switch (dataSource) {
case DATA_DISK_CACHE:
case RESOURCE_DISK_CACHE:
LogUtils.e("GlideCache", "来自磁盘缓存",url);
LogUtils.e("GlideCache", "来自磁盘缓存");
break;
case MEMORY_CACHE:
LogUtils.e("GlideCache", "来自内存缓存",url);
LogUtils.e("GlideCache", "来自内存缓存");
break;
case LOCAL: // 本地文件
LogUtils.e("GlideCache", "来自本地文件",url);
LogUtils.e("GlideCache", "来自本地文件");
break;
case REMOTE: // 网络下载
LogUtils.e("GlideCache", "来自网络下载",url);
LogUtils.e("GlideCache", "来自网络下载");
break;
default:
LogUtils.e("GlideCache", "来自: " + dataSource);
@@ -85,7 +85,7 @@ public class ImageLoader {
@Override
public boolean onLoadFailed(@Nullable GlideException e, Object model,
Target<Drawable> target, boolean isFirstResource) {
Log.e("GlideCache", "加载失败"+"path:"+url, e);
Log.e("GlideCache", "加载失败"+"path:", e);
return false;
}
}).thumbnail(0.3f).into(view);
@@ -103,16 +103,16 @@ public class ImageLoader {
switch (dataSource) {
case DATA_DISK_CACHE:
case RESOURCE_DISK_CACHE:
LogUtils.e("GlideCache", "来自磁盘缓存",url);
LogUtils.e("GlideCache", "来自磁盘缓存");
break;
case MEMORY_CACHE:
LogUtils.e("GlideCache", "来自内存缓存",url);
LogUtils.e("GlideCache", "来自内存缓存");
break;
case LOCAL: // 本地文件
LogUtils.e("GlideCache", "来自本地文件",url);
LogUtils.e("GlideCache", "来自本地文件");
break;
case REMOTE: // 网络下载
LogUtils.e("GlideCache", "来自网络下载",url);
LogUtils.e("GlideCache", "来自网络下载");
break;
default:
LogUtils.e("GlideCache", "来自: " + dataSource);
@@ -123,7 +123,7 @@ public class ImageLoader {
@Override
public boolean onLoadFailed(@Nullable GlideException e, Object model,
Target<Drawable> target, boolean isFirstResource) {
Log.e("GlideCache", "加载失败"+"path:"+url, e);
Log.e("GlideCache", "加载失败"+"path:", e);
return false;
}
}).thumbnail(0.3f).into(view);
@@ -141,16 +141,16 @@ public class ImageLoader {
switch (dataSource) {
case DATA_DISK_CACHE:
case RESOURCE_DISK_CACHE:
LogUtils.e("GlideCache", "来自磁盘缓存",url);
LogUtils.e("GlideCache", "来自磁盘缓存");
break;
case MEMORY_CACHE:
LogUtils.e("GlideCache", "来自内存缓存",url);
LogUtils.e("GlideCache", "来自内存缓存");
break;
case LOCAL: // 本地文件
LogUtils.e("GlideCache", "来自本地文件",url);
LogUtils.e("GlideCache", "来自本地文件");
break;
case REMOTE: // 网络下载
LogUtils.e("GlideCache", "来自网络下载",url);
LogUtils.e("GlideCache", "来自网络下载");
break;
default:
LogUtils.e("GlideCache", "来自: " + dataSource);
@@ -161,7 +161,7 @@ public class ImageLoader {
@Override
public boolean onLoadFailed(@Nullable GlideException e, Object model,
Target<Drawable> target, boolean isFirstResource) {
Log.e("GlideCache", "加载失败"+"path:"+url, e);
Log.e("GlideCache", "加载失败"+"path:", e);
return false;
}
}).thumbnail(0.3f).into(view);
@@ -178,16 +178,16 @@ public class ImageLoader {
switch (dataSource) {
case DATA_DISK_CACHE:
case RESOURCE_DISK_CACHE:
LogUtils.e("GlideCache", "来自磁盘缓存",url);
LogUtils.e("GlideCache", "来自磁盘缓存");
break;
case MEMORY_CACHE:
LogUtils.e("GlideCache", "来自内存缓存",url);
LogUtils.e("GlideCache", "来自内存缓存");
break;
case LOCAL: // 本地文件
LogUtils.e("GlideCache", "来自本地文件",url);
LogUtils.e("GlideCache", "来自本地文件");
break;
case REMOTE: // 网络下载
LogUtils.e("GlideCache", "来自网络下载",url);
LogUtils.e("GlideCache", "来自网络下载");
break;
default:
LogUtils.e("GlideCache", "来自: " + dataSource);
@@ -198,7 +198,7 @@ public class ImageLoader {
@Override
public boolean onLoadFailed(@Nullable GlideException e, Object model,
Target<Drawable> target, boolean isFirstResource) {
Log.e("GlideCache", "加载失败"+"path:"+url, e);
Log.e("GlideCache", "加载失败"+"path:", e);
return false;
}
}).thumbnail(0.3f).into(view);
@@ -222,16 +222,16 @@ public class ImageLoader {
switch (dataSource) {
case DATA_DISK_CACHE:
case RESOURCE_DISK_CACHE:
LogUtils.e("GlideCache", "来自磁盘缓存",url);
LogUtils.e("GlideCache", "来自磁盘缓存");
break;
case MEMORY_CACHE:
LogUtils.e("GlideCache", "来自内存缓存",url);
LogUtils.e("GlideCache", "来自内存缓存");
break;
case LOCAL: // 本地文件
LogUtils.e("GlideCache", "来自本地文件",url);
LogUtils.e("GlideCache", "来自本地文件");
break;
case REMOTE: // 网络下载
LogUtils.e("GlideCache", "来自网络下载",url);
LogUtils.e("GlideCache", "来自网络下载");
break;
default:
LogUtils.e("GlideCache", "来自: " + dataSource);
@@ -242,7 +242,7 @@ public class ImageLoader {
@Override
public boolean onLoadFailed(@Nullable GlideException e, Object model,
Target<Drawable> target, boolean isFirstResource) {
Log.e("GlideCache", "加载失败"+"path:"+url, e);
Log.e("GlideCache", "加载失败"+"path:", e);
return false;
}
}).thumbnail(0.3f).into(view);
@@ -261,16 +261,16 @@ public class ImageLoader {
switch (dataSource) {
case DATA_DISK_CACHE:
case RESOURCE_DISK_CACHE:
LogUtils.e("GlideCache", "来自磁盘缓存",url);
LogUtils.e("GlideCache", "来自磁盘缓存");
break;
case MEMORY_CACHE:
LogUtils.e("GlideCache", "来自内存缓存",url);
LogUtils.e("GlideCache", "来自内存缓存");
break;
case LOCAL: // 本地文件
LogUtils.e("GlideCache", "来自本地文件",url);
LogUtils.e("GlideCache", "来自本地文件");
break;
case REMOTE: // 网络下载
LogUtils.e("GlideCache", "来自网络下载",url);
LogUtils.e("GlideCache", "来自网络下载");
break;
default:
LogUtils.e("GlideCache", "来自: " + dataSource);
@@ -281,7 +281,7 @@ public class ImageLoader {
@Override
public boolean onLoadFailed(@Nullable GlideException e, Object model,
Target<Drawable> target, boolean isFirstResource) {
Log.e("GlideCache", "加载失败"+"path:"+url, e);
Log.e("GlideCache", "加载失败"+"path:", e);
return false;
}
})

88
BaseModule/src/main/java/com/xscm/moduleutil/utils/ImageUtils.java
View File

@@ -103,16 +103,16 @@ public class ImageUtils {
switch (dataSource) {
case DATA_DISK_CACHE:
case RESOURCE_DISK_CACHE:
LogUtils.e("GlideCache", "来自磁盘缓存",path);
LogUtils.e("GlideCache", "来自磁盘缓存");
break;
case MEMORY_CACHE:
LogUtils.e("GlideCache", "来自内存缓存",path);
LogUtils.e("GlideCache", "来自内存缓存");
break;
case LOCAL: // 本地文件
LogUtils.e("GlideCache", "来自本地文件",path);
LogUtils.e("GlideCache", "来自本地文件");
break;
case REMOTE: // 网络下载
LogUtils.e("GlideCache", "来自网络下载",path);
LogUtils.e("GlideCache", "来自网络下载");
break;
default:
LogUtils.e("GlideCache", "来自: " + dataSource);
@@ -123,7 +123,7 @@ public class ImageUtils {
@Override
public boolean onLoadFailed(@Nullable GlideException e, Object model,
Target<Drawable> target, boolean isFirstResource) {
Log.e("GlideCache", "加载失败"+"path:"+path, e);
Log.e("GlideCache", "加载失败"+"path:", e);
return false;
}
}).thumbnail(0.3f).into(mImageView);
@@ -144,16 +144,16 @@ public class ImageUtils {
switch (dataSource) {
case DATA_DISK_CACHE:
case RESOURCE_DISK_CACHE:
LogUtils.e("GlideCache", "来自磁盘缓存",path);
LogUtils.e("GlideCache", "来自磁盘缓存");
break;
case MEMORY_CACHE:
LogUtils.e("GlideCache", "来自内存缓存",path);
LogUtils.e("GlideCache", "来自内存缓存");
break;
case LOCAL: // 本地文件
LogUtils.e("GlideCache", "来自本地文件",path);
LogUtils.e("GlideCache", "来自本地文件");
break;
case REMOTE: // 网络下载
LogUtils.e("GlideCache", "来自网络下载",path);
LogUtils.e("GlideCache", "来自网络下载");
break;
default:
LogUtils.e("GlideCache", "来自: " + dataSource);
@@ -164,7 +164,7 @@ public class ImageUtils {
@Override
public boolean onLoadFailed(@Nullable GlideException e, Object model,
Target<Drawable> target, boolean isFirstResource) {
Log.e("GlideCache", "加载失败"+"path:"+path, e);
Log.e("GlideCache", "加载失败"+"path:", e);
return false;
}
}).thumbnail(0.3f).into(mImageView);
@@ -197,16 +197,16 @@ public class ImageUtils {
switch (dataSource) {
case DATA_DISK_CACHE:
case RESOURCE_DISK_CACHE:
LogUtils.e("GlideCache", "来自磁盘缓存",path);
LogUtils.e("GlideCache", "来自磁盘缓存");
break;
case MEMORY_CACHE:
LogUtils.e("GlideCache", "来自内存缓存",path);
LogUtils.e("GlideCache", "来自内存缓存");
break;
case LOCAL: // 本地文件
LogUtils.e("GlideCache", "来自本地文件",path);
LogUtils.e("GlideCache", "来自本地文件");
break;
case REMOTE: // 网络下载
LogUtils.e("GlideCache", "来自网络下载",path);
LogUtils.e("GlideCache", "来自网络下载");
break;
default:
LogUtils.e("GlideCache", "来自: " + dataSource);
@@ -217,7 +217,7 @@ public class ImageUtils {
@Override
public boolean onLoadFailed(@Nullable GlideException e, Object model,
Target<Drawable> target, boolean isFirstResource) {
Log.e("GlideCache", "加载失败"+"path:"+path, e);
Log.e("GlideCache", "加载失败"+"path:", e);
return false;
}
}).thumbnail(0.3f).into(mImageView);
@@ -322,16 +322,16 @@ public class ImageUtils {
switch (dataSource) {
case DATA_DISK_CACHE:
case RESOURCE_DISK_CACHE:
LogUtils.e("GlideCache", "来自磁盘缓存",path);
LogUtils.e("GlideCache", "来自磁盘缓存");
break;
case MEMORY_CACHE:
LogUtils.e("GlideCache", "来自内存缓存",path);
LogUtils.e("GlideCache", "来自内存缓存");
break;
case LOCAL: // 本地文件
LogUtils.e("GlideCache", "来自本地文件",path);
LogUtils.e("GlideCache", "来自本地文件");
break;
case REMOTE: // 网络下载
LogUtils.e("GlideCache", "来自网络下载",path);
LogUtils.e("GlideCache", "来自网络下载");
break;
default:
LogUtils.e("GlideCache", "来自: " + dataSource);
@@ -342,7 +342,7 @@ public class ImageUtils {
@Override
public boolean onLoadFailed(@Nullable GlideException e, Object model,
Target<Drawable> target, boolean isFirstResource) {
Log.e("GlideCache", "加载失败"+"path:"+path, e);
Log.e("GlideCache", "加载失败"+"path:", e);
return false;
}
}).thumbnail(0.3f).into(mImageView);
@@ -372,16 +372,16 @@ public class ImageUtils {
switch (dataSource) {
case DATA_DISK_CACHE:
case RESOURCE_DISK_CACHE:
LogUtils.e("GlideCache", "来自磁盘缓存",path);
LogUtils.e("GlideCache", "来自磁盘缓存");
break;
case MEMORY_CACHE:
LogUtils.e("GlideCache", "来自内存缓存",path);
LogUtils.e("GlideCache", "来自内存缓存");
break;
case LOCAL: // 本地文件
LogUtils.e("GlideCache", "来自本地文件",path);
LogUtils.e("GlideCache", "来自本地文件");
break;
case REMOTE: // 网络下载
LogUtils.e("GlideCache", "来自网络下载",path);
LogUtils.e("GlideCache", "来自网络下载");
break;
default:
LogUtils.e("GlideCache", "来自: " + dataSource);
@@ -419,16 +419,16 @@ public class ImageUtils {
switch (dataSource) {
case DATA_DISK_CACHE:
case RESOURCE_DISK_CACHE:
LogUtils.e("GlideCache", "来自磁盘缓存",path);
LogUtils.e("GlideCache", "来自磁盘缓存");
break;
case MEMORY_CACHE:
LogUtils.e("GlideCache", "来自内存缓存",path);
LogUtils.e("GlideCache", "来自内存缓存");
break;
case LOCAL: // 本地文件
LogUtils.e("GlideCache", "来自本地文件",path);
LogUtils.e("GlideCache", "来自本地文件");
break;
case REMOTE: // 网络下载
LogUtils.e("GlideCache", "来自网络下载",path);
LogUtils.e("GlideCache", "来自网络下载");
break;
default:
LogUtils.e("GlideCache", "来自: " + dataSource);
@@ -468,16 +468,16 @@ public class ImageUtils {
switch (dataSource) {
case DATA_DISK_CACHE:
case RESOURCE_DISK_CACHE:
LogUtils.e("GlideCache", "来自磁盘缓存",path);
LogUtils.e("GlideCache", "来自磁盘缓存");
break;
case MEMORY_CACHE:
LogUtils.e("GlideCache", "来自内存缓存",path);
LogUtils.e("GlideCache", "来自内存缓存");
break;
case LOCAL: // 本地文件
LogUtils.e("GlideCache", "来自本地文件",path);
LogUtils.e("GlideCache", "来自本地文件");
break;
case REMOTE: // 网络下载
LogUtils.e("GlideCache", "来自网络下载",path);
LogUtils.e("GlideCache", "来自网络下载");
break;
default:
LogUtils.e("GlideCache", "来自: " + dataSource);
@@ -524,16 +524,16 @@ public class ImageUtils {
switch (dataSource) {
case DATA_DISK_CACHE:
case RESOURCE_DISK_CACHE:
LogUtils.e("GlideCache", "来自磁盘缓存",path);
LogUtils.e("GlideCache", "来自磁盘缓存");
break;
case MEMORY_CACHE:
LogUtils.e("GlideCache", "来自内存缓存",path);
LogUtils.e("GlideCache", "来自内存缓存");
break;
case LOCAL: // 本地文件
LogUtils.e("GlideCache", "来自本地文件",path);
LogUtils.e("GlideCache", "来自本地文件");
break;
case REMOTE: // 网络下载
LogUtils.e("GlideCache", "来自网络下载",path);
LogUtils.e("GlideCache", "来自网络下载");
break;
default:
LogUtils.e("GlideCache", "来自: " + dataSource);
@@ -569,16 +569,16 @@ public class ImageUtils {
switch (dataSource) {
case DATA_DISK_CACHE:
case RESOURCE_DISK_CACHE:
LogUtils.e("GlideCache", "来自磁盘缓存",path);
LogUtils.e("GlideCache", "来自磁盘缓存");
break;
case MEMORY_CACHE:
LogUtils.e("GlideCache", "来自内存缓存",path);
LogUtils.e("GlideCache", "来自内存缓存");
break;
case LOCAL: // 本地文件
LogUtils.e("GlideCache", "来自本地文件",path);
LogUtils.e("GlideCache", "来自本地文件");
break;
case REMOTE: // 网络下载
LogUtils.e("GlideCache", "来自网络下载",path);
LogUtils.e("GlideCache", "来自网络下载");
break;
default:
LogUtils.e("GlideCache", "来自: " + dataSource);
@@ -606,16 +606,16 @@ public class ImageUtils {
switch (dataSource) {
case DATA_DISK_CACHE:
case RESOURCE_DISK_CACHE:
LogUtils.e("GlideCache", "来自磁盘缓存",path);
LogUtils.e("GlideCache", "来自磁盘缓存");
break;
case MEMORY_CACHE:
LogUtils.e("GlideCache", "来自内存缓存",path);
LogUtils.e("GlideCache", "来自内存缓存");
break;
case LOCAL: // 本地文件
LogUtils.e("GlideCache", "来自本地文件",path);
LogUtils.e("GlideCache", "来自本地文件");
break;
case REMOTE: // 网络下载
LogUtils.e("GlideCache", "来自网络下载",path);
LogUtils.e("GlideCache", "来自网络下载");
break;
default:
LogUtils.e("GlideCache", "来自: " + dataSource);