|
@@ -107,21 +107,22 @@ public class SignageDrawRightUtil {
|
|
|
*/
|
|
|
public int[][] canvasRightOFFNotNetworkBitmapArrays(String dId) {
|
|
|
String resourcePath = "image/device/020201/init_right_default_20240601.jpg";
|
|
|
+ final String wbPath = "classpath:image/device/020201/init_right_default_20250217.jpg";
|
|
|
//特殊处理 电信白牌
|
|
|
for(String id: wbDeviceIds) {
|
|
|
if(id.equals(dId)) {
|
|
|
- resourcePath = "classpath:image/device/020201/init_right_default_20250217.jpg";
|
|
|
+ resourcePath = wbPath;
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
if(wbEnable && "default".equals(dId)){
|
|
|
logger.info("默认图片: 强制白牌");
|
|
|
//电信
|
|
|
- resourcePath = "classpath:image/device/020201/init_right_default_20250217.jpg";
|
|
|
+ resourcePath = wbPath;
|
|
|
}
|
|
|
if(wsForce) {
|
|
|
logger.info("强制白牌");
|
|
|
- resourcePath = "classpath:image/device/020201/init_right_default_20250217.jpg";
|
|
|
+ resourcePath = wbPath;
|
|
|
}
|
|
|
logger.info("设备ID {}, 默认图: {}", dId, resourcePath);
|
|
|
// int[][] canvasBitmapArrays = XZPImageUtil.twoToCanvasBitmapArrays(XZPImageUtil.canvasImageBitmapArrays(resourcePath,width,height,140),width,height);
|