Переглянути джерело

feat: 增加强制白牌的配置

Armer song 2 тижнів тому
батько
коміт
6b162aad02

+ 1 - 1
pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>com.example</groupId>
     <artifactId>DotMatrix</artifactId>
-    <version>0.2.2</version>
+    <version>0.2.3</version>
     <name>DotMatrix</name>
     <description>DotMatrix</description>
 

+ 7 - 2
src/main/java/com/yeechart/dotMatrix/signage/SignageDrawRightUtil.java

@@ -33,7 +33,8 @@ public class SignageDrawRightUtil {
     private Boolean wbEnable;
     @Value("${wb.device_ids}")
     private String[] wbDeviceIds;
-
+    @Value("${wb.force}")
+    private Boolean wsForce;
     /*********** 右屏 默认的 点阵数据的形成  ********************/
 
     /**
@@ -114,10 +115,14 @@ public class SignageDrawRightUtil {
             }
         }
         if(wbEnable && "default".equals(dId)){
-            logger.info("强制白牌");
+            logger.info("默认图片: 强制白牌");
             //电信
             resourcePath = "classpath:image/device/020201/init_right_default_20250217.jpg";
         }
+        if(wsForce) {
+            logger.info("强制白牌");
+            resourcePath = "classpath:image/device/020201/init_right_default_20250217.jpg";
+        }
         logger.info("设备ID {}, 默认图: {}", dId, resourcePath);
 //        int[][] canvasBitmapArrays =  XZPImageUtil.twoToCanvasBitmapArrays(XZPImageUtil.canvasImageBitmapArrays(resourcePath,width,height,140),width,height);
 //        String text = "未绑定设备";

+ 1 - 0
src/main/resources/application.yml

@@ -8,4 +8,5 @@ oss:
   endpoint: filestoragetest.yeechart.com
 wb:
   enable: true
+  force: true
   device_ids: 1Ow61P3WM,1OvYDdG8w,1OAUzwkak,1OBP8PIY0,1OAFPlupi,1OwkswJ0c,1QeFHrHxu