暂时去除WebView组件

Author: 敛心

IOS/SDK/LuaViewSDK.xcodeproj/project.pbxproj

@@ -31,7 +31,7 @@
 #import "LVPagerIndicator.h"
 #import "LVLoadingIndicator.h"
 #import "LVImage.h"
-#import "LVWebView.h"
+//#import "LVWebView.h"
 #import "LVLabel.h"
 #import "LVBaseView.h"
 #import "LVTransform3D.h"
@@ -249,7 +249,7 @@ -(void) registeLibs{
                 [LVButton class],
                 [LVImage class],
                 [LVBitmap class],
-                [LVWebView class],
+//                [LVWebView class],
                 [LVLabel class],
                 [LVScrollView class],
                 [LVCollectionView class],

IOS/SDK/LuaViewSDK/Classes/LuaViewCore.m

@@ -16,6 +16,8 @@ @interface LVAudioPlayer ()<AVAudioPlayerDelegate>
 @property(nonatomic,assign) BOOL playing;
 @property (nonatomic, copy) NSString *fileName;
 
+@property (nonatomic, assign) CGFloat volume;
+
 @end
 
 @implementation LVAudioPlayer{
@@ -42,6 +44,7 @@ -(id) init:(lua_State*) L{
     self = [super init];
     if( self ){
         self.lv_luaviewCore = LV_LUASTATE_VIEW(L);
+        _volume = -1;
     }
     return self;
 }
@@ -56,6 +59,8 @@ -(void) setPlayFileName0:(NSString*) fileName bundle:(LVBundle*) bundle{
         audioPlayer = [[AVAudioPlayer alloc] initWithContentsOfURL:url error:&error];//使用本地URL创建
         audioPlayer.delegate = self;
 
+        [self setVolume:_volume];
+        
         if( error ) {
             NSLog(@"[LuaView][error]%@",error);
         }else{
@@ -89,6 +94,7 @@ -(void) setPlayFileName:(NSString*) fileName bundle:(LVBundle*) bundle{
 -(void) play {
     if (!self.playing){
         [audioPlayer play];
+        [self setVolume:0.5];
         self.playing = YES;
     }
 }
@@ -98,6 +104,16 @@ -(void) stop {
     self.playing = NO;
 }
 
+-(void)setVolume:(CGFloat)volume{
+    if ([[[UIDevice currentDevice] systemVersion] compare:@"10.0" options:NSNumericSearch] == NSOrderedDescending){
+        if (volume < 0 || volume > 1){
+            return;
+        }
+        _volume = volume;
+        [audioPlayer setVolume:volume fadeDuration:0];
+    }
+}
+
 - (void)audioPlayerDidFinishPlaying:(AVAudioPlayer *)player successfully:(BOOL)flag{
     self.playing = NO;
 }
@@ -167,6 +183,23 @@ static int stop (lua_State *L) {
     return 0;
 }
 
+static int setVolume(lua_State *L){
+    //设置音量接口只有在iOS10.0以上才生效
+    LVUserDataInfo *user = (LVUserDataInfo *)lua_touserdata(L, 1);
+    if (user){
+        LVAudioPlayer *player = (__bridge LVAudioPlayer *)(user->object);
+        if (player){
+            if( lua_gettop(L)>=2 ) {
+                float volume = lua_tonumber(L, 2);
+                
+                [player setVolume:volume];
+            }
+        }
+    }
+    
+    return 0;
+}
+
 static int __gc (lua_State *L) {
     LVUserDataInfo * user = (LVUserDataInfo *)lua_touserdata(L, 1);
     releaseUserDataAudioPlayer(user);
@@ -190,6 +223,7 @@ +(int) lvClassDefine:(lua_State *)L globalName:(NSString*) globalName{
     const struct luaL_Reg memberFunctions [] = {
         {"play", play },
         {"stop", stop },
+        {"setVolume", setVolume},
         // pause
         // resume
         // callback { onComplete onError }

IOS/SDK/LuaViewSDK/Classes/lvsdk/LVAudioPlayer.m

@@ -359,28 +359,6 @@ static int lvTakePicture(lua_State *L){
     return 0;
 }
 
-static int lvEnableFlash(lua_State *L){
-    LVUserDataInfo * user = (LVUserDataInfo *)lua_touserdata(L, 1);
-    if( user ){
-        LVCamera* camera = (__bridge LVCamera *)(user->object);
-        if ( lua_gettop(L)>=2 ){
-            BOOL enable = lua_toboolean(L, 2);
-            [camera enableFlash:enable];
-            return 0;
-        }
-    }
-    return 0;
-}
-
-static int lvHasCameraFlash(lua_State *L){
-    //先缺省设置成闪光灯一直存在
-    AVCaptureDevice *device = [AVCaptureDevice defaultDeviceWithMediaType:AVMediaTypeVideo];
-    int available = device.isFlashAvailable;
-    
-    lua_pushboolean(L, available);
-    return 1;
-}
-
 static int __gc(lua_State *L){
     LVUserDataInfo * user = (LVUserDataInfo *)lua_touserdata(L, 1);
     releaseUserDataCamera(user);
@@ -419,11 +397,8 @@ +(int) lvClassDefine:(lua_State *)L globalName:(NSString*) globalName{
 
     //方法列表
     const struct luaL_Reg memberFunctions [] = {
-        {"hasPermission", lvHasPermission},
         {"enableFaceDetect", lvEnableFaceDetect},
         {"takePicture", lvTakePicture},
-        {"enableFlash", lvEnableFlash},
-        {"hasCameraFlash", lvHasCameraFlash},
         {"__gc", __gc },
         {"__tostring", __tostring },
         {NULL, NULL}