Quellcode durchsuchen

Merge remote-tracking branch 'origin/develop' into release

release_toaliyun_real
luozukai vor 7 Jahren
Ursprung
Commit
e5e78bd3b6
2 geänderte Dateien mit 6 neuen und 6 gelöschten Zeilen
  1. +4
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxDeviceServiceImpl.java
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxScreenAdServiceImpl.java

+ 4
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxDeviceServiceImpl.java Datei anzeigen

@@ -64,12 +64,12 @@ public class WxDeviceServiceImpl implements WxDeviceService {
} }


if (type == EnumDeviceType.SCREEN.getCode()) { if (type == EnumDeviceType.SCREEN.getCode()) {
Integer heartBeatIntervel = jConfig.getInteger("heartbeatInterval");
Integer dataRefreshIntervel = jConfig.getInteger("dataRefreshInterval");
Integer heartBeatInterval = jConfig.getInteger("heartbeatInterval");
Integer dataRefreshInterval = jConfig.getInteger("dataRefreshInterval");
Integer pageChangeInterval = jConfig.getInteger("pageChangeInterval"); Integer pageChangeInterval = jConfig.getInteger("pageChangeInterval");
Integer animationTheme = jConfig.getInteger("animationTheme"); Integer animationTheme = jConfig.getInteger("animationTheme");
if (heartBeatIntervel == null ||
dataRefreshIntervel == null ||
if (heartBeatInterval == null ||
dataRefreshInterval == null ||
pageChangeInterval == null || pageChangeInterval == null ||
animationTheme == null) { animationTheme == null) {
return false; return false;


+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxScreenAdServiceImpl.java Datei anzeigen

@@ -152,10 +152,10 @@ public class WxScreenAdServiceImpl implements WxScreenAdService {
} }
} }


private static int QRCODE_WIDTH = 300;
private static int QRCODE_WIDTH = 280;
private static String QRCODE_PAGE_HOME = "pages/index/index"; private static String QRCODE_PAGE_HOME = "pages/index/index";
private static boolean QRCODE_AUTO_COLOR = false; private static boolean QRCODE_AUTO_COLOR = false;
private static boolean QRCODE_IS_HYALINE = false;
private static boolean QRCODE_IS_HYALINE = true;
//private static int QRCODE_LINCOLOR =; //private static int QRCODE_LINCOLOR =;


private static String QRCODE_JUMP_CMD_HOME = "JH"; private static String QRCODE_JUMP_CMD_HOME = "JH";


Laden…
Abbrechen
Speichern