From 071a8328823a2861f93ce556a4da3e4119cab1a3 Mon Sep 17 00:00:00 2001
From: panlili2024 <14743743+panlili2024@user.noreply.gitee.com>
Date: 星期四, 19 九月 2024 16:24:28 +0800
Subject: [PATCH] 完成金茂定制功能
---
HDL_TTLSDK485/src/main/java/com/hdl/sdk/ttl/Utils/HDLUtlis/HDLUtlis.java | 39 ++++++++++++++++++++++-----------------
1 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/HDL_TTLSDK485/src/main/java/com/hdl/sdk/ttl/Utils/HDLUtlis/HDLUtlis.java b/HDL_TTLSDK485/src/main/java/com/hdl/sdk/ttl/Utils/HDLUtlis/HDLUtlis.java
index 135fb82..5cf4442 100644
--- a/HDL_TTLSDK485/src/main/java/com/hdl/sdk/ttl/Utils/HDLUtlis/HDLUtlis.java
+++ b/HDL_TTLSDK485/src/main/java/com/hdl/sdk/ttl/Utils/HDLUtlis/HDLUtlis.java
@@ -2,6 +2,7 @@
import java.math.BigDecimal;
import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
/**
* Created by JLChen on 2019/7/25
@@ -10,24 +11,25 @@
/**
* 灏唎bject杞负Integer绫诲瀷
+ *
* @param object
* @return
*/
- public static Integer getIntegerByObject(Object object){
+ public static Integer getIntegerByObject(Object object) {
Integer in = null;
- if(object!=null){
- if(object instanceof Integer){
- in = (Integer)object;
- }else if(object instanceof String){
- in = Integer.parseInt((String)object);
- }else if(object instanceof Double){
- in = (int)((double)object);
- }else if(object instanceof Float){
- in = (int)((float)object);
- }else if(object instanceof BigDecimal){
- in = ((BigDecimal)object).intValue();
- }else if(object instanceof Long){
- in = ((Long)object).intValue();
+ if (object != null) {
+ if (object instanceof Integer) {
+ in = (Integer) object;
+ } else if (object instanceof String) {
+ in = Integer.parseInt((String) object);
+ } else if (object instanceof Double) {
+ in = (int) ((double) object);
+ } else if (object instanceof Float) {
+ in = (int) ((float) object);
+ } else if (object instanceof BigDecimal) {
+ in = ((BigDecimal) object).intValue();
+ } else if (object instanceof Long) {
+ in = ((Long) object).intValue();
}
}
return in;
@@ -35,6 +37,7 @@
/**
* int绫诲瀷杞�4瀛楄妭byte鏁扮粍
+ *
* @param mInt
* @return 4瀛楄妭byte鏁扮粍
*/
@@ -50,6 +53,7 @@
/**
* byte[]杞琲nt
+ *
* @param bytes
* @return
*/
@@ -65,12 +69,12 @@
public static float byte2Float(byte[] bytes) {
- if (bytes.length != 4) {
+ /* if (bytes.length != 4) {
return 0;
- }
+ }*/
byte b[] = bytes;
ByteBuffer buf = ByteBuffer.allocateDirect(4);
-// buf=buf.order(ByteOrder.LITTLE_ENDIAN);灏忕鐢ㄨ繖琛屼唬鐮侊紝榛樿澶х杞崲
+ buf = buf.order(ByteOrder.LITTLE_ENDIAN);//灏忕鐢ㄨ繖琛屼唬鐮侊紝榛樿澶х杞崲
buf.put(b);
buf.rewind();
float f2 = buf.getFloat();
@@ -79,6 +83,7 @@
/**
* 璋冩暣int 绫诲瀷鍙傛暟
+ *
* @return progress
*/
public static int getTrueProgressInt(int progress) {
--
Gitblit v1.8.0