Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
A
ademco_hb
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
captainwong
ademco_hb
Commits
21e2ec9d
Commit
21e2ec9d
authored
4 years ago
by
captainwong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add pack2
parent
7c9b950b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
39 additions
and
1 deletion
+39
-1
dllmain.cpp
examples/javademo/cpp/dllmain.cpp
+18
-0
javademo_jni_AdemcoHbLibrary.h
examples/javademo/cpp/javademo_jni_AdemcoHbLibrary.h
+8
-0
AdemcoHbLibrary.java
examples/javademo/jni/AdemcoHbLibrary.java
+13
-1
No files found.
examples/javademo/cpp/dllmain.cpp
View file @
21e2ec9d
...
...
@@ -76,6 +76,24 @@ JNIEXPORT jstring JNICALL Java_javademo_jni_AdemcoHbLibrary_pack
return
0
;
}
JNIEXPORT
jstring
JNICALL
Java_javademo_jni_AdemcoHbLibrary_pack2
(
JNIEnv
*
env
,
jobject
,
jint
seq
,
jint
ademco_id
,
jint
ademco_event
,
jint
zone
,
jint
gg
,
jstring
xdata
)
{
jboolean
iscopy
=
0
;
std
::
string
s
=
env
->
GetStringUTFChars
(
xdata
,
&
iscopy
);
auto
xdata_
=
ademco
::
makeXData
(
s
.
data
(),
s
.
size
());
ademco
::
AdemcoPacket
ap
;
char
buff
[
1024
];
auto
res
=
ap
.
make_hb
(
buff
,
sizeof
(
buff
),
static_cast
<
uint16_t
>
(
seq
),
nullptr
,
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
)
{
buff
[
res
]
=
0
;
return
env
->
NewStringUTF
(
buff
);
}
return
0
;
}
JNIEXPORT
jstring
JNICALL
Java_javademo_jni_AdemcoHbLibrary_packAck
(
JNIEnv
*
env
,
jobject
,
jint
seq
,
jint
ademco_id
)
{
...
...
This diff is collapsed.
Click to expand it.
examples/javademo/cpp/javademo_jni_AdemcoHbLibrary.h
View file @
21e2ec9d
...
...
@@ -31,6 +31,14 @@ JNIEXPORT jobject JNICALL Java_javademo_jni_AdemcoHbLibrary_parse
JNIEXPORT
jstring
JNICALL
Java_javademo_jni_AdemcoHbLibrary_pack
(
JNIEnv
*
,
jobject
,
jint
,
jint
,
jint
,
jint
,
jint
);
/*
* Class: javademo_jni_AdemcoHbLibrary
* Method: pack2
* Signature: (IIIIILjava/lang/String;)Ljava/lang/String;
*/
JNIEXPORT
jstring
JNICALL
Java_javademo_jni_AdemcoHbLibrary_pack2
(
JNIEnv
*
,
jobject
,
jint
,
jint
,
jint
,
jint
,
jint
,
jstring
);
/*
* Class: javademo_jni_AdemcoHbLibrary
* Method: packAck
...
...
This diff is collapsed.
Click to expand it.
examples/javademo/jni/AdemcoHbLibrary.java
View file @
21e2ec9d
...
...
@@ -39,7 +39,7 @@ public class AdemcoHbLibrary
public
native
ParseResult
parse
(
String
pack
,
int
pack_len
);
/*
* @brief 将远程控制命令打包成网络传输数据
* @brief 将远程控制命令
(不包含xdata)
打包成网络传输数据
* @param[in] seq 序号
* @param[in] ademco_id 安定宝ID
* @param[in] ademco_event 安定宝事件码
...
...
@@ -49,6 +49,18 @@ public class AdemcoHbLibrary
*/
public
native
String
pack
(
int
seq
,
int
ademco_id
,
int
ademco_event
,
int
zone
,
int
gg
);
/*
* @brief 将远程控制命令(包含xdata)打包成网络传输数据
* @param[in] seq 序号
* @param[in] ademco_id 安定宝ID
* @param[in] ademco_event 安定宝事件码
* @param[in] zone 防区号
* @param[in] gg 分防区号
* @return String
*/
public
native
String
pack2
(
int
seq
,
int
ademco_id
,
int
ademco_event
,
int
zone
,
int
gg
,
String
xdata
);
/*
* @brief 打包ACK
* @param[in] seq 序号
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment