From 61032df31a52973da7ff7a0a1a77a2857ea2cb43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=81=82=E5=95=86?= Date: Wed, 20 Jan 2016 14:58:20 +0800 Subject: [PATCH 01/13] =?UTF-8?q?loadData:fileName:=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E4=B8=AD=E5=90=91debug=20server=E5=8F=91=E9=80=81=E8=A2=AB?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IOS/LuaViewSDK/Classes/LView.m | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/IOS/LuaViewSDK/Classes/LView.m b/IOS/LuaViewSDK/Classes/LView.m index 121f0484..229fc85b 100644 --- a/IOS/LuaViewSDK/Classes/LView.m +++ b/IOS/LuaViewSDK/Classes/LView.m @@ -152,6 +152,11 @@ - (int)loadData:(NSData *)data fileName:(NSString *)fileName { return -1; } +#ifdef DEBUG + [self checkDeuggerIsRunningToLoadDebugModel]; + [self checkDebugOrNot:data.bytes length:data.length fileName:fileName]; +#endif + return lvL_loadbuffer(self.l, data.bytes, data.length, fileName.UTF8String); } From 383330a5d73ed702254c0fa21d3b327911d6b799 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=81=82=E5=95=86?= Date: Wed, 20 Jan 2016 15:09:36 +0800 Subject: [PATCH 02/13] =?UTF-8?q?LView=20load*=E4=B8=8Erun*=E7=B3=BB?= =?UTF-8?q?=E5=88=97=E6=8E=A5=E5=8F=A3=E7=BB=9F=E4=B8=80=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=8F=8F=E8=BF=B0=E5=AD=97=E7=AC=A6=E4=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IOS/LuaViewSDK/Classes/LView.h | 8 +++---- IOS/LuaViewSDK/Classes/LView.m | 24 ++++++++++++++----- .../Classes/lvsdk/LVRegisterManager.m | 4 ++-- 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/IOS/LuaViewSDK/Classes/LView.h b/IOS/LuaViewSDK/Classes/LView.h index e5669f93..b194e956 100644 --- a/IOS/LuaViewSDK/Classes/LView.h +++ b/IOS/LuaViewSDK/Classes/LView.h @@ -83,18 +83,18 @@ * * @param fileName 本地文件名 * - * @return 返回lvL_loadbuffer的返回值 + * @return 返回错误描述 */ --(int) loadSignFile:(NSString *)fileName; +-(NSString*) loadSignFile:(NSString *)fileName; /** * 加载脚本文件，读取文件并调用lvL_loadbuffer * * @param fileName 本地文件名 * - * @return 返回lvL_loadbuffer的返回值 + * @return 返回错误描述 */ --(int) loadFile:(NSString *)fileName; +-(NSString*) loadFile:(NSString *)fileName; /** * diff --git a/IOS/LuaViewSDK/Classes/LView.m b/IOS/LuaViewSDK/Classes/LView.m index 229fc85b..1ed1d5a3 100644 --- a/IOS/LuaViewSDK/Classes/LView.m +++ b/IOS/LuaViewSDK/Classes/LView.m @@ -137,19 +137,20 @@ -(void) checkDebugOrNot:(const char*) chars length:(NSInteger) len fileName:(NSS } } -- (int)loadFile:(NSString *)fileName { +- (NSString*)loadFile:(NSString *)fileName { NSData* code = [LVUtil dataReadFromFile:fileName package:self.package]; return [self loadData:code fileName:fileName]; } -- (int)loadSignFile:(NSString *)fileName { +- (NSString*)loadSignFile:(NSString *)fileName { NSData* code = [LVPkgManager readLuaFile:fileName package:self.package rsa:self.rsa]; return [self loadData:code fileName:fileName]; } -- (int)loadData:(NSData *)data fileName:(NSString *)fileName { +- (NSString*)loadData:(NSData *)data fileName:(NSString *)fileName { if (!data || !data.length || !fileName || !fileName.length) { - return -1; + LVError( @"running chars == NULL"); + return @"running chars == NULL"; } #ifdef DEBUG @@ -157,7 +158,18 @@ - (int)loadData:(NSData *)data fileName:(NSString *)fileName { [self checkDebugOrNot:data.bytes length:data.length fileName:fileName]; #endif - return lvL_loadbuffer(self.l, data.bytes, data.length, fileName.UTF8String); + int error = lvL_loadbuffer(self.l, data.bytes, data.length, fileName.UTF8String); + if (error) { + const char* s = lv_tostring(self.l, -1); + LVError( @"%s", s ); +#ifdef DEBUG + NSString* string = [NSString stringWithFormat:@"[LuaView][error] %s\n",s]; + lv_printToServer(self.l, string.UTF8String, 0); +#endif + return [NSString stringWithFormat:@"%s",s]; + } else { + return nil; + } } #ifdef DEBUG @@ -237,7 +249,7 @@ -(NSString*) runData:(NSData *)data fileName:(NSString*)fileName{ const char* s = lv_tostring(self.l, -1); LVError( @"%s", s ); #ifdef DEBUG - NSString* string = [NSString stringWithFormat:@"[LuaView][error] %s",s]; + NSString* string = [NSString stringWithFormat:@"[LuaView][error] %s\n",s]; lv_printToServer(self.l, string.UTF8String, 0); #endif return [NSString stringWithFormat:@"%s",s]; diff --git a/IOS/LuaViewSDK/Classes/lvsdk/LVRegisterManager.m b/IOS/LuaViewSDK/Classes/lvsdk/LVRegisterManager.m index 20041993..4089cf05 100644 --- a/IOS/LuaViewSDK/Classes/lvsdk/LVRegisterManager.m +++ b/IOS/LuaViewSDK/Classes/lvsdk/LVRegisterManager.m @@ -233,10 +233,10 @@ static int requireMethodForLuaView (lv_State *L) { if( lview ) { if ( lview.runInSignModel ) { fileName = [NSString stringWithFormat:@"%@.lv",fileName]; - return [lview loadSignFile:fileName] == 0 ? 1 : 0; + return [lview loadSignFile:fileName] == nil ? 1 : 0; } else { fileName = [NSString stringWithFormat:@"%@.lua",fileName]; - return [lview loadFile:fileName] == 0 ? 1 : 0; + return [lview loadFile:fileName] == nil ? 1 : 0; } } } From 1fb62ee5a3207be9080f62543221dec5cceccd5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=81=82=E5=95=86?= Date: Wed, 20 Jan 2016 10:52:08 +0800 Subject: [PATCH 03/13] add .gitignore --- .gitignore | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..9382cfe7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,10 @@ +# Idea +.Idea + +# Xcode +*.xcuserstate +project.xcworkspace/ +xcuserdata/ + +# others +.git_old_branch From a02d1055a426326d706d6af1058e1e7849c47692 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=9F=8E=E8=A5=BF?= Date: Mon, 25 Jan 2016 15:17:44 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=89=93=E5=8C=85?= =?UTF-8?q?=E8=AD=A6=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IOS/LuaViewSDK.xcodeproj/project.pbxproj | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/IOS/LuaViewSDK.xcodeproj/project.pbxproj b/IOS/LuaViewSDK.xcodeproj/project.pbxproj index 2b750d2a..77289e7b 100644 --- a/IOS/LuaViewSDK.xcodeproj/project.pbxproj +++ b/IOS/LuaViewSDK.xcodeproj/project.pbxproj @@ -2047,7 +2047,8 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD)"; - DEBUG_INFORMATION_FORMAT = dwarf; + CLANG_ENABLE_MODULE_DEBUGGING = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; FRAMEWORK_VERSION = A; @@ -2072,6 +2073,7 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD)"; + CLANG_ENABLE_MODULE_DEBUGGING = NO; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DYLIB_COMPATIBILITY_VERSION = 1; From 52ab5c261c40be5b998c1340300da355a88bea92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=9F=8E=E8=A5=BF?= Date: Mon, 25 Jan 2016 17:12:32 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=89=93=E5=8C=85?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E8=AD=A6=E5=91=8A(0warning)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IOS/LuaViewSDK.xcodeproj/project.pbxproj | 6 ++++-- IOS/LuaViewSDK/Classes/lv514/lVstrlib.c | 5 ++--- IOS/LuaViewSDK/Classes/lvsdk/LVHeads.h | 2 -- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/IOS/LuaViewSDK.xcodeproj/project.pbxproj b/IOS/LuaViewSDK.xcodeproj/project.pbxproj index 77289e7b..ce202d00 100644 --- a/IOS/LuaViewSDK.xcodeproj/project.pbxproj +++ b/IOS/LuaViewSDK.xcodeproj/project.pbxproj @@ -2047,7 +2047,8 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD)"; - CLANG_ENABLE_MODULE_DEBUGGING = NO; + CLANG_ENABLE_MODULES = NO; + CLANG_ENABLE_MODULE_DEBUGGING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -2073,7 +2074,8 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD)"; - CLANG_ENABLE_MODULE_DEBUGGING = NO; + CLANG_ENABLE_MODULES = NO; + CLANG_ENABLE_MODULE_DEBUGGING = YES; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DYLIB_COMPATIBILITY_VERSION = 1; diff --git a/IOS/LuaViewSDK/Classes/lv514/lVstrlib.c b/IOS/LuaViewSDK/Classes/lv514/lVstrlib.c index 46afbaed..04f2ac39 100644 --- a/IOS/LuaViewSDK/Classes/lv514/lVstrlib.c +++ b/IOS/LuaViewSDK/Classes/lv514/lVstrlib.c @@ -11,9 +11,6 @@ #include #include -typedef struct lv_State lv_State; -extern void lv_clearFirstTableValue(lv_State* l); - #define lstrlib_c #define LV_LIB @@ -22,6 +19,8 @@ extern void lv_clearFirstTableValue(lv_State* l); #include "lVauxlib.h" #include "lVlib.h" +extern void lv_clearFirstTableValue(lv_State* l); + /* macro to `unsign' a character */ #define uchar(c) ((unsigned char)(c)) diff --git a/IOS/LuaViewSDK/Classes/lvsdk/LVHeads.h b/IOS/LuaViewSDK/Classes/lvsdk/LVHeads.h index bf88801b..dde07200 100644 --- a/IOS/LuaViewSDK/Classes/lvsdk/LVHeads.h +++ b/IOS/LuaViewSDK/Classes/lvsdk/LVHeads.h @@ -17,8 +17,6 @@ #import "lVgc.h" #define lvL_reg lvL_Reg -typedef struct lvL_Reg lvL_Reg; -typedef struct lv_State lv_State; #import "LVUtil.h" //-------------------------------------------------------------------------------- From d3961b0040b90b30ea11596e40acdfda2e90703e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=9F=8E=E8=A5=BF?= Date: Tue, 26 Jan 2016 19:33:26 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E5=B1=8F=E5=B9=95=E5=B8=B8=E4=BA=AEAPI?= =?UTF-8?q?=20System.keepScreenOn(true/false)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IOS/LuaViewSDK/Classes/lvsdk/LVSystem.m | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/IOS/LuaViewSDK/Classes/lvsdk/LVSystem.m b/IOS/LuaViewSDK/Classes/lvsdk/LVSystem.m index f647e53a..580ba0ec 100644 --- a/IOS/LuaViewSDK/Classes/lvsdk/LVSystem.m +++ b/IOS/LuaViewSDK/Classes/lvsdk/LVSystem.m @@ -53,6 +53,15 @@ static int netWorkType (lv_State *L) { return 1; } +// 屏幕常亮 +static int keepScreenOn (lv_State *L) { + if( lv_gettop(L)>0 ){ + BOOL yes = lv_toboolean(L, -1); + [[UIApplication sharedApplication] setIdleTimerDisabled:yes] ; + } + return 0; +} + static int scale (lv_State *L) { CGFloat s = [UIScreen mainScreen].scale; lv_pushnumber( L, s); @@ -134,6 +143,7 @@ +(int) classDefine:(lv_State *)L { {"ios", ios}, {"android", android}, {"network", netWorkType}, + {"keepScreenOn", keepScreenOn},// 保持屏幕常亮接口 {NULL, NULL} }; lvL_openlib(L, "System", staticFunctions, 0); From 32f3c129d7100e3ecc31c4e917a82aef5fca38b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=9F=8E=E8=A5=BF?= Date: Tue, 26 Jan 2016 19:34:04 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E5=B1=8F=E5=B9=95=E5=B8=B8=E4=BA=AEAPI?= =?UTF-8?q?=20=E6=B5=8B=E8=AF=95demo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IOS/Demo/lua/demoP_System.lua | 8 ++++++++ IOS/LuaViewSDK.xcodeproj/project.pbxproj | 20 ++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/IOS/Demo/lua/demoP_System.lua b/IOS/Demo/lua/demoP_System.lua index df82b14f..de1766e6 100644 --- a/IOS/Demo/lua/demoP_System.lua +++ b/IOS/Demo/lua/demoP_System.lua @@ -26,3 +26,11 @@ myprint("System.scale = ", System.scale() ) --获取屏幕分辨率 myprint("System.device = ", System.device() ) --获取设备信息 myprint("System.screenSize() = ", System.screenSize() ); myprint("---end---",nil); + +window.callback({ + ViewDidAppear = function () + System.keepScreenOn(true);-- 屏幕常亮 + end, + ViewDidDisAppear = function () + System.keepScreenOn(false);-- 屏幕不常亮 + end}) diff --git a/IOS/LuaViewSDK.xcodeproj/project.pbxproj b/IOS/LuaViewSDK.xcodeproj/project.pbxproj index ce202d00..067c1a11 100644 --- a/IOS/LuaViewSDK.xcodeproj/project.pbxproj +++ b/IOS/LuaViewSDK.xcodeproj/project.pbxproj @@ -288,6 +288,9 @@ 84C1D8A61C17055C0058E974 /* enter10.png in Resources */ = {isa = PBXBuildFile; fileRef = 84C1D8A41C17055C0058E974 /* enter10.png */; }; 84C1D8A71C17055C0058E974 /* enter11.png in Resources */ = {isa = PBXBuildFile; fileRef = 84C1D8A51C17055C0058E974 /* enter11.png */; }; 84CC63801BB16AF300613B74 /* fire.zip in Resources */ = {isa = PBXBuildFile; fileRef = 84CC637F1BB16AF300613B74 /* fire.zip */; }; + 84CCB7F71C578EFD00584CF5 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84CCB7F61C578EFD00584CF5 /* AVFoundation.framework */; }; + 84CCB7F81C578F5000584CF5 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 845F377C1C578D9A00DD38EA /* AudioToolbox.framework */; }; + 84CCB7FA1C578F8900584CF5 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84CCB7F91C578F8900584CF5 /* Accelerate.framework */; }; 84DAB9C61C3A616800943A48 /* demoZ_decodeUrl.lua in Resources */ = {isa = PBXBuildFile; fileRef = 84DAB9C51C3A616800943A48 /* demoZ_decodeUrl.lua */; }; 84E85C1A1C33B84B007DE3DF /* LVPackage.h in Headers */ = {isa = PBXBuildFile; fileRef = 84E85C181C33B84B007DE3DF /* LVPackage.h */; settings = {ATTRIBUTES = (Public, ); }; }; 84E85C1C1C33B84B007DE3DF /* LVPackage.m in Sources */ = {isa = PBXBuildFile; fileRef = 84E85C191C33B84B007DE3DF /* LVPackage.m */; }; @@ -458,6 +461,7 @@ 8454D1401A7F732500774565 /* LVHttp.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVHttp.m; sourceTree = ""; }; 8454D1441A7FA7A400774565 /* LVHttpResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVHttpResponse.h; sourceTree = ""; }; 8454D1451A7FA7A400774565 /* LVHttpResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVHttpResponse.m; sourceTree = ""; }; + 845F377C1C578D9A00DD38EA /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; 846481A61A64C61F00DE6204 /* LVAnimate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVAnimate.h; sourceTree = ""; }; 846481A71A64C61F00DE6204 /* LVAnimate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVAnimate.m; sourceTree = ""; }; 846481A81A64C61F00DE6204 /* LVBaseView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVBaseView.h; sourceTree = ""; }; @@ -611,6 +615,11 @@ 84C3B7281A84622A00923404 /* LVData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVData.h; sourceTree = ""; }; 84C3B7291A84622A00923404 /* LVData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVData.m; sourceTree = ""; }; 84CC637F1BB16AF300613B74 /* fire.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = fire.zip; sourceTree = ""; }; + 84CCB7F01C578E0F00584CF5 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; }; + 84CCB7F21C578E3B00584CF5 /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = System/Library/Frameworks/AudioUnit.framework; sourceTree = SDKROOT; }; + 84CCB7F41C578E4D00584CF5 /* CoreAudioKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudioKit.framework; path = System/Library/Frameworks/CoreAudioKit.framework; sourceTree = SDKROOT; }; + 84CCB7F61C578EFD00584CF5 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; + 84CCB7F91C578F8900584CF5 /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = System/Library/Frameworks/Accelerate.framework; sourceTree = SDKROOT; }; 84CF566C1AE8EC3D00A49B36 /* LVExternalLinker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVExternalLinker.h; sourceTree = ""; }; 84CF566D1AE8EC3D00A49B36 /* LVExternalLinker.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVExternalLinker.m; sourceTree = ""; }; 84CF56731AE9184000A49B36 /* LVNativeObjBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVNativeObjBox.h; sourceTree = ""; }; @@ -667,6 +676,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 84CCB7FA1C578F8900584CF5 /* Accelerate.framework in Frameworks */, + 84CCB7F81C578F5000584CF5 /* AudioToolbox.framework in Frameworks */, + 84CCB7F71C578EFD00584CF5 /* AVFoundation.framework in Frameworks */, 84C1D8A31C16CEBB0058E974 /* LuaViewSDK.framework in Frameworks */, 8478D7DB1B9DA80E00DE9EFF /* libz.1.2.5.dylib in Frameworks */, 84B1E3851AEF2ED90054B9F1 /* Security.framework in Frameworks */, @@ -1292,6 +1304,12 @@ 8DF50822C3B250E24CAD9EC1 /* Frameworks */ = { isa = PBXGroup; children = ( + 84CCB7F91C578F8900584CF5 /* Accelerate.framework */, + 84CCB7F61C578EFD00584CF5 /* AVFoundation.framework */, + 84CCB7F41C578E4D00584CF5 /* CoreAudioKit.framework */, + 84CCB7F21C578E3B00584CF5 /* AudioUnit.framework */, + 84CCB7F01C578E0F00584CF5 /* CoreAudio.framework */, + 845F377C1C578D9A00DD38EA /* AudioToolbox.framework */, 84C1D88B1C16C5780058E974 /* Foundation.framework */, 84C1D7981C16B46D0058E974 /* libz.1.1.3.tbd */, 84C1D7961C16B4370058E974 /* libz.1.2.5.tbd */, @@ -1969,6 +1987,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; + CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; @@ -1997,6 +2016,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; + CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; From a4a0028a494d744a3ff7776eab987b67828e0ceb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=9F=8E=E8=A5=BF?= Date: Wed, 27 Jan 2016 10:36:38 +0800 Subject: [PATCH 08/13] =?UTF-8?q?podspec=E6=96=87=E4=BB=B6=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LuaViewSDK.podspec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/LuaViewSDK.podspec b/LuaViewSDK.podspec index 93e24c1c..a4ff6e49 100644 --- a/LuaViewSDK.podspec +++ b/LuaViewSDK.podspec @@ -2,7 +2,7 @@ Pod::Spec.new do |s| s.name = "LuaViewSDK" - s.version = "2.0.0.7" + s.version = "2.0.0.12" s.summary = "LuaView SDK" s.description = <<-DESC @@ -10,7 +10,7 @@ Pod::Spec.new do |s| * LuaView DESC - s.homepage = "http://gitlab.alibaba-inc.com/juhuasuanwireless/LuaViewSDK" + s.homepage = "https://github.com/alibaba/LuaViewSDK" s.license = { :type => 'GNU General Public Licence (GPL), Version 2.0', :file => 'LICENSE.txt' } @@ -25,7 +25,7 @@ Pod::Spec.new do |s| s.platform = :ios, "7.0" - s.source = { :git => "git@gitlab.alibaba-inc.com:juhuasuanwireless/LuaViewSDK.git", :tag => "2.0.0.0" } + s.source = { :git => "https://github.com/alibaba/LuaViewSDK.git", :tag => "2.0.0.12" } s.source_files = "LuaViewSDK/Classes", "IOS/LuaViewSDK/Classes/**/*.{h,m,c}" # s.exclude_files = "Classes/Exclude" From 08bededa1dd316f511e4a5c2d8268a7a249c80b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=9F=8E=E8=A5=BF?= Date: Wed, 27 Jan 2016 11:23:56 +0800 Subject: [PATCH 09/13] =?UTF-8?q?http=E8=AF=B7=E6=B1=82=E4=BC=98=E5=85=88?= =?UTF-8?q?=E7=BA=A7=E6=8F=90=E9=AB=98,=20=E7=94=A8=E6=88=B7=E5=9C=A8?= =?UTF-8?q?=E6=BB=91=E5=8A=A8=E7=9A=84=E8=BF=87=E7=A8=8B=E4=B8=AD=E4=B9=9F?= =?UTF-8?q?=E8=83=BD=E6=8E=A5=E5=8F=97=E5=88=B0=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IOS/Demo/lua/demoU_Http.lua | 4 +-- IOS/LuaViewSDK/Classes/lvsdk/LVHttp.m | 35 ++++++++++++++++++++++----- 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/IOS/Demo/lua/demoU_Http.lua b/IOS/Demo/lua/demoU_Http.lua index 0a15603e..bb24c844 100644 --- a/IOS/Demo/lua/demoU_Http.lua +++ b/IOS/Demo/lua/demoU_Http.lua @@ -5,8 +5,8 @@ http.get( "http://tmsprepub.alicdn.com/market/3c/quanqiutms.php", function(response) - print( "responseStatusCode:",response.statusCode() ); - print( "headerFields:",response.headerFields() ); + print( "responseStatusCode:",response.code() ); + print( "headerFields:",response.header() ); data = response.data(); print("ok: " .. tostring(data) ) end diff --git a/IOS/LuaViewSDK/Classes/lvsdk/LVHttp.m b/IOS/LuaViewSDK/Classes/lvsdk/LVHttp.m index a456e730..bc6ae48e 100644 --- a/IOS/LuaViewSDK/Classes/lvsdk/LVHttp.m +++ b/IOS/LuaViewSDK/Classes/lvsdk/LVHttp.m @@ -110,6 +110,23 @@ -(void) connectionDidFinishLoading:(NSURLConnection *)connection{ [self performSelectorOnMainThread:@selector(requesetEndToDo) withObject:nil waitUntilDone:NO]; } +-(void) connectionDidReceiveData:(NSData *)data{ + if( self.response.data == nil ) { + self.response.data = [[NSMutableData alloc] init]; + } + [self.response.data appendData:data]; +} + +-(void) connectionDidReceiveResponse:(NSURLResponse *)response{ + self.response.response = response; + if( [response isKindOfClass:[NSHTTPURLResponse class]] ){ + self.response.httpResponse = (NSHTTPURLResponse*)response; + } +} +-(void) connectionDidFinishLoading{ + [self performSelectorOnMainThread:@selector(requesetEndToDo) withObject:nil waitUntilDone:NO]; +} + -(id) lv_nativeObject{ return self; } @@ -145,9 +162,12 @@ static int get (lv_State *L) { [request setTimeoutInterval:http.timeout]; NSOperationQueue *queue = [[NSOperationQueue alloc]init]; - http.connection = [[NSURLConnection alloc] initWithRequest:request delegate:http]; - [http.connection setDelegateQueue:queue]; - [http.connection start]; + __weak LVHttp* weakHttp = http; + [NSURLConnection sendAsynchronousRequest:request queue:queue completionHandler:^(NSURLResponse *response, NSData *data, NSError *connectionError) { + [weakHttp connectionDidReceiveResponse:response]; + [weakHttp connectionDidReceiveData:data]; + [weakHttp connectionDidFinishLoading]; + }]; } } return 0; /* new userdatum is already on the stack */ @@ -198,9 +218,12 @@ static int post (lv_State *L) { } NSOperationQueue *queue = [[NSOperationQueue alloc]init]; - http.connection = [[NSURLConnection alloc] initWithRequest:request delegate:http]; - [http.connection setDelegateQueue:queue]; - [http.connection start]; + __weak LVHttp* weakHttp = http; + [NSURLConnection sendAsynchronousRequest:request queue:queue completionHandler:^(NSURLResponse *response, NSData *data, NSError *connectionError) { + [weakHttp connectionDidReceiveResponse:response]; + [weakHttp connectionDidReceiveData:data]; + [weakHttp connectionDidFinishLoading]; + }]; } } return 0; /* new userdatum is already on the stack */ From 0f5c38891750dbdb85557b3724c0ad91e8561d8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=9F=8E=E8=A5=BF?= Date: Sat, 30 Jan 2016 14:57:35 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF:=20native=E5=8F=8D?= =?UTF-8?q?=E5=B0=84=E6=96=B9=E6=B3=95=E6=89=BE=E4=B8=8D=E5=88=B0=E7=9A=84?= =?UTF-8?q?=E6=97=B6=E5=80=99=E6=9C=89=E6=8F=90=E7=A4=BA=E6=97=A5=E5=BF=97?= =?UTF-8?q?,=20=E5=AE=B9=E6=98=93=E9=94=99=E8=AF=AF=E8=B7=9F=E8=B8=AA;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IOS/LuaViewSDK/Classes/lvsdk/LVMethod.m | 1 + 1 file changed, 1 insertion(+) diff --git a/IOS/LuaViewSDK/Classes/lvsdk/LVMethod.m b/IOS/LuaViewSDK/Classes/lvsdk/LVMethod.m index acb6df2b..bcdc561b 100644 --- a/IOS/LuaViewSDK/Classes/lvsdk/LVMethod.m +++ b/IOS/LuaViewSDK/Classes/lvsdk/LVMethod.m @@ -52,6 +52,7 @@ -(int) performMethodWithArgs:(lv_State*)L{ return [LVTypeConvert pushInvocationReturnValue:invocation toLua:L]; } + LVError(@"Not found Method: %@.%@",[self.nativeObject class], self.selectName ); return 0; } From f7d13c881f5c479dcba62be21b91e68c0096125e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=9F=8E=E8=A5=BF?= Date: Thu, 4 Feb 2016 10:40:08 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IOS/Demo/lua/demoU_Http.lua | 27 ------------------------ IOS/LuaViewSDK.xcodeproj/project.pbxproj | 4 ---- 2 files changed, 31 deletions(-) delete mode 100644 IOS/Demo/lua/demoU_Http.lua diff --git a/IOS/Demo/lua/demoU_Http.lua b/IOS/Demo/lua/demoU_Http.lua deleted file mode 100644 index bb24c844..00000000 --- a/IOS/Demo/lua/demoU_Http.lua +++ /dev/null @@ -1,27 +0,0 @@ - -http = Http(); - -http.get( - "http://tmsprepub.alicdn.com/market/3c/quanqiutms.php", - - function(response) - print( "responseStatusCode:",response.code() ); - print( "headerFields:",response.header() ); - data = response.data(); - print("ok: " .. tostring(data) ) - end -) - -http2 = Http(); -http2.post( - "https://login-test.alibaba-inc.com/authorize/login.do",--url - {--http post数据 - appcode="123456", - name="taobao-hz\xicheng.dxc", - password="dxc123", - authtype="system" - }, - function(response)--http 返回的数据 - print(response.data() ); - end -); \ No newline at end of file diff --git a/IOS/LuaViewSDK.xcodeproj/project.pbxproj b/IOS/LuaViewSDK.xcodeproj/project.pbxproj index 067c1a11..256b91ac 100644 --- a/IOS/LuaViewSDK.xcodeproj/project.pbxproj +++ b/IOS/LuaViewSDK.xcodeproj/project.pbxproj @@ -77,7 +77,6 @@ 847BE9071C0E97AF008776E9 /* line.png in Resources */ = {isa = PBXBuildFile; fileRef = 847BE9041C0E97AF008776E9 /* line.png */; }; 847BE9081C0E97AF008776E9 /* hongbao.png in Resources */ = {isa = PBXBuildFile; fileRef = 847BE9051C0E97AF008776E9 /* hongbao.png */; }; 847BE90A1C0EA493008776E9 /* close.png in Resources */ = {isa = PBXBuildFile; fileRef = 847BE9091C0EA493008776E9 /* close.png */; }; - 8480C71E1C059BA70081B8A3 /* demoU_Http.lua in Resources */ = {isa = PBXBuildFile; fileRef = 8480C71D1C059BA70081B8A3 /* demoU_Http.lua */; }; 8480F0B71BFC1880005DB2AE /* demoA_ImageAnimate.lua in Resources */ = {isa = PBXBuildFile; fileRef = 8480F0B61BFC1880005DB2AE /* demoA_ImageAnimate.lua */; }; 8481E0511BD5DADD00FDFEEA /* demoG_RefreshTableView.lua in Resources */ = {isa = PBXBuildFile; fileRef = 8481E0501BD5DADD00FDFEEA /* demoG_RefreshTableView.lua */; }; 8481E0531BD6690A00FDFEEA /* demoK_ScrollView.lua in Resources */ = {isa = PBXBuildFile; fileRef = 8481E0521BD6690A00FDFEEA /* demoK_ScrollView.lua */; }; @@ -556,7 +555,6 @@ 847BE9041C0E97AF008776E9 /* line.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = line.png; sourceTree = ""; }; 847BE9051C0E97AF008776E9 /* hongbao.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = hongbao.png; sourceTree = ""; }; 847BE9091C0EA493008776E9 /* close.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = close.png; sourceTree = ""; }; - 8480C71D1C059BA70081B8A3 /* demoU_Http.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = demoU_Http.lua; sourceTree = ""; }; 8480F0B61BFC1880005DB2AE /* demoA_ImageAnimate.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = demoA_ImageAnimate.lua; sourceTree = ""; }; 8481E0501BD5DADD00FDFEEA /* demoG_RefreshTableView.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = demoG_RefreshTableView.lua; sourceTree = ""; }; 8481E0521BD6690A00FDFEEA /* demoK_ScrollView.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = demoK_ScrollView.lua; sourceTree = ""; }; @@ -1040,7 +1038,6 @@ 84FC64D11BB399A500B6AF86 /* demoO_Timer.lua */, 84799AC21BAFDDA00070E214 /* demoP_string.lua */, 84799AC31BAFDDA00070E214 /* demoP_System.lua */, - 8480C71D1C059BA70081B8A3 /* demoU_Http.lua */, 849832101BCB682F0032BF05 /* demoV1_CustomError.lua */, 849832111BCB682F0032BF05 /* demoV1_Customloading.lua */, 84799AC01BAFDDA00070E214 /* demoW1_shake.lua */, @@ -1638,7 +1635,6 @@ 847BE9061C0E97AF008776E9 /* enter.png in Resources */, 8468C95C1BDA11BE002D4B1E /* testLuaLang.lua in Resources */, 84799ADF1BAFDDA00070E214 /* demoY5_DownloadAndFile.lua in Resources */, - 8480C71E1C059BA70081B8A3 /* demoU_Http.lua in Resources */, 84799AF01BAFDDCA0070E214 /* demoK_PagerView.lua in Resources */, 84799ACC1BAFDDA00070E214 /* img13.tiff in Resources */, 8468C9631BDA11BE002D4B1E /* testUIImageView.lua in Resources */, From 729c838e9e26c599ef0a2a4c0af337b931942c77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=9F=8E=E8=A5=BF?= Date: Thu, 4 Feb 2016 10:41:54 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IOS/Demo/lua/demoZ_testunit.lua | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/IOS/Demo/lua/demoZ_testunit.lua b/IOS/Demo/lua/demoZ_testunit.lua index 11801142..f1d93abe 100644 --- a/IOS/Demo/lua/demoZ_testunit.lua +++ b/IOS/Demo/lua/demoZ_testunit.lua @@ -79,22 +79,6 @@ demoArray = { ); end, - function() - Http:post( - "https://login-test.alibaba-inc.com/authorize/login.do",--url - nil,--http头信息 - {--http post数据 - appcode="123456", - name="taobao-hz\xicheng.dxc", - password="dxc123", - authtype="system" - }, - function(request)--http 返回的数据 - print(request.data() ); - end - ); - end, - function() imageView = Image(); imageView.image(imageUrl); From 25210fdae31aaa80eae3642095acd2fe0ccfa6a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=9F=8E=E8=A5=BF?= Date: Thu, 4 Feb 2016 10:47:55 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IOS/Demo/test/testUIRefreshTableView.lua | 23 ----------------------- IOS/Demo/test/testUITableView.lua | 23 ----------------------- 2 files changed, 46 deletions(-) diff --git a/IOS/Demo/test/testUIRefreshTableView.lua b/IOS/Demo/test/testUIRefreshTableView.lua index 8be304d8..f538ae8b 100644 --- a/IOS/Demo/test/testUIRefreshTableView.lua +++ b/IOS/Demo/test/testUIRefreshTableView.lua @@ -9,29 +9,6 @@ loading.size(200, 200) loading.alignCenter() loading.show() ---获取数据 -local mtop = Mtop({ - method = "mtop.ju.block.optionminisite.get", - version = "1.0", - params = { - platformId = "8001", - page = 1, - pageSize = 1000 - } -}, - function(data, error) - blockData = data - -- print(table:getn(blockData.model)) - printTable(blockData.model[1].materials) - -- printTable(blockData) - if (tableView) then - tableView.reload() - end - - loading.hide() - end) -mtop.request() - tableView = RefreshTableView { Section = { SectionCount = 1, -- section数量 diff --git a/IOS/Demo/test/testUITableView.lua b/IOS/Demo/test/testUITableView.lua index d44c4e90..272cacf7 100644 --- a/IOS/Demo/test/testUITableView.lua +++ b/IOS/Demo/test/testUITableView.lua @@ -9,29 +9,6 @@ loading.size(200, 200) loading.alignCenter() loading.show() ---获取数据 -local mtop = Mtop({ - method = "mtop.ju.block.optionminisite.get", - version = "1.0", - params = { - platformId = "8001", - page = 1, - pageSize = 1000 - } -}, - function(data, error) - blockData = data - -- print(table:getn(blockData.model)) - printTable(blockData.model[1].materials) - -- printTable(blockData) - if (tableView) then - tableView.reload() - end - - loading.hide() - end) - -mtop.request() tableView = TableView { Section = {