Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
fmp_epay
Overview
Overview
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhenfei.zhang
fmp_epay
Commits
cdcd1627
Commit
cdcd1627
authored
Apr 20, 2017
by
Carwyn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1. 解决业务插件在主线程调用停止服务卡死问题;
parent
6aa8b2c2
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
8 deletions
+21
-8
fmp_epay.cpp
+10
-0
fmp_epay.h
+3
-1
fmp_epay_i.h
+7
-6
version.h
+1
-1
No files found.
fmp_epay.cpp
View file @
cdcd1627
...
...
@@ -22,6 +22,16 @@ FMPePay::FMPePay(ctkPluginContext *context)
{
}
FMPePay
::~
FMPePay
()
{
StopService
();
if
(
d_ptr
)
{
delete
d_ptr
;
d_ptr
=
nullptr
;
}
}
void
FMPePay
::
InitService
()
{
if
(
_inited
)
return
;
...
...
fmp_epay.h
View file @
cdcd1627
...
...
@@ -13,11 +13,13 @@ class FMPePay : public FMPePayInterface
{
Q_OBJECT
Q_INTERFACES
(
FMPBaseInterface
)
Q_INTERFACES
(
FMPluginInterface
)
Q_INTERFACES
(
FMPePayInterface
)
Q_DECLARE_PRIVATE
(
FMPePay
)
public
:
FMPePay
(
ctkPluginContext
*
context
);
explicit
FMPePay
(
ctkPluginContext
*
context
);
virtual
~
FMPePay
();
void
SetBasicInfo
(
QVariantHash
hash
);
...
...
fmp_epay_i.h
View file @
cdcd1627
...
...
@@ -10,21 +10,22 @@
class
FMPePayInterface
:
public
QObject
,
public
FMPluginInterface
{
Q_OBJECT
Q_INTERFACES
(
FMPBaseInterface
)
Q_INTERFACES
(
FMPluginInterface
)
public
:
explicit
FMPePayInterface
(
ctkPluginContext
*
ctx
)
:
FMPluginInterface
(
ctx
)
{
connect
(
this
,
&
FMPePayInterface
::
TriggerInit
,
this
,
&
FMPePayInterface
::
InitService
);
connect
(
this
,
&
FMPePayInterface
::
TriggerUninit
,
this
,
&
FMPePayInterface
::
UninitService
);
connect
(
this
,
&
FMPePayInterface
::
TriggerInit
,
this
,
&
FMPePayInterface
::
OnTriggerInit
);
connect
(
this
,
&
FMPePayInterface
::
TriggerUninit
,
this
,
&
FMPePayInterface
::
OnTriggerUninit
);
}
protected
slots
:
void
InitService
()
=
0
;
void
UninitService
()
=
0
;
signals
:
void
TriggerInit
();
void
TriggerUninit
();
protected
slots
:
void
OnTriggerInit
()
{
FMPluginInterface
::
OnTriggerInit
();
}
void
OnTriggerUninit
()
{
FMPluginInterface
::
OnTriggerUninit
();
}
// /**
// * @brief ShowPayDialog
// * 呈现支付主界面
...
...
version.h
View file @
cdcd1627
...
...
@@ -5,7 +5,7 @@
#define VER_MINOR 1
#define VER_REVISION 0
#define VER_BUILD
4
#define VER_BUILD
6
//! Convert version numbers to string
#define _STR(S) #S
...
...
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