2 Commits d0e2777cc2 ... 3f1a43397d

Author SHA1 Message Date
  xuzip 3f1a43397d Merge remote-tracking branch 'master/master' 1 day ago
  xuzip f4aff54a8c 1.修改 特殊处理电信白牌的默认和业务右图(当前采用设备ID进行区别) 1 day ago

+ 10 - 1
src/main/java/com/yeechart/dotMatrix/signage/SignageDrawRightUtil.java

@@ -98,8 +98,17 @@ public class SignageDrawRightUtil {
      *
      * @return
      */
-    public  int[][] canvasRightOFFNotNetworkBitmapArrays() {
+    public  int[][] canvasRightOFFNotNetworkBitmapArrays(String dId) {
         String resourcePath = "image/device/020201/init_right_default_20240601.jpg";
+        //特殊处理 电信白牌
+        if("1Ow61P3WM".equals(dId) ||
+                "1OvYDdG8w".equals(dId) ||
+                "1OAUzwkak".equals(dId) ||
+                "1OBP8PIY0".equals(dId) ||
+                "1OAFPlupi".equals(dId)
+        ){
+            resourcePath = "classpath:image/device/020201/init_right_default_20250217.jpg";
+        }
 //        int[][] canvasBitmapArrays =  XZPImageUtil.twoToCanvasBitmapArrays(XZPImageUtil.canvasImageBitmapArrays(resourcePath,width,height,140),width,height);
 //        String text = "未绑定设备";
 //        int[][] fontBinaryArray = XZPDrawtextUtil.drawingText(text,textFontSizeCheck,noChineseFontSizeCheck);

+ 1 - 1
src/main/java/com/yeechart/dotMatrix/signage/SignageDrawUtil.java

@@ -403,7 +403,7 @@ public class SignageDrawUtil {
             //检查是否要重新生成
             if (!isContainsNetwork || !isContainsNotNetwork) {
                 //获取初始图
-                int[][] canvasDefaultBitmapArrays = signingDrawRightUtil.canvasRightOFFNotNetworkBitmapArrays();
+                int[][] canvasDefaultBitmapArrays = signingDrawRightUtil.canvasRightOFFNotNetworkBitmapArrays(ter020201InfoVo.getDeId());
 
                 //绘制未配网的图
                 if (!isContainsNotNetwork) {

BIN
src/main/resources/image/device/020201/init_right_default_20250217.jpg