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 total_gift_price: Int,
val win_count: Int, val win_count: Int,
val win_number: Int, val win_number: Int,
val win_type_name: String val win_type_name: String,
val base_image: String
) )
data class OpenMonsterBean( 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); EventBus.getDefault().post(monsterInfo.data);
break; break;
case 3032: case 3032:
RealTimeMessages<OpenMonsterBean> openMonster = // RealTimeMessages<OpenMonsterBean> openMonster =
GsonUtils.fromJson( // GsonUtils.fromJson(
message, // message,
new TypeToken<RealTimeMessages<OpenMonsterBean>>() {}.getType() // new TypeToken<RealTimeMessages<OpenMonsterBean>>() {}.getType()
); // );
EventBus.getDefault().post(openMonster.data); // EventBus.getDefault().post(openMonster.data);
break; break;
case 3033: case 3033:
RealTimeMessages<MonsterEndBean> monsterEndBean = 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) { switch (dataSource) {
case DATA_DISK_CACHE: case DATA_DISK_CACHE:
case RESOURCE_DISK_CACHE: case RESOURCE_DISK_CACHE:
LogUtils.e("GlideCache", "来自磁盘缓存",url); LogUtils.e("GlideCache", "来自磁盘缓存");
break; break;
case MEMORY_CACHE: case MEMORY_CACHE:
LogUtils.e("GlideCache", "来自内存缓存",url); LogUtils.e("GlideCache", "来自内存缓存");
break; break;
case LOCAL: // 本地文件 case LOCAL: // 本地文件
LogUtils.e("GlideCache", "来自本地文件",url); LogUtils.e("GlideCache", "来自本地文件");
break; break;
case REMOTE: // 网络下载 case REMOTE: // 网络下载
LogUtils.e("GlideCache", "来自网络下载",url); LogUtils.e("GlideCache", "来自网络下载");
break; break;
default: default:
LogUtils.e("GlideCache", "来自: " + dataSource); LogUtils.e("GlideCache", "来自: " + dataSource);
@@ -85,7 +85,7 @@ public class ImageLoader {
@Override @Override
public boolean onLoadFailed(@Nullable GlideException e, Object model, public boolean onLoadFailed(@Nullable GlideException e, Object model,
Target<Drawable> target, boolean isFirstResource) { Target<Drawable> target, boolean isFirstResource) {
Log.e("GlideCache", "加载失败"+"path:"+url, e); Log.e("GlideCache", "加载失败"+"path:", e);
return false; return false;
} }
}).thumbnail(0.3f).into(view); }).thumbnail(0.3f).into(view);
@@ -103,16 +103,16 @@ public class ImageLoader {
switch (dataSource) { switch (dataSource) {
case DATA_DISK_CACHE: case DATA_DISK_CACHE:
case RESOURCE_DISK_CACHE: case RESOURCE_DISK_CACHE:
LogUtils.e("GlideCache", "来自磁盘缓存",url); LogUtils.e("GlideCache", "来自磁盘缓存");
break; break;
case MEMORY_CACHE: case MEMORY_CACHE:
LogUtils.e("GlideCache", "来自内存缓存",url); LogUtils.e("GlideCache", "来自内存缓存");
break; break;
case LOCAL: // 本地文件 case LOCAL: // 本地文件
LogUtils.e("GlideCache", "来自本地文件",url); LogUtils.e("GlideCache", "来自本地文件");
break; break;
case REMOTE: // 网络下载 case REMOTE: // 网络下载
LogUtils.e("GlideCache", "来自网络下载",url); LogUtils.e("GlideCache", "来自网络下载");
break; break;
default: default:
LogUtils.e("GlideCache", "来自: " + dataSource); LogUtils.e("GlideCache", "来自: " + dataSource);
@@ -123,7 +123,7 @@ public class ImageLoader {
@Override @Override
public boolean onLoadFailed(@Nullable GlideException e, Object model, public boolean onLoadFailed(@Nullable GlideException e, Object model,
Target<Drawable> target, boolean isFirstResource) { Target<Drawable> target, boolean isFirstResource) {
Log.e("GlideCache", "加载失败"+"path:"+url, e); Log.e("GlideCache", "加载失败"+"path:", e);
return false; return false;
} }
}).thumbnail(0.3f).into(view); }).thumbnail(0.3f).into(view);
@@ -141,16 +141,16 @@ public class ImageLoader {
switch (dataSource) { switch (dataSource) {
case DATA_DISK_CACHE: case DATA_DISK_CACHE:
case RESOURCE_DISK_CACHE: case RESOURCE_DISK_CACHE:
LogUtils.e("GlideCache", "来自磁盘缓存",url); LogUtils.e("GlideCache", "来自磁盘缓存");
break; break;
case MEMORY_CACHE: case MEMORY_CACHE:
LogUtils.e("GlideCache", "来自内存缓存",url); LogUtils.e("GlideCache", "来自内存缓存");
break; break;
case LOCAL: // 本地文件 case LOCAL: // 本地文件
LogUtils.e("GlideCache", "来自本地文件",url); LogUtils.e("GlideCache", "来自本地文件");
break; break;
case REMOTE: // 网络下载 case REMOTE: // 网络下载
LogUtils.e("GlideCache", "来自网络下载",url); LogUtils.e("GlideCache", "来自网络下载");
break; break;
default: default:
LogUtils.e("GlideCache", "来自: " + dataSource); LogUtils.e("GlideCache", "来自: " + dataSource);
@@ -161,7 +161,7 @@ public class ImageLoader {
@Override @Override
public boolean onLoadFailed(@Nullable GlideException e, Object model, public boolean onLoadFailed(@Nullable GlideException e, Object model,
Target<Drawable> target, boolean isFirstResource) { Target<Drawable> target, boolean isFirstResource) {
Log.e("GlideCache", "加载失败"+"path:"+url, e); Log.e("GlideCache", "加载失败"+"path:", e);
return false; return false;
} }
}).thumbnail(0.3f).into(view); }).thumbnail(0.3f).into(view);
@@ -178,16 +178,16 @@ public class ImageLoader {
switch (dataSource) { switch (dataSource) {
case DATA_DISK_CACHE: case DATA_DISK_CACHE:
case RESOURCE_DISK_CACHE: case RESOURCE_DISK_CACHE:
LogUtils.e("GlideCache", "来自磁盘缓存",url); LogUtils.e("GlideCache", "来自磁盘缓存");
break; break;
case MEMORY_CACHE: case MEMORY_CACHE:
LogUtils.e("GlideCache", "来自内存缓存",url); LogUtils.e("GlideCache", "来自内存缓存");
break; break;
case LOCAL: // 本地文件 case LOCAL: // 本地文件
LogUtils.e("GlideCache", "来自本地文件",url); LogUtils.e("GlideCache", "来自本地文件");
break; break;
case REMOTE: // 网络下载 case REMOTE: // 网络下载
LogUtils.e("GlideCache", "来自网络下载",url); LogUtils.e("GlideCache", "来自网络下载");
break; break;
default: default:
LogUtils.e("GlideCache", "来自: " + dataSource); LogUtils.e("GlideCache", "来自: " + dataSource);
@@ -198,7 +198,7 @@ public class ImageLoader {
@Override @Override
public boolean onLoadFailed(@Nullable GlideException e, Object model, public boolean onLoadFailed(@Nullable GlideException e, Object model,
Target<Drawable> target, boolean isFirstResource) { Target<Drawable> target, boolean isFirstResource) {
Log.e("GlideCache", "加载失败"+"path:"+url, e); Log.e("GlideCache", "加载失败"+"path:", e);
return false; return false;
} }
}).thumbnail(0.3f).into(view); }).thumbnail(0.3f).into(view);
@@ -222,16 +222,16 @@ public class ImageLoader {
switch (dataSource) { switch (dataSource) {
case DATA_DISK_CACHE: case DATA_DISK_CACHE:
case RESOURCE_DISK_CACHE: case RESOURCE_DISK_CACHE:
LogUtils.e("GlideCache", "来自磁盘缓存",url); LogUtils.e("GlideCache", "来自磁盘缓存");
break; break;
case MEMORY_CACHE: case MEMORY_CACHE:
LogUtils.e("GlideCache", "来自内存缓存",url); LogUtils.e("GlideCache", "来自内存缓存");
break; break;
case LOCAL: // 本地文件 case LOCAL: // 本地文件
LogUtils.e("GlideCache", "来自本地文件",url); LogUtils.e("GlideCache", "来自本地文件");
break; break;
case REMOTE: // 网络下载 case REMOTE: // 网络下载
LogUtils.e("GlideCache", "来自网络下载",url); LogUtils.e("GlideCache", "来自网络下载");
break; break;
default: default:
LogUtils.e("GlideCache", "来自: " + dataSource); LogUtils.e("GlideCache", "来自: " + dataSource);
@@ -242,7 +242,7 @@ public class ImageLoader {
@Override @Override
public boolean onLoadFailed(@Nullable GlideException e, Object model, public boolean onLoadFailed(@Nullable GlideException e, Object model,
Target<Drawable> target, boolean isFirstResource) { Target<Drawable> target, boolean isFirstResource) {
Log.e("GlideCache", "加载失败"+"path:"+url, e); Log.e("GlideCache", "加载失败"+"path:", e);
return false; return false;
} }
}).thumbnail(0.3f).into(view); }).thumbnail(0.3f).into(view);
@@ -261,16 +261,16 @@ public class ImageLoader {
switch (dataSource) { switch (dataSource) {
case DATA_DISK_CACHE: case DATA_DISK_CACHE:
case RESOURCE_DISK_CACHE: case RESOURCE_DISK_CACHE:
LogUtils.e("GlideCache", "来自磁盘缓存",url); LogUtils.e("GlideCache", "来自磁盘缓存");
break; break;
case MEMORY_CACHE: case MEMORY_CACHE:
LogUtils.e("GlideCache", "来自内存缓存",url); LogUtils.e("GlideCache", "来自内存缓存");
break; break;
case LOCAL: // 本地文件 case LOCAL: // 本地文件
LogUtils.e("GlideCache", "来自本地文件",url); LogUtils.e("GlideCache", "来自本地文件");
break; break;
case REMOTE: // 网络下载 case REMOTE: // 网络下载
LogUtils.e("GlideCache", "来自网络下载",url); LogUtils.e("GlideCache", "来自网络下载");
break; break;
default: default:
LogUtils.e("GlideCache", "来自: " + dataSource); LogUtils.e("GlideCache", "来自: " + dataSource);
@@ -281,7 +281,7 @@ public class ImageLoader {
@Override @Override
public boolean onLoadFailed(@Nullable GlideException e, Object model, public boolean onLoadFailed(@Nullable GlideException e, Object model,
Target<Drawable> target, boolean isFirstResource) { Target<Drawable> target, boolean isFirstResource) {
Log.e("GlideCache", "加载失败"+"path:"+url, e); Log.e("GlideCache", "加载失败"+"path:", e);
return false; return false;
} }
}) })

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

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

