Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
colorEagleStdio
zoompipeline
提交
07f8e237
zoompipeline
项目概览
colorEagleStdio
/
zoompipeline
通知
181
Star
12
Fork
4
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
zoompipeline
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
07f8e237
编写于
2月 26, 2014
作者:
丁劲犇
😸
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Upload Box2Svr userids tested!
上级
9bc41c98
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
247 addition
and
89 deletion
+247
-89
DatabaseMod/smartlink_svr.sqlite
DatabaseMod/smartlink_svr.sqlite
+0
-0
FunctionalClientTest/maindialog.cpp
FunctionalClientTest/maindialog.cpp
+62
-0
FunctionalClientTest/maindialog.h
FunctionalClientTest/maindialog.h
+2
-0
FunctionalClientTest/maindialog.ui
FunctionalClientTest/maindialog.ui
+172
-80
ZoomPipeline_FuncSvr/smartlink/st_clientnode_app_imp.cpp
ZoomPipeline_FuncSvr/smartlink/st_clientnode_app_imp.cpp
+11
-0
ZoomPipeline_FuncSvr/smartlink/st_clientnode_applayer.cpp
ZoomPipeline_FuncSvr/smartlink/st_clientnode_applayer.cpp
+0
-9
未找到文件。
DatabaseMod/smartlink_svr.sqlite
浏览文件 @
07f8e237
无法预览此类型文件
FunctionalClientTest/maindialog.cpp
浏览文件 @
07f8e237
...
...
@@ -6,6 +6,7 @@
#include <time.h>
#include <QMessageBox>
#include <string.h>
#include <QVector>
using
namespace
SmartLink
;
MainDialog
::
MainDialog
(
QWidget
*
parent
)
:
QDialog
(
parent
),
...
...
@@ -31,6 +32,7 @@ MainDialog::MainDialog(QWidget *parent) :
ui
->
plainTextEdit_boxSerialNum
->
setPlainText
(
settings
.
value
(
"settings/box2svr_insid"
,
"Temporary Equip_id for test only, by goldenhawking@163.com.64Bts"
).
toString
());
ui
->
lineEdit_username
->
setText
(
settings
.
value
(
"settings/client2svr_username"
,
"debug"
).
toString
());
ui
->
lineEdit_password
->
setText
(
settings
.
value
(
"settings/client2svr_password"
,
"debug"
).
toString
());
ui
->
plainTextEdit_box_userids
->
setPlainText
(
settings
.
value
(
"settings/box2svr_uploadid"
,
"0,"
).
toString
());
}
MainDialog
::~
MainDialog
()
...
...
@@ -112,6 +114,7 @@ void MainDialog::saveIni()
settings
.
setValue
(
"settings/box2svr_insid"
,
ui
->
plainTextEdit_boxSerialNum
->
toPlainText
());
settings
.
setValue
(
"settings/client2svr_username"
,
ui
->
lineEdit_username
->
text
());
settings
.
setValue
(
"settings/client2svr_password"
,
ui
->
lineEdit_password
->
text
());
settings
.
setValue
(
"settings/box2svr_uploadid"
,
ui
->
plainTextEdit_box_userids
->
toPlainText
());
}
void
MainDialog
::
timerEvent
(
QTimerEvent
*
evt
)
...
...
@@ -296,6 +299,53 @@ void MainDialog::on_pushButton_CrTime_clicked()
//3/10 possibility to send a data block to server
client
->
SendData
(
array
);
}
void
MainDialog
::
on_pushButton_box_upload_uid_clicked
()
{
saveIni
();
QStringList
lst
=
ui
->
plainTextEdit_box_userids
->
toPlainText
().
split
(
","
);
QVector
<
quint32
>
vecInt
;
foreach
(
QString
item
,
lst
)
{
vecInt
.
push_back
(
item
.
toUInt
());
}
quint16
nMsgLen
=
sizeof
(
SMARTLINK_MSG_APP
::
tag_app_layer_header
)
+
sizeof
(
stMsg_UploadUserListReq
)
+
sizeof
(
quint32
)
*
vecInt
.
size
();
QByteArray
array
(
sizeof
(
SMARTLINK_MSG
)
+
nMsgLen
-
1
,
0
);
char
*
ptr
=
array
.
data
();
SMARTLINK_MSG
*
pMsg
=
(
SMARTLINK_MSG
*
)
ptr
;
SMARTLINK_MSG_APP
*
pApp
=
(
SMARTLINK_MSG_APP
*
)(((
unsigned
char
*
)
(
ptr
))
+
sizeof
(
SMARTLINK_MSG
)
-
1
);
pMsg
->
Mark
=
0x55AA
;
pMsg
->
version
=
1
;
pMsg
->
SerialNum
=
0
;
pMsg
->
Priority
=
1
;
pMsg
->
Reserved1
=
0
;
pMsg
->
source_id
=
(
quint32
)((
quint64
)(
ui
->
lineEdit_boxid
->
text
().
toUInt
())
&
0xffffffff
);
pMsg
->
destin_id
=
(
quint32
)((
quint64
)(
0x00000001
)
&
0xffffffff
);;
pMsg
->
data_length
=
nMsgLen
;
pMsg
->
Reserved2
=
0
;
pApp
->
header
.
AskID
=
0x01
;
pApp
->
header
.
MsgType
=
0x1003
;
pApp
->
header
.
MsgFmtVersion
=
0x01
;
pApp
->
MsgUnion
.
msg_UploadUserListReq
.
UserNum
=
(
quint16
)(
vecInt
.
size
()
&
0x00ffff
);
for
(
int
i
=
0
;
i
<
vecInt
.
size
();
i
++
)
pApp
->
MsgUnion
.
msg_UploadUserListReq
.
pUserIDList
[
i
]
=
vecInt
[
i
];
//3/10 possibility to send a data block to server
client
->
SendData
(
array
);
}
void
MainDialog
::
on_pushButton_box_download_uid_clicked
()
{
}
//!deal one message, affect m_currentRedOffset,m_currentMessageSize,m_currentHeader
//!return bytes Used.
...
...
@@ -481,6 +531,18 @@ int MainDialog::deal_current_message_block()
);
ui
->
lineEdit_userid
->
setText
(
QString
(
"%1"
).
arg
(
pApp
->
MsgUnion
.
msg_ClientLoginRsp
.
UserID
));
}
else
if
(
pApp
->
header
.
MsgType
==
0x1803
)
{
if
(
pApp
->
MsgUnion
.
msg_UploadUserListRsp
.
DoneCode
==
0
)
QMessageBox
::
information
(
this
,
tr
(
"Succeed!"
),
tr
(
"upload succeed!"
));
else
QMessageBox
::
information
(
this
,
tr
(
"Failed!"
),
tr
(
"upload in Failed!"
));
displayMessage
(
tr
(
"Res = %1, Text = %2"
)
.
arg
(
pApp
->
MsgUnion
.
msg_UploadUserListRsp
.
DoneCode
)
.
arg
(
pApp
->
MsgUnion
.
msg_UploadUserListRsp
.
TextInfo
)
);
}
m_currentBlock
=
QByteArray
();
...
...
FunctionalClientTest/maindialog.h
浏览文件 @
07f8e237
...
...
@@ -61,6 +61,8 @@ public slots:
void
on_pushButton_Login_clicked
();
void
on_pushButton_clientLogin_clicked
();
void
on_pushButton_CrTime_clicked
();
void
on_pushButton_box_upload_uid_clicked
();
void
on_pushButton_box_download_uid_clicked
();
};
#endif // MAINDIALOG_H
FunctionalClientTest/maindialog.ui
浏览文件 @
07f8e237
...
...
@@ -6,8 +6,8 @@
<rect>
<x>
0
</x>
<y>
0
</y>
<width>
4
00
</width>
<height>
3
00
</height>
<width>
4
95
</width>
<height>
3
56
</height>
</rect>
</property>
<property
name=
"windowTitle"
>
...
...
@@ -17,7 +17,7 @@
<item>
<widget
class=
"QTabWidget"
name=
"tabWidget"
>
<property
name=
"currentIndex"
>
<number>
1
</number>
<number>
0
</number>
</property>
<widget
class=
"QWidget"
name=
"tab_control"
>
<attribute
name=
"title"
>
...
...
@@ -91,87 +91,179 @@
<attribute
name=
"title"
>
<string>
BoxToServer
</string>
</attribute>
<layout
class=
"QVBoxLayout"
name=
"verticalLayout_
4
"
>
<layout
class=
"QVBoxLayout"
name=
"verticalLayout_
6
"
>
<item>
<widget
class=
"Q
Label"
name=
"label
"
>
<property
name=
"t
ext
"
>
<
string>
Box Serial Number
</string
>
<widget
class=
"Q
TabWidget"
name=
"tabWidget_2
"
>
<property
name=
"t
abPosition
"
>
<
enum>
QTabWidget::South
</enum
>
</property>
<property
name=
"tabShape"
>
<enum>
QTabWidget::Triangular
</enum>
</property>
<property
name=
"currentIndex"
>
<number>
0
</number>
</property>
<widget
class=
"QWidget"
name=
"tab"
>
<attribute
name=
"title"
>
<string>
login
</string>
</attribute>
<layout
class=
"QVBoxLayout"
name=
"verticalLayout_4"
>
<item>
<widget
class=
"QLabel"
name=
"label"
>
<property
name=
"text"
>
<string>
Box Serial Number
</string>
</property>
</widget>
</item>
<item>
<widget
class=
"QPlainTextEdit"
name=
"plainTextEdit_boxSerialNum"
/>
</item>
<item>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout_3"
>
<item>
<widget
class=
"QLabel"
name=
"label_2"
>
<property
name=
"text"
>
<string>
Box ID
</string>
</property>
</widget>
</item>
<item>
<widget
class=
"QLineEdit"
name=
"lineEdit_boxid"
>
<property
name=
"readOnly"
>
<bool>
true
</bool>
</property>
</widget>
</item>
<item>
<spacer
name=
"horizontalSpacer_2"
>
<property
name=
"orientation"
>
<enum>
Qt::Horizontal
</enum>
</property>
<property
name=
"sizeHint"
stdset=
"0"
>
<size>
<width>
40
</width>
<height>
20
</height>
</size>
</property>
</spacer>
</item>
<item>
<widget
class=
"QPushButton"
name=
"pushButton_regisit"
>
<property
name=
"text"
>
<string>
Regisit
</string>
</property>
</widget>
</item>
<item>
<widget
class=
"QPushButton"
name=
"pushButton_Login"
>
<property
name=
"text"
>
<string>
Log in
</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout_7"
>
<item>
<widget
class=
"QLabel"
name=
"label_8"
>
<property
name=
"text"
>
<string>
Time Correct
</string>
</property>
</widget>
</item>
<item>
<widget
class=
"QLineEdit"
name=
"lineEdit_box_time"
>
<property
name=
"readOnly"
>
<bool>
true
</bool>
</property>
</widget>
</item>
<item>
<widget
class=
"QPushButton"
name=
"pushButton_CrTime"
>
<property
name=
"text"
>
<string>
Correct
</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<widget
class=
"QWidget"
name=
"tab_2"
>
<attribute
name=
"title"
>
<string>
relations
</string>
</attribute>
<layout
class=
"QVBoxLayout"
name=
"verticalLayout_7"
>
<item>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout_8"
>
<item>
<widget
class=
"QLabel"
name=
"label_9"
>
<property
name=
"text"
>
<string>
Upload Relations ( , splitted)
</string>
</property>
</widget>
</item>
<item>
<spacer
name=
"horizontalSpacer_4"
>
<property
name=
"orientation"
>
<enum>
Qt::Horizontal
</enum>
</property>
<property
name=
"sizeHint"
stdset=
"0"
>
<size>
<width>
40
</width>
<height>
20
</height>
</size>
</property>
</spacer>
</item>
<item>
<widget
class=
"QPushButton"
name=
"pushButton_box_upload_uid"
>
<property
name=
"text"
>
<string>
Upload
</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget
class=
"QPlainTextEdit"
name=
"plainTextEdit_box_userids"
/>
</item>
<item>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout_9"
>
<item>
<widget
class=
"QLabel"
name=
"label_10"
>
<property
name=
"text"
>
<string>
download Relations
</string>
</property>
</widget>
</item>
<item>
<spacer
name=
"horizontalSpacer_3"
>
<property
name=
"orientation"
>
<enum>
Qt::Horizontal
</enum>
</property>
<property
name=
"sizeHint"
stdset=
"0"
>
<size>
<width>
40
</width>
<height>
20
</height>
</size>
</property>
</spacer>
</item>
<item>
<widget
class=
"QPushButton"
name=
"pushButton_box_download_uid"
>
<property
name=
"text"
>
<string>
Download
</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</widget>
</item>
<item>
<widget
class=
"QPlainTextEdit"
name=
"plainTextEdit_boxSerialNum"
/>
</item>
<item>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout_3"
>
<item>
<widget
class=
"QLabel"
name=
"label_2"
>
<property
name=
"text"
>
<string>
Box ID
</string>
</property>
</widget>
</item>
<item>
<widget
class=
"QLineEdit"
name=
"lineEdit_boxid"
>
<property
name=
"readOnly"
>
<bool>
true
</bool>
</property>
</widget>
</item>
<item>
<spacer
name=
"horizontalSpacer_2"
>
<property
name=
"orientation"
>
<enum>
Qt::Horizontal
</enum>
</property>
<property
name=
"sizeHint"
stdset=
"0"
>
<size>
<width>
40
</width>
<height>
20
</height>
</size>
</property>
</spacer>
</item>
<item>
<widget
class=
"QPushButton"
name=
"pushButton_regisit"
>
<property
name=
"text"
>
<string>
Regisit
</string>
</property>
</widget>
</item>
<item>
<widget
class=
"QPushButton"
name=
"pushButton_Login"
>
<property
name=
"text"
>
<string>
Log in
</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout_7"
>
<item>
<widget
class=
"QLabel"
name=
"label_8"
>
<property
name=
"text"
>
<string>
Time Correct
</string>
</property>
</widget>
</item>
<item>
<widget
class=
"QLineEdit"
name=
"lineEdit_box_time"
>
<property
name=
"readOnly"
>
<bool>
true
</bool>
</property>
</widget>
</item>
<item>
<widget
class=
"QPushButton"
name=
"pushButton_CrTime"
>
<property
name=
"text"
>
<string>
Correct
</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<widget
class=
"QWidget"
name=
"tab_client2Svr"
>
...
...
ZoomPipeline_FuncSvr/smartlink/st_clientnode_app_imp.cpp
浏览文件 @
07f8e237
...
...
@@ -409,6 +409,17 @@ bool st_clientNodeAppLayer::Box2Svr_UploadUserTable()
(
const
SMARTLINK_MSG_APP
*
)(
((
const
char
*
)(
m_currentBlock
.
constData
()))
+
sizeof
(
SMARTLINK_MSG
)
-
1
);
if
(
m_currentMessageSize
!=
sizeof
(
SMARTLINK_MSG
)
-
1
+
sizeof
(
SMARTLINK_MSG_APP
::
tag_app_layer_header
)
+
sizeof
(
stMsg_UploadUserListReq
)
+
sizeof
(
quint32
)
*
(
pAppLayer
->
MsgUnion
.
msg_UploadUserListReq
.
UserNum
)
)
{
emit
evt_Message
(
tr
(
"Broken Message stMsg_UploadUserListReq, size not correct."
));
return
false
;
}
//form Msgs
quint16
nMsgLen
=
sizeof
(
SMARTLINK_MSG_APP
::
tag_app_layer_header
)
+
sizeof
(
stMsg_UploadUserListRsp
);
...
...
ZoomPipeline_FuncSvr/smartlink/st_clientnode_applayer.cpp
浏览文件 @
07f8e237
...
...
@@ -351,15 +351,6 @@ bool st_clientNodeAppLayer::Deal_Box2Svr_Msgs()
emit
evt_Message
(
tr
(
"Broken Message stMsg_UploadUserListReq, size not correct."
));
res
=
false
;
}
else
if
(
m_currentMessageSize
!=
sizeof
(
SMARTLINK_MSG
)
-
1
+
sizeof
(
SMARTLINK_MSG_APP
::
tag_app_layer_header
)
+
sizeof
(
stMsg_UploadUserListReq
)
+
(
quint32
)(
m_current_app_header
.
MsgUnion
.
msg_UploadUserListReq
.
UserNum
)
*
sizeof
(
quint32
))
{
emit
evt_Message
(
tr
(
"Broken Message stMsg_UploadUserListReq, size not correct."
));
res
=
false
;
}
else
res
=
this
->
Box2Svr_UploadUserTable
();
break
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录