添加录音接口回调以及native lua的支持

androidlgf · androidlgf · commit 448cb875332a · 2020-02-26T19:57:22.000+08:00
diff --git a/VideoOS/LuaViewSDK/src/cn/com/venvy/lua/binder/VenvyLVLibBinder.java b/VideoOS/LuaViewSDK/src/cn/com/venvy/lua/binder/VenvyLVLibBinder.java
@@ -23,6 +23,7 @@
 import cn.com.venvy.lua.plugin.LVPlayerPlugin;
 import cn.com.venvy.lua.plugin.LVPreLoadPlugin;
 import cn.com.venvy.lua.plugin.LVRSAPlugin;
+import cn.com.venvy.lua.plugin.LVRecordPlugin;
 import cn.com.venvy.lua.plugin.LVReportPlugin;
 import cn.com.venvy.lua.plugin.LVStatisticsPlugin;
 import cn.com.venvy.lua.plugin.LVTableToJsonPlugin;
@@ -59,6 +60,7 @@ void installPlugin(VenvyNativeBinder venvyNativeBinder) {
         LVUrlPlugin.install(this);
         LVViewManagerPlugin.install(this, venvyNativeBinder.getRootView());
         LVLoginPlugin.install(this, venvyNativeBinder.getPlatform());
+        LVRecordPlugin.install(this, venvyNativeBinder.getPlatform());
         LVCachePlugin.install(this);
         LVCommonParamPlugin.install(this);
         LVTableToJsonPlugin.install(this);
diff --git a/VideoOS/LuaViewSDK/src/cn/com/venvy/lua/maper/VenvyAcrCloudMapper.java b/VideoOS/LuaViewSDK/src/cn/com/venvy/lua/maper/VenvyAcrCloudMapper.java
@@ -51,7 +51,7 @@ public Varargs invoke(int code, U target, Varargs varargs) {
     public LuaValue acrRecognizeCallback(U target, Varargs varargs) {
         final LuaFunction callback = varargs.optfunction(2, null);
         if (callback != null && callback.isfunction()) {
-            return target.setMqttCallback(callback);
+            return target.setAcrCloudCallback(callback);
         }
         return LuaValue.NIL;
     }
diff --git a/VideoOS/LuaViewSDK/src/cn/com/venvy/lua/plugin/LVRecordPlugin.java b/VideoOS/LuaViewSDK/src/cn/com/venvy/lua/plugin/LVRecordPlugin.java
@@ -0,0 +1,80 @@
+package cn.com.venvy.lua.plugin;
+
+import com.taobao.luaview.util.LuaUtil;
+
+import org.luaj.vm2.LuaFunction;
+import org.luaj.vm2.LuaValue;
+import org.luaj.vm2.Varargs;
+import org.luaj.vm2.lib.VarArgFunction;
+
+import cn.com.venvy.Platform;
+import cn.com.venvy.common.interf.IPlatformRecordInterface;
+import cn.com.venvy.lua.binder.VenvyLVLibBinder;
+
+import static android.R.attr.data;
+
+/**
+ * Created by lgf on 2020/2/26.
+ */
+
+public class LVRecordPlugin {
+    public static void install(VenvyLVLibBinder venvyLVLibBinder, Platform platform) {
+        venvyLVLibBinder.set("acrRecordStart", new AcrRecordStart(platform));
+        venvyLVLibBinder.set("acrRecordEnd", new AcrRecordEnd(platform));
+    }
+
+    /**
+     * 录制开始事件
+     */
+    private static class AcrRecordStart extends VarArgFunction {
+        private Platform mPlatform;
+
+        AcrRecordStart(Platform platform) {
+            this.mPlatform = platform;
+        }
+
+        @Override
+        public Varargs invoke(Varargs args) {
+            if (mPlatform != null && mPlatform.getPlatformRecordInterface() != null) {
+                mPlatform.getPlatformRecordInterface().startRecord();
+            }
+            return LuaValue.NIL;
+        }
+    }
+
+    /**
+     * 录制开始事件
+     */
+    private static class AcrRecordEnd extends VarArgFunction {
+        private Platform mPlatform;
+
+        AcrRecordEnd(Platform platform) {
+            this.mPlatform = platform;
+        }
+
+        @Override
+        public Varargs invoke(Varargs args) {
+            final int fixIndex = VenvyLVLibBinder.fixIndex(args);
+            if (args.narg() > fixIndex) {
+                if (mPlatform != null && mPlatform.getPlatformRecordInterface() != null) {
+                    final LuaFunction callback = LuaUtil.getFunction(args, fixIndex + 1);
+                    if (callback == null) {
+                        return LuaValue.NIL;
+                    }
+                    mPlatform.getPlatformRecordInterface().endRecord(new IPlatformRecordInterface.RecordCallback() {
+                        @Override
+                        public void onRecordResult(byte[] data) {
+                            LuaUtil.callFunction(callback, LuaValue.valueOf(data));
+                        }
+
+                        @Override
+                        public void onRecordResult(String filePath) {
+                            LuaUtil.callFunction(callback, LuaValue.valueOf(filePath));
+                        }
+                    });
+                }
+            }
+            return LuaValue.NIL;
+        }
+    }
+}
diff --git a/VideoOS/VenvyLibrary/src/main/java/cn/com/venvy/Platform.java b/VideoOS/VenvyLibrary/src/main/java/cn/com/venvy/Platform.java
@@ -3,8 +3,6 @@
 import android.support.annotation.Nullable;
 import android.view.ViewGroup;
 
-import org.json.JSONArray;
-
 import java.io.File;
 import java.io.Serializable;
 import java.lang.reflect.Method;
@@ -20,6 +18,7 @@
 import cn.com.venvy.common.interf.IAppletListener;
 import cn.com.venvy.common.interf.IMediaControlListener;
 import cn.com.venvy.common.interf.IPlatformLoginInterface;
+import cn.com.venvy.common.interf.IPlatformRecordInterface;
 import cn.com.venvy.common.interf.IWidgetClickListener;
 import cn.com.venvy.common.interf.IWidgetCloseListener;
 import cn.com.venvy.common.interf.IWidgetPrepareShowListener;
@@ -28,7 +27,6 @@
 import cn.com.venvy.common.interf.WedgeListener;
 import cn.com.venvy.common.media.StorageUtils;
 import cn.com.venvy.common.media.file.Md5FileNameGenerator;
-import cn.com.venvy.common.report.Report;
 import cn.com.venvy.common.statistics.VenvyStatisticsManager;
 import cn.com.venvy.common.track.TrackHelper;
 import cn.com.venvy.common.utils.VenvyAsyncTaskUtil;
@@ -45,6 +43,7 @@ public class Platform implements Serializable {
     private boolean nvgShow = true; // 视联网小程序是否显示导航栏
     //手动上报逻辑
     private IPlatformLoginInterface mPlatformLoginInterface;
+    private IPlatformRecordInterface mPlatformRecordInterface;
     private IMediaControlListener mMediaControlListener;
     private IWidgetShowListener mWidgetShowListener;
     private IWidgetCloseListener mWidgetCloseListener;
@@ -103,6 +102,10 @@ public void setPlatformLoginInterface(IPlatformLoginInterface mPlatformLoginInte
         this.mPlatformLoginInterface = mPlatformLoginInterface;
     }
 
+    public void setPlatformRecordInterface(IPlatformRecordInterface mPlatformRecordInterface) {
+        this.mPlatformRecordInterface = mPlatformRecordInterface;
+    }
+
     public void setWidgetClickListener(IWidgetClickListener mWidgetClickListener) {
         this.mWidgetClickListener = mWidgetClickListener;
     }
@@ -158,6 +161,10 @@ public IPlatformLoginInterface getPlatformLoginInterface() {
         return mPlatformLoginInterface;
     }
 
+    public IPlatformRecordInterface getPlatformRecordInterface() {
+        return mPlatformRecordInterface;
+    }
+
     public void updatePlatformInfo(PlatformInfo platformInfo) {
         this.mPlatformInfo = platformInfo;
     }
diff --git a/VideoOS/VenvyLibrary/src/main/java/cn/com/venvy/common/interf/IPlatformRecordInterface.java b/VideoOS/VenvyLibrary/src/main/java/cn/com/venvy/common/interf/IPlatformRecordInterface.java
@@ -0,0 +1,14 @@
+package cn.com.venvy.common.interf;
+
+/**
+ * Created by lgf on 2020/2/26.
+ */
+
+public interface IPlatformRecordInterface {
+    void startRecord();
+    void endRecord(RecordCallback loginCallback);
+    interface RecordCallback {
+        void onRecordResult(byte[] data);
+        void onRecordResult(String filePath);
+    }
+}
diff --git a/VideoOS/VenvyLibrary/src/main/java/cn/com/venvy/common/interf/PlatformRecordListener.java b/VideoOS/VenvyLibrary/src/main/java/cn/com/venvy/common/interf/PlatformRecordListener.java
@@ -0,0 +1,18 @@
+package cn.com.venvy.common.interf;
+
+/**
+ * Created by lgf on 2020/2/26.
+ */
+
+public abstract class PlatformRecordListener implements IPlatformRecordInterface {
+
+    @Override
+    public void startRecord() {
+
+    }
+
+    @Override
+    public void endRecord(RecordCallback loginCallback) {
+
+    }
+}
diff --git a/VideoOS/venvy_pub/src/main/java/cn/com/videopls/pub/VideoPlusAdapter.java b/VideoOS/venvy_pub/src/main/java/cn/com/videopls/pub/VideoPlusAdapter.java
@@ -9,6 +9,7 @@
 import cn.com.venvy.common.interf.IACRCloud;
 import cn.com.venvy.common.interf.IMediaControlListener;
 import cn.com.venvy.common.interf.IPlatformLoginInterface;
+import cn.com.venvy.common.interf.IPlatformRecordInterface;
 import cn.com.venvy.common.interf.ISocketConnect;
 import cn.com.venvy.common.interf.ISvgaImageView;
 import cn.com.venvy.common.interf.IWidgetClickListener;
@@ -81,7 +82,9 @@ public WedgeListener buildWedgeListener() {
     public IPlatformLoginInterface buildLoginInterface() {
         return null;
     }
-
+    public IPlatformRecordInterface buildRecordInterface(){
+        return null;
+    }
     public IWidgetPrepareShowListener buildWidgetPrepareShowListener() {
         return null;
     }
diff --git a/VideoOS/venvy_pub/src/main/java/cn/com/videopls/pub/VideoPlusController.java b/VideoOS/venvy_pub/src/main/java/cn/com/videopls/pub/VideoPlusController.java
@@ -352,6 +352,7 @@ protected Platform updatePlatformListener(Platform platform, VideoPlusAdapter vi
         platform.setWidgetCloseListener(videoOSAdapter.buildWidgetCloseListener());
         platform.setMediaControlListener(videoOSAdapter.buildMediaController());
         platform.setPlatformLoginInterface(videoOSAdapter.buildLoginInterface());
+        platform.setPlatformRecordInterface(videoOSAdapter.buildRecordInterface());
         platform.setTagKeyListener(videoOSAdapter.buildOttKeyListener());
         platform.setWedgeListener(videoOSAdapter.buildWedgeListener());
         if (mAppletListener != null) {
diff --git a/VideoOS/venvy_pub/src/main/java/cn/com/videopls/pub/VideoPlusH5Controller.java b/VideoOS/venvy_pub/src/main/java/cn/com/videopls/pub/VideoPlusH5Controller.java
@@ -61,6 +61,7 @@ protected Platform updatePlatformListener(Platform platform, VideoPlusAdapter vi
         platform.setWidgetCloseListener(videoOSAdapter.buildWidgetCloseListener());
         platform.setMediaControlListener(videoOSAdapter.buildMediaController());
         platform.setPlatformLoginInterface(videoOSAdapter.buildLoginInterface());
+        platform.setPlatformRecordInterface(videoOSAdapter.buildRecordInterface());
         platform.setTagKeyListener(videoOSAdapter.buildOttKeyListener());
         platform.setWedgeListener(videoOSAdapter.buildWedgeListener());
         platform.setWidgetPrepareShowListener(videoOSAdapter.buildWidgetPrepareShowListener());

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public Varargs invoke(int code, U target, Varargs varargs) {`
`51`	`51`	`public LuaValue acrRecognizeCallback(U target, Varargs varargs) {`
`52`	`52`	`final LuaFunction callback = varargs.optfunction(2, null);`
`53`	`53`	`if (callback != null && callback.isfunction()) {`
`54`		`- return target.setMqttCallback(callback);`
	`54`	`+ return target.setAcrCloudCallback(callback);`
`55`	`55`	`}`
`56`	`56`	`return LuaValue.NIL;`
`57`	`57`	`}`