|
@@ -168,41 +168,41 @@ public class CallingBedSendCommand {
|
|
|
* 快速写入串口时;串口反应不过来;所以必须将线程休眠
|
|
|
*/
|
|
|
public static void setNurseBrightness(SerialPortUtil serialPortUtil, int brightnessPercent, String oneColor, String twoColor, String threeColor, String fourColor, String fiveColor) throws InterruptedException {
|
|
|
- LogUtil.d("NURSELIGHT", "==" + oneColor + "==" + twoColor + "==" + threeColor + "==" + fourColor + "==" + fiveColor);
|
|
|
+ LogUtil.d("setNurseBrightness", "==" + oneColor + "==" + twoColor + "==" + threeColor + "==" + fourColor + "==" + fiveColor);
|
|
|
if (null != serialPortUtil) {
|
|
|
float p = (float) brightnessPercent / 100;
|
|
|
if (StringUtils.notEmpty(oneColor)) {
|
|
|
- int rr = (int) ((StringUtils.parseFloat(StringUtils.substringByLengh(oneColor, 0, 2))) * p);
|
|
|
- int gg = (int) ((StringUtils.parseFloat(StringUtils.substringByLengh(oneColor, 2, 4))) * p);
|
|
|
- int bb = (int) ((StringUtils.parseFloat(StringUtils.substringByLengh(oneColor, 4, 6))) * p);
|
|
|
+ int rr = (int) ((StringUtils.parseHexColor(StringUtils.substringByLengh(oneColor, 0, 2))) * p);
|
|
|
+ int gg = (int) ((StringUtils.parseHexColor(StringUtils.substringByLengh(oneColor, 2, 4))) * p);
|
|
|
+ int bb = (int) ((StringUtils.parseHexColor(StringUtils.substringByLengh(oneColor, 4, 6))) * p);
|
|
|
serialPortUtil.sendCommand(SerialPortUtil.NURSELIGHT + "0", beComeDoubleStr(rr) + beComeDoubleStr(gg) + beComeDoubleStr(bb), "F");
|
|
|
}
|
|
|
Thread.sleep(300);
|
|
|
if (StringUtils.notEmpty(twoColor)) {
|
|
|
- int rr = (int) ((StringUtils.parseFloat(StringUtils.substringByLengh(twoColor, 0, 2))) * p);
|
|
|
- int gg = (int) ((StringUtils.parseFloat(StringUtils.substringByLengh(twoColor, 2, 4))) * p);
|
|
|
- int bb = (int) ((StringUtils.parseFloat(StringUtils.substringByLengh(twoColor, 4, 6))) * p);
|
|
|
+ int rr = (int) ((StringUtils.parseHexColor(StringUtils.substringByLengh(twoColor, 0, 2))) * p);
|
|
|
+ int gg = (int) ((StringUtils.parseHexColor(StringUtils.substringByLengh(twoColor, 2, 4))) * p);
|
|
|
+ int bb = (int) ((StringUtils.parseHexColor(StringUtils.substringByLengh(twoColor, 4, 6))) * p);
|
|
|
serialPortUtil.sendCommand(SerialPortUtil.NURSELIGHT + "1", beComeDoubleStr(rr) + beComeDoubleStr(gg) + beComeDoubleStr(bb), "F");
|
|
|
}
|
|
|
Thread.sleep(300);
|
|
|
if (StringUtils.notEmpty(threeColor)) {
|
|
|
- int rr = (int) ((StringUtils.parseFloat(StringUtils.substringByLengh(threeColor, 0, 2))) * p);
|
|
|
- int gg = (int) ((StringUtils.parseFloat(StringUtils.substringByLengh(threeColor, 2, 4))) * p);
|
|
|
- int bb = (int) ((StringUtils.parseFloat(StringUtils.substringByLengh(threeColor, 4, 6))) * p);
|
|
|
+ int rr = (int) ((StringUtils.parseHexColor(StringUtils.substringByLengh(threeColor, 0, 2))) * p);
|
|
|
+ int gg = (int) ((StringUtils.parseHexColor(StringUtils.substringByLengh(threeColor, 2, 4))) * p);
|
|
|
+ int bb = (int) ((StringUtils.parseHexColor(StringUtils.substringByLengh(threeColor, 4, 6))) * p);
|
|
|
serialPortUtil.sendCommand(SerialPortUtil.NURSELIGHT + "2", beComeDoubleStr(rr) + beComeDoubleStr(gg) + beComeDoubleStr(bb), "F");
|
|
|
}
|
|
|
Thread.sleep(300);
|
|
|
if (StringUtils.notEmpty(fourColor)) {
|
|
|
- int rr = (int) ((StringUtils.parseFloat(StringUtils.substringByLengh(fourColor, 0, 2))) * p);
|
|
|
- int gg = (int) ((StringUtils.parseFloat(StringUtils.substringByLengh(fourColor, 2, 4))) * p);
|
|
|
- int bb = (int) ((StringUtils.parseFloat(StringUtils.substringByLengh(fourColor, 4, 6))) * p);
|
|
|
+ int rr = (int) ((StringUtils.parseHexColor(StringUtils.substringByLengh(fourColor, 0, 2))) * p);
|
|
|
+ int gg = (int) ((StringUtils.parseHexColor(StringUtils.substringByLengh(fourColor, 2, 4))) * p);
|
|
|
+ int bb = (int) ((StringUtils.parseHexColor(StringUtils.substringByLengh(fourColor, 4, 6))) * p);
|
|
|
serialPortUtil.sendCommand(SerialPortUtil.NURSELIGHT + "3", beComeDoubleStr(rr) + beComeDoubleStr(gg) + beComeDoubleStr(bb), "F");
|
|
|
}
|
|
|
Thread.sleep(300);
|
|
|
if (StringUtils.notEmpty(fiveColor)) {
|
|
|
- int rr = (int) ((StringUtils.parseFloat(StringUtils.substringByLengh(fiveColor, 0, 2))) * p);
|
|
|
- int gg = (int) ((StringUtils.parseFloat(StringUtils.substringByLengh(fiveColor, 2, 4))) * p);
|
|
|
- int bb = (int) ((StringUtils.parseFloat(StringUtils.substringByLengh(fiveColor, 4, 6))) * p);
|
|
|
+ int rr = (int) ((StringUtils.parseHexColor(StringUtils.substringByLengh(fiveColor, 0, 2))) * p);
|
|
|
+ int gg = (int) ((StringUtils.parseHexColor(StringUtils.substringByLengh(fiveColor, 2, 4))) * p);
|
|
|
+ int bb = (int) ((StringUtils.parseHexColor(StringUtils.substringByLengh(fiveColor, 4, 6))) * p);
|
|
|
serialPortUtil.sendCommand(SerialPortUtil.NURSELIGHT + "4", beComeDoubleStr(rr) + beComeDoubleStr(gg) + beComeDoubleStr(bb), "F");
|
|
|
}
|
|
|
}
|