Commit 158ce1b3 authored by captainwong's avatar captainwong

fix 2

parent bbf06a30
......@@ -86,7 +86,7 @@ JNIEXPORT jstring JNICALL Java_javademo_jni_AdemcoHbLibrary_pack2
std::string s = env->GetStringUTFChars(xdata, &iscopy);
auto xdata_ = ademco::makeXData(s.data(), s.size());
ademco::AdemcoPacket ap;
char buff[1024];
char buff[1024] = {0};
auto res = ap.make_hb(buff, sizeof(buff), static_cast<uint16_t>(seq),
sacct, static_cast<size_t>(ademco_id), static_cast<unsigned char>(gg),
static_cast<ademco::ADEMCO_EVENT>(ademco_event), static_cast<size_t>(zone), xdata_);
......@@ -130,6 +130,7 @@ JNIEXPORT jcharArray JNICALL Java_javademo_jni_AdemcoHbLibrary_pack3
sacct, static_cast<size_t>(ademco_id), static_cast<unsigned char>(gg),
static_cast<ademco::ADEMCO_EVENT>(ademco_event), static_cast<size_t>(zone), xdata_);
if (res > 0) {
printf("res=%d\n", res);
buff[res] = 0;
//auto ascii = ademco::detail::toString(buff, res, ademco::detail::ToStringOption::ALL_CHAR_AS_HEX, false, false);
//memcpy(buff, ascii.data(), ascii.size());
......
......@@ -24,7 +24,7 @@ public class SimpleServer {
String HEX_STRING = "0123456789ABCDEF";
String s = "";
for(int i = 0; i < b.length; i++){
char c = b[i];
byte c = b[i];
if(32 <= c && c <= 127){
s += (char)c;
}else{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment