projects
/
icsupport.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b8f60b0
47726d9
)
Merge branch 'mqtt_test' of server-git:incartech/protocol_srv into mqtt_test
author
TrillGates
<williamtrillgates@gmail.com>
Tue, 3 Aug 2021 02:46:45 +0000
(10:46 +0800)
committer
TrillGates
<williamtrillgates@gmail.com>
Tue, 3 Aug 2021 02:46:45 +0000
(10:46 +0800)
1
2
app/src/main/java/com/enqualcomm/support/Config.java
patch
|
diff1
|
diff2
|
blob
|
history
app/src/main/java/com/ic/protocols/protocolAPIHelper.java
patch
|
diff1
|
diff2
|
blob
|
history
app/src/main/java/com/ic/protocols/protocol_fzd.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
app/src/main/java/com/enqualcomm/support/Config.java
Simple merge
diff --cc
app/src/main/java/com/ic/protocols/protocolAPIHelper.java
Simple merge
diff --cc
app/src/main/java/com/ic/protocols/protocol_fzd.java
index
bb25171
,
b6e6ac8
..
a144dee
---
1
/
app/src/main/java/com/ic/protocols/protocol_fzd.java
---
2
/
app/src/main/java/com/ic/protocols/protocol_fzd.java
+++ b/
app/src/main/java/com/ic/protocols/protocol_fzd.java
@@@
-2866,8
-2875,9
+2866,9
@@@
public class protocol_fzd
ICLogger.d("members result == > " + str);
//对数据进行切割
String[] split = str.split(CMD_SPLIT);
- if
(split != null && split.length % 3 != 0)
{
+ if
(split != null && split.length % 3 != 0)
{
str = str + "0";
+ ICLogger.d("str result == > " + str);
split = str.split(CMD_SPLIT);
}
//每3个为一组