| 
						
						
							
								
							
						
						
					 | 
					 | 
					@ -406,7 +406,7 @@ public class WaterLevelSwitchStrategy implements DeviceStrategy { | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					                addr = ExchangeStringUtil.hexToDec(checkStr.substring(0, 2));//地址
 | 
					 | 
					 | 
					 | 
					                addr = ExchangeStringUtil.hexToDec(checkStr.substring(0, 2));//地址
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					                if (checkStr.substring(2, 4).equals("03")) { | 
					 | 
					 | 
					 | 
					                if (checkStr.substring(2, 4).equals("03")) { | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					                    if (registerAddr != null && !registerAddr.equals("")) { | 
					 | 
					 | 
					 | 
					                    if (registerAddr != null && !registerAddr.equals("")) { | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					                        if (registerAddr.equals("0018")){ | 
					 | 
					 | 
					 | 
					//                        if (registerAddr.equals("0018")){
 | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					                            l1 = checkStr.substring(6, 10); | 
					 | 
					 | 
					 | 
					                            l1 = checkStr.substring(6, 10); | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					                            l2 = checkStr.substring(10, 14); | 
					 | 
					 | 
					 | 
					                            l2 = checkStr.substring(10, 14); | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					                            l3 = checkStr.substring(14, 18); | 
					 | 
					 | 
					 | 
					                            l3 = checkStr.substring(14, 18); | 
				
			
			
		
	
	
		
		
			
				
					| 
						
						
						
							
								
							
						
					 | 
					 | 
					@ -415,7 +415,7 @@ public class WaterLevelSwitchStrategy implements DeviceStrategy { | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					                            l6 = checkStr.substring(26, 30); | 
					 | 
					 | 
					 | 
					                            l6 = checkStr.substring(26, 30); | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					                            l7 = checkStr.substring(30, 34); | 
					 | 
					 | 
					 | 
					                            l7 = checkStr.substring(30, 34); | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					                            l8 = checkStr.substring(34, 38); | 
					 | 
					 | 
					 | 
					                            l8 = checkStr.substring(34, 38); | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					                        } | 
					 | 
					 | 
					 | 
					//                        }
 | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					                    } | 
					 | 
					 | 
					 | 
					                    } | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					                } else if (checkStr.substring(2, 4).equals("06") || checkStr.substring(2, 4).equals("04")) { | 
					 | 
					 | 
					 | 
					                } else if (checkStr.substring(2, 4).equals("06") || checkStr.substring(2, 4).equals("04")) { | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					                    log.info("时间:" + dateStr + ",水位开关ID:" + addr + ",操作成功! "); | 
					 | 
					 | 
					 | 
					                    log.info("时间:" + dateStr + ",水位开关ID:" + addr + ",操作成功! "); | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					 | 
					
  |