8000 LView load*与run*系列接口统一返回错误描述字符串 · pythonzz/LuaViewSDK@70b9b04 · GitHub
[go: up one dir, main page]
Skip to content

Commit 70b9b04

Browse files
LamodLamod
committed
LView load*与run*系列接口统一返回错误描述字符串
1 parent 88d5eb1 commit 70b9b04

File tree

3 files changed

+24
-12
lines changed

3 files changed

+24
-12
lines changed

‎IOS/LuaViewSDK/Classes/LView.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,18 +83,18 @@
8383
*
8484
* @param fileName 本地文件名
8585
*
86-
* @return 返回lvL_loadbuffer的返回值
86+
* @return 返回错误描述
8787
*/
88-
-(int) loadSignFile:(NSString *)fileName;
88+
-(NSString*) loadSignFile:(NSString *)fileName;
8989

9090
/**
9191
* 加载脚本文件，读取文件并调用lvL_loadbuffer
9292
*
9393
* @param fileName 本地文件名
9494
*
95-
* @return 返回lvL_loadbuffer的返回值
95+
* @return 返回错误描述
9696
*/
97-
-(int) loadFile:(NSString *)fileName;
97+
-(NSString*) loadFile:(NSString *)fileName;
9898

9999
/**
100100
*

‎IOS/LuaViewSDK/Classes/LView.m

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -137,27 +137,39 @@ -(void) checkDebugOrNot:(const char*) chars length:(NSInteger) len fileName:(NSS
137137
}
138138
}
139139

140-
- (int)loadFile:(NSString *)fileName {
140+
- (NSString*)loadFile:(NSString *)fileName {
141141
NSData* code = [LVUtil dataReadFromFile:fileName package:self.package];
142142
return [self loadData:code fileName:fileName];
143143
}
144144

145-
- (int)loadSignFile:(NSString *)fileName {
145+
- (NSString*)loadSignFile:(NSString *)fileName {
146146
NSData* code = [LVPkgManager readLuaFile:fileName package:self.package rsa:self.rsa];
147147
return [self loadData:code fileName:fileName];
148148
}
149149

150-
- (int)loadData:(NSData *)data fileName:(NSString *)fileName {
150+
- (NSString*)loadData:(NSData *)data fileName:(NSString *)fileName {
151151
if (!data || !data.length || !fileName || !fileName.length) {
152-
return -1;
152+
LVError( @"running chars == NULL");
153+
return @"running chars == NULL";
153154
}
154155

155156
#ifdef DEBUG
156157
[self checkDeuggerIsRunningToLoadDebugModel];
157158
[self checkDebugOrNot:data.bytes length:data.length fileName:fileName];
158159
#endif
159160

160-
return lvL_loadbuffer(self.l, data.bytes, data.length, fileName.UTF8String);
161+
int error = lvL_loadbuffer(self.l, data.bytes, data.length, fileName.UTF8String);
162+
if (error) {
163+
const char* s = lv_tostring(self.l, -1);
164+
LVError( @"%s", s );
165+
#ifdef DEBUG
166+
NSString* string = [NSString stringWithFormat:@"[LuaView][error] %s\n",s];
167+
lv_printToServer(self.l, string.UTF8String, 0);
168+
#endif
169+
return [NSString stringWithFormat:@"%s",s];
170+
} else {
171+
return nil;
172+
}
161173
}
162174

163175
#ifdef DEBUG
@@ -237,7 +249,7 @@ -(NSString*) runData:(NSData *)data fileName:(NSString*)fileName{
237249
const char* s = lv_tostring(self.l, -1);
238250
LVError( @"%s", s );
239251
#ifdef DEBUG
240-
NSString* string = [NSString stringWithFormat:@"[LuaView][error] %s",s];
252+
NSString* string = [NSString stringWithFormat:@"[LuaView][error] %s\n",s];
241253
lv_printToServer(self.l, string.UTF8String, 0);
242254
#endif
243255
return [NSString stringWithFormat:@"%s",s];

‎IOS/LuaViewSDK/Classes/lvsdk/LVRegisterManager.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,10 +233,10 @@ static int requireMethodForLuaView (lv_State *L) {
233233
if( lview ) {
234234
if ( lview.runInSignModel ) {
235235
fileName = [NSString stringWithFormat:@"%@.lv",fileName];
236-
return [lview loadSignFile:fileName] == 0 ? 1 : 0;
236+
return [lview loadSignFile:fileName] == nil ? 1 : 0;
237237
} else {
238238
fileName = [NSString stringWithFormat:@"%@.lua",fileName];
239-
return [lview loadFile:fileName] == 0 ? 1 : 0;
239+
return [lview loadFile:fileName] == nil ? 1 : 0;
240240
}
241241
}
242242
}

0 commit comments

Comments
 (0)
0