@@ -110,15 +110,16 @@ def wxwork_close_callback(client_id):
110
110
111
111
112
112
class REQUIRE_WXLOADER :
113
- def __init__ (self , func ):
114
- self .func = func
113
+ def __call__ (self , func ):
115
114
116
- def __get__ ( self , obj , cls ):
115
+ @ wraps ( func )
117
116
def wrapper (* args , ** kwargs ):
117
+ obj , args = args [0 ], args [1 :]
118
118
if obj .WXLOADER is not None :
119
- return self .func (obj , * args , ** kwargs )
119
+
120
+ return func (obj , * args , ** kwargs )
120
121
else :
121
- logger .error ("WxWorkApi未初始化或初始化失败 " )
122
+ logger .error ("WxWorkApi init failed " )
122
123
return wrapper
123
124
124
125
@@ -139,7 +140,7 @@ def __init__(self, libs_path, wxwork_exe_path=''):
139
140
wxwork_loader_path = os .path .realpath (wxwork_loader_path )
140
141
141
142
if not os .path .exists (wxwork_loader_path ):
142
- logger .error ('libs目录错误,或dll文件不存在 ' )
143
+ logger .error ('libs path error or WxWorkLoader not exist ' )
143
144
return
144
145
145
146
self .WXLOADER = WinDLL (wxwork_loader_path )
@@ -152,39 +153,39 @@ def __init__(self, libs_path, wxwork_exe_path=''):
152
153
153
154
self .wxhelper_dll_path = '{0}/WxWorkHelper_{1}.dll' .format (libs_path , self .get_user_wxwork_version ())
154
155
if not os .path .exists (self .wxhelper_dll_path ):
155
- logger .error ('lib文件:%s不存在 ' , self .wxhelper_dll_path );
156
+ logger .error ('lib file:%s not exist ' , self .wxhelper_dll_path );
156
157
return
157
158
158
159
if wxwork_exe_path != '' and not os .path .exists (wxwork_exe_path ):
159
- logger .warning ('WXWork.exe路径是否设置正确 ?' )
160
+ logger .warning ('WXWork.exe is the path set correctly ?' )
160
161
161
162
self .wxwork_exe_path = wxwork_exe_path
162
163
163
164
def add_callback_handler (self , callback_handler ):
164
165
add_callback_handler (callback_handler )
165
166
166
- @REQUIRE_WXLOADER
167
+ @REQUIRE_WXLOADER ()
167
168
def get_user_wxwork_version (self ):
168
169
out = create_string_buffer (20 )
169
170
self .WXLOADER .GetUserWxWorkVersion (out )
170
171
return out .value .decode ('utf-8' )
171
172
172
- @REQUIRE_WXLOADER
173
+ @REQUIRE_WXLOADER ()
173
174
def manager_wxwork (self , smart = True ):
174
175
if smart :
175
176
return self .WXLOADER .InjectWxWork (c_string (self .wxhelper_dll_path ), c_string (self .wxwork_exe_path ))
176
177
else :
177
178
return self .WXLOADER .InjectWxWorkMultiOpen (c_string (self .wxhelper_dll_path ), c_string (self .wxwork_exe_path ))
178
179
179
- @REQUIRE_WXLOADER
180
+ @REQUIRE_WXLOADER ()
180
181
def manager_wxwork_by_pid (self , wxwork_pid ):
181
182
return self .WXLOADER .InjectWxWorkPid (wxwork_pid , c_string (self .wxhelper_dll_path ))
182
183
183
- @REQUIRE_WXLOADER
184
+ @REQUIRE_WXLOADER ()
184
185
def close_manager ():
185
186
return self .WXLOADER .DestroyWxWork ()
186
187
187
- @REQUIRE_WXLOADER
188
+ @REQUIRE_WXLOADER ()
188
189
def send_message (self , client_id , message_type , params ):
189
190
send_data = {
190
191
'type' : message_type ,
0 commit comments