16
MainModule/src/main/java/com/xscm/modulemain/dialog/TourClubDialogFragment.java
View File

@@ -6,6 +6,7 @@ import android.os.Bundle;
import android.os.CountDownTimer; import android.os.CountDownTimer;
import android.os.Handler; import android.os.Handler;
import android.view.Gravity; import android.view.Gravity;
import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.Window; import android.view.Window;
@@ -86,6 +87,8 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
private static final int AUTO_SCROLL_DELAY = 1000; // 1秒滚动一个item private static final int AUTO_SCROLL_DELAY = 1000; // 1秒滚动一个item
private boolean vCheckbox=false; private boolean vCheckbox=false;
private Dialog dialog;
@Override @Override
protected GiftLotteryPresenter bindPresenter() { protected GiftLotteryPresenter bindPresenter() {
return new GiftLotteryPresenter(this, getActivity()); return new GiftLotteryPresenter(this, getActivity());
@@ -107,9 +110,10 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
@Nullable @Nullable
@Override @Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
Dialog dialog = super.onCreateDialog(savedInstanceState); dialog = super.onCreateDialog(savedInstanceState);
dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
dialog.setCancelable(true); dialog.setCancelable(true);
dialog.setCanceledOnTouchOutside(true);
return dialog; return dialog;
} }
@@ -268,6 +272,7 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
prepareForNewLottery(); prepareForNewLottery();
num = "1"; num = "1";
MvpPre.xlhChou(roomId, num); MvpPre.xlhChou(roomId, num);
} else { } else {
// com.hjq.toast.ToastUtils.show("正在抽奖中..."); // com.hjq.toast.ToastUtils.show("正在抽奖中...");
} }
@@ -322,6 +327,12 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
vCheckbox=mBinding.vCheckbox.isSelected(); vCheckbox=mBinding.vCheckbox.isSelected();
} }
if (isDrawing){
dialog.setCancelable(false);
dialog.setCanceledOnTouchOutside(false);
}
// 通过 ID 获取资源名称 // 通过 ID 获取资源名称
String viewName = ""; String viewName = "";
try { try {
@@ -1011,6 +1022,8 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
*/ */
private void showResultDialog(List<XlhDrawBean> data) { private void showResultDialog(List<XlhDrawBean> data) {
isDrawing = false; isDrawing = false;
dialog.setCancelable(true);
dialog.setCanceledOnTouchOutside(true);
// 创建并显示对话框 // 创建并显示对话框
// 关闭之前可能存在的对话框 // 关闭之前可能存在的对话框
// if (xlhObtainDialog != null && xlhObtainDialog.isShowing()) { // if (xlhObtainDialog != null && xlhObtainDialog.isShowing()) {
@@ -1023,6 +1036,7 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
@Override @Override
public void onPlayAgainClick() { public void onPlayAgainClick() {
isDrawing = true; isDrawing = true;
// 处理再玩一次点击事件 // 处理再玩一次点击事件
MvpPre.xlhChou(roomId, num); MvpPre.xlhChou(roomId, num);
} }

32
MainModule/src/main/java/com/xscm/modulemain/dialog/refining/BoxInputMultipleDialog.kt
View File

@@ -29,12 +29,18 @@ class BoxInputMultipleDialog() :
private var money = "" private var money = ""
private lateinit var monsterInfoBean: MonsterInfoBean private lateinit var monsterInfoBean: MonsterInfoBean
constructor(multiple: String, name: String, onSelectResultListener: OnSelectResultListener, liveActivity: RoomActivity, monsterInfoBean:MonsterInfoBean) : this() { constructor(
multiple: String,
name: String,
onSelectResultListener: OnSelectResultListener,
liveActivity: RoomActivity,
monsterInfoBean: MonsterInfoBean
) : this() {
this.onSelectResultListener = onSelectResultListener this.onSelectResultListener = onSelectResultListener
this.multiple = multiple this.multiple = multiple
this.name = name this.name = name
this.liveActivity=liveActivity this.liveActivity = liveActivity
this.monsterInfoBean=monsterInfoBean this.monsterInfoBean = monsterInfoBean
} }
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -84,9 +90,14 @@ class BoxInputMultipleDialog() :
mBinding.number.doAfterTextChanged { editable -> mBinding.number.doAfterTextChanged { editable ->
// 文本改变后的操作 var text: String = "0"
val text = editable?.toString() ?: "" if (editable != null && editable.toString().isNotEmpty()) {
mBinding.tvIntegral.text = "金币${(text.toInt() * monsterInfoBean.open_monster_price.toInt())}/$money" // 文本改变后的操作
text = editable.toString()
}
mBinding.tvIntegral.text =
"金币${(text.toInt() * monsterInfoBean.open_monster_price.toInt())}/$money"
} }
@@ -96,7 +107,7 @@ class BoxInputMultipleDialog() :
mBinding.rvContainer.itemAnimator = null mBinding.rvContainer.itemAnimator = null
mBinding.rvContainer.layoutManager = GridLayoutManager(requireContext(), 3) mBinding.rvContainer.layoutManager = GridLayoutManager(requireContext(), 3)
val adapter = BoxInputMultipleAdapter() val adapter = BoxInputMultipleAdapter()
adapter.setNewData(arrayListOf("1","10", "20", "30", "50", "100")) adapter.setNewData(arrayListOf("1", "10", "20", "30", "50", "100"))
adapter.setOnItemClickListener { _, _, position -> adapter.setOnItemClickListener { _, _, position ->
adapter.setSelectPosition(position) adapter.setSelectPosition(position)
mBinding.number.setText(adapter.data[position]) mBinding.number.setText(adapter.data[position])
@@ -112,12 +123,13 @@ class BoxInputMultipleDialog() :
// viewModel.monsterInfo.value?.let { // viewModel.monsterInfo.value?.let {
// mBinding.tvIntegral.text = "金币${(num * it.open_monster_price.toInt())}/$money" // mBinding.tvIntegral.text = "金币${(num * it.open_monster_price.toInt())}/$money"
// } // }
mBinding.tvIntegral.text = "金币${(num * monsterInfoBean.open_monster_price.toInt())}/$money" mBinding.tvIntegral.text =
"金币${(num * monsterInfoBean.open_monster_price.toInt())}/$money"
} }
private fun updateTextViews(info: MonsterInfoBean) { private fun updateTextViews(info: MonsterInfoBean) {
mBinding.tvTextNum.text = "${info.open_monster_price}金币/次" mBinding.tvTextNum.text = "${info.open_monster_price}金币/次"
mBinding.tvIntegral.text = "金币${(info.open_monster_price.toInt())}/$money" mBinding.tvIntegral.text = "金币${(info.open_monster_price.toInt())}/$money"
} }
private fun setupMultipleImages() { private fun setupMultipleImages() {

34
MainModule/src/main/java/com/xscm/modulemain/dialog/refining/BoxMainDialog2.kt
View File

@@ -190,26 +190,32 @@ class BoxMainDialog2() :
@Subscribe // 个人抽奖播报 @Subscribe // 个人抽奖播报
fun openMonster(openMonster: OpenMonsterBean) { fun openMonster(openMonster: OpenMonsterBean) {
if (openMonster.is_win == 1) { // if (openMonster.is_win == 1) {
mBinding.llResult.visibility = View.VISIBLE // mBinding.llResult.visibility = View.VISIBLE
mBinding.tvTypeName.text = "中奖：${openMonster.type_name}" // mBinding.tvTypeName.text = "中奖：${openMonster.type_name}"
ImageUtils.loadHead(openMonster.base_image, mBinding.ivGift) // ImageUtils.loadHead(openMonster.base_image, mBinding.ivGift)
// GlideUtil.loadImglogo(requireContext(), openMonster.base_image, mBinding.ivGift) //// GlideUtil.loadImglogo(requireContext(), openMonster.base_image, mBinding.ivGift)
mBinding.tvGiftName.text = openMonster.gift_name + "*" + openMonster.num // mBinding.tvGiftName.text = openMonster.gift_name + "*" + openMonster.num
mBinding.tvGiftPrice.text = openMonster.gift_price // mBinding.tvGiftPrice.text = openMonster.gift_price
} else { // } else {
mBinding.tvTypeName2.text = "中奖：${openMonster.type_name}" // mBinding.tvTypeName2.text = "中奖：${openMonster.type_name}"
mBinding.llFial.visibility = View.VISIBLE // mBinding.llFial.visibility = View.VISIBLE
} // }
} }
@Subscribe // 抽奖结束播报 @Subscribe // 抽奖结束播报
fun monsterEnd(monsterEnd: MonsterEndBean) { fun monsterEnd(monsterEnd: MonsterEndBean) {
if (monsterEnd.is_finsh == 1) { // if (monsterEnd.is_push_message == 1) {
// mBinding.tvTypeName2.text = "中奖财神：${monsterEnd.win_type_name}" // mBinding.tvTypeName2.text = "中奖财神：${monsterEnd.win_type_name}"
// mBinding.llFial.visibility = View.VISIBLE
} mBinding.llResult.visibility = View.VISIBLE
mBinding.tvTypeName.text = "中奖：${monsterEnd.win_type_name}"
ImageUtils.loadHead(monsterEnd.base_image, mBinding.ivGift)
// GlideUtil.loadImglogo(requireContext(), openMonster.base_image, mBinding.ivGift)
mBinding.tvGiftName.text = monsterEnd.gift_name + "*" + monsterEnd.num
mBinding.tvGiftPrice.text = monsterEnd.total_gift_price.toString()
// }
} }

32
MainModule/src/main/res/layout/dialog_box_main2.xml
View File

@@ -256,8 +256,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fontFamily="@font/fredoka_one" android:fontFamily="@font/fredoka_one"
android:gravity="center" android:gravity="center"
android:textColor="#FFBB49" android:textColor="#FFEB49"
android:textSize="18sp" android:background="@mipmap/text_box_bj"
android:textSize="16sp"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@id/tv_multiple1" app:layout_constraintBottom_toTopOf="@id/tv_multiple1"
app:layout_constraintLeft_toLeftOf="@id/tv_multiple1" app:layout_constraintLeft_toLeftOf="@id/tv_multiple1"
@@ -271,8 +272,9 @@
android:gravity="center" android:gravity="center"
android:text="" android:text=""
android:fontFamily="@font/fredoka_one" android:fontFamily="@font/fredoka_one"
android:textColor="#FFBB49" android:textColor="#FFEB49"
android:textSize="18sp" android:background="@mipmap/text_box_bj"
android:textSize="16sp"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/tv_multiple2" app:layout_constraintBottom_toTopOf="@+id/tv_multiple2"
app:layout_constraintLeft_toLeftOf="@id/tv_multiple2" app:layout_constraintLeft_toLeftOf="@id/tv_multiple2"
@@ -285,8 +287,9 @@
android:gravity="center" android:gravity="center"
android:text="" android:text=""
android:fontFamily="@font/fredoka_one" android:fontFamily="@font/fredoka_one"
android:textColor="#FFBB49" android:textColor="#FFEB49"
android:textSize="18sp" android:background="@mipmap/text_box_bj"
android:textSize="16sp"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintLeft_toLeftOf="@id/tv_multiple5" app:layout_constraintLeft_toLeftOf="@id/tv_multiple5"
app:layout_constraintRight_toRightOf="@id/tv_multiple5" app:layout_constraintRight_toRightOf="@id/tv_multiple5"
@@ -299,8 +302,9 @@
android:gravity="center" android:gravity="center"
android:text="" android:text=""
android:fontFamily="@font/fredoka_one" android:fontFamily="@font/fredoka_one"
android:textColor="#FFBB49" android:textColor="#FFEB49"
android:textSize="18sp" android:background="@mipmap/text_box_bj"
android:textSize="16sp"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@+id/anim_wealth3" app:layout_constraintBottom_toBottomOf="@+id/anim_wealth3"
app:layout_constraintLeft_toLeftOf="@id/anim_wealth3" app:layout_constraintLeft_toLeftOf="@id/anim_wealth3"
@@ -313,8 +317,9 @@
android:gravity="center" android:gravity="center"
android:text="" android:text=""
android:fontFamily="@font/fredoka_one" android:fontFamily="@font/fredoka_one"
android:textColor="#FFBB49" android:textColor="#FFEB49"
android:textSize="18sp" android:background="@mipmap/text_box_bj"
android:textSize="16sp"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintLeft_toLeftOf="@id/anim_wealth4" app:layout_constraintLeft_toLeftOf="@id/anim_wealth4"
app:layout_constraintRight_toRightOf="@id/anim_wealth4" app:layout_constraintRight_toRightOf="@id/anim_wealth4"
@@ -327,8 +332,9 @@
android:gravity="center" android:gravity="center"
android:text="" android:text=""
android:fontFamily="@font/fredoka_one" android:fontFamily="@font/fredoka_one"
android:textColor="#FFBB49" android:textColor="#FFEB49"
android:textSize="18sp" android:background="@mipmap/text_box_bj"
android:textSize="16sp"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/tv_multiple6" app:layout_constraintBottom_toTopOf="@+id/tv_multiple6"
app:layout_constraintEnd_toEndOf="@+id/tv_multiple6" app:layout_constraintEnd_toEndOf="@+id/tv_multiple6"
@@ -422,7 +428,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginHorizontal="15dp" android:layout_marginHorizontal="15dp"
android:background="@mipmap/box_success" android:background="@mipmap/box_success1"
android:orientation="vertical" android:orientation="vertical"
android:visibility="gone" android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/constraint" app:layout_constraintBottom_toBottomOf="@id/constraint"

BIN
MainModule/src/main/res/mipmap-xxhdpi/box_fail.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 647 KiB

After

Width:  |  Height:  |  Size: 30 KiB

BIN
MainModule/src/main/res/mipmap-xxhdpi/box_success.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 645 KiB

After

Width:  |  Height:  |  Size: 29 KiB

BIN
MainModule/src/main/res/mipmap-xxhdpi/box_success1.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 30 KiB

BIN
MainModule/src/main/res/mipmap-xxhdpi/text_box_bj.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 636 B