Commit cbf7dc2a authored by duanruiming's avatar duanruiming

[update] 修改红灯倒计时3

parent a6e745b1
...@@ -273,14 +273,19 @@ public class HisensePhaseCountDownTask { ...@@ -273,14 +273,19 @@ public class HisensePhaseCountDownTask {
turnColor = (Map<Integer, String>) dirLampGroupMap.get(dir); turnColor = (Map<Integer, String>) dirLampGroupMap.get(dir);
} }
List<CrossLightsPO> value = entry.getValue(); List<CrossLightsPO> value = entry.getValue();
int type = 1;
for (CrossLightsPO crossLightsPO : value) { for (CrossLightsPO crossLightsPO : value) {
Integer turn = crossLightsPO.getTurn(); Integer turn = crossLightsPO.getTurn();
type = crossLightsPO.getType();
// 搭接相位跳过绿灯变红灯 // 搭接相位跳过绿灯变红灯
if (turnColor.containsKey(turn) && turnColor.get(turn).equals("green")) { if (turnColor.containsKey(turn) && turnColor.get(turn).equals("green")) {
continue; continue;
} }
turnColor.put(turn, "red"); turnColor.put(turn, "red");
} }
if (type == 2) {
setAllTurnColor(turnColor, "red"); //红灯时,圆饼灯操作
}
turnColor.put(3, "green"); turnColor.put(3, "green");
dirLampGroupMap.put(dir, turnColor); dirLampGroupMap.put(dir, turnColor);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment