Commit 673f3714a72f6038bc4e3e8450ec6933b27d5645
1 parent
571cc4d6
称重和摄像头调试
Showing
1 changed file
with
31 additions
and
9 deletions
src/main/java/com/huaheng/pc/system/serailPort/controller/SerailPortController.java
... | ... | @@ -53,6 +53,7 @@ public class SerailPortController extends BaseController { |
53 | 53 | private ConfigMapper configMapper; |
54 | 54 | |
55 | 55 | private String listenStr=null; |
56 | + private String listenStr1=null; | |
56 | 57 | |
57 | 58 | private int readNum=0; |
58 | 59 | |
... | ... | @@ -186,7 +187,7 @@ public class SerailPortController extends BaseController { |
186 | 187 | ShowUtils.warningMessage("没有搜索到有效串口!"); |
187 | 188 | } else { |
188 | 189 | SerialPort serialPort= ShiroUtilsV.serialPort; |
189 | - //System.out.println("---------44444444-"+serialPort); | |
190 | +// System.out.println("---------44444444-"+serialPort); | |
190 | 191 | if(serialPort==null){ |
191 | 192 | openPortV(commName,baudrate); |
192 | 193 | try { |
... | ... | @@ -218,15 +219,35 @@ public class SerailPortController extends BaseController { |
218 | 219 | // 读取串口数据 |
219 | 220 | data = SerialPortManager.readFromPort(mSerialport); |
220 | 221 | String str = new String(data); |
221 | - //System.out.println("======================="+str); | |
222 | - if(str.length()>5){ | |
223 | - listenStr=str; | |
224 | - //System.out.println("======================="+listenStr); | |
225 | - } | |
226 | - if(StringUtils.isNotEmpty(listenStr)){ | |
227 | - listenStr=listenStr.substring(2,listenStr.length()); | |
222 | +// System.out.println("===========str============"+str); | |
223 | + if(baudrate==1200){ | |
224 | + if(str.length()>5){ | |
225 | + listenStr=str; | |
226 | + //System.out.println("======================="+listenStr); | |
227 | + } | |
228 | + if(StringUtils.isNotEmpty(listenStr)){ | |
229 | + listenStr=listenStr.substring(2,listenStr.length()); | |
230 | + } | |
231 | + }else if(baudrate==9600){ | |
232 | + //listenStr=str; | |
233 | + if(str.length()>=8){ | |
234 | + listenStr1=str; | |
235 | + //System.out.println("======================="+listenStr); | |
236 | + } | |
237 | + if(str.length()<8){ | |
238 | + listenStr=listenStr1+str; | |
239 | + listenStr=listenStr.substring(2,listenStr.length()); | |
240 | +// System.out.println("===========1============"+listenStr); | |
241 | + if(listenStr.contains("kg")){ | |
242 | + listenStr=listenStr.split("kg")[0]; | |
243 | + } | |
244 | + | |
245 | +// System.out.println("===========2============"+listenStr); | |
246 | + } | |
247 | + | |
228 | 248 | } |
229 | 249 | |
250 | + | |
230 | 251 | } |
231 | 252 | }); |
232 | 253 | } catch (Exception e) { |
... | ... | @@ -303,7 +324,7 @@ public class SerailPortController extends BaseController { |
303 | 324 | readData(); |
304 | 325 | readNum++; |
305 | 326 | } |
306 | - System.out.println("================="+result); | |
327 | +// System.out.println("================="+result); | |
307 | 328 | if(StringUtils.isEmpty(result)){ |
308 | 329 | return ""; |
309 | 330 | } |
... | ... | @@ -312,4 +333,5 @@ public class SerailPortController extends BaseController { |
312 | 333 | //return result; |
313 | 334 | } |
314 | 335 | |
336 | + | |
315 | 337 | } |
... | ... |