update to v3.4.0 (#30)

doggycoder · aiyaapp · commit c635d189dfef · 2017-09-20T09:41:48.000+08:00
* add the func to remove filter

* change  interface and update so

* change  interface and update so

* change so，update to v3.4.0alpha

* fix smooth bug. etc

* fix smooth bug. etc

* Update readme.md

* Update readme_en.md

* refresh config data when version update

* update to v3.4.0

* update readme
diff --git a/AiyaEffectsSDK/build.gradle b/AiyaEffectsSDK/build.gradle
@@ -14,7 +14,7 @@ android {
         versionName rootProject.ext.vName
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-
+        buildConfigField("String","AiyaSDKVersionName","\""+rootProject.ext.vName+"\"")
     }
     buildTypes {
         release {
diff --git a/AiyaEffectsSDK/src/main/java/com/aiyaapp/camera/sdk/AiyaEffects.java b/AiyaEffectsSDK/src/main/java/com/aiyaapp/camera/sdk/AiyaEffects.java
@@ -15,6 +15,7 @@
 import java.util.concurrent.Semaphore;
 
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.telephony.TelephonyManager;
@@ -29,6 +30,7 @@
 import com.aiyaapp.camera.sdk.base.ActionObservable;
 import com.aiyaapp.camera.sdk.base.ActionObserver;
 import com.aiyaapp.camera.sdk.base.TrackCallback;
+import com.aiyaapp.sticker.sdk.BuildConfig;
 
 /**
  *  Sdk的核心接口，将工作线程、GL线程、人脸追踪线程分开，
@@ -120,10 +122,17 @@ private void cInit(){
         mTrackExecutor= Executors.newFixedThreadPool(1);
     }
 
-    private boolean prepareResource(Context context,String licensePath){
-        Log.d("prepare Resource");
-        Assets assets=new Assets(context,licensePath);
-        return assets.doCopy();
+    private boolean prepareResource(Context context,String licensePath) {
+        Assets assets = new Assets(context, licensePath);
+        SharedPreferences sp = context.getSharedPreferences("AiyaSDKVersion", Context.MODE_PRIVATE);
+        Log.d("last sdk version:"+sp.getString("v","none"));
+        Log.d("now sdk version:"+BuildConfig.AiyaSDKVersionName);
+        if (!sp.getString("v", "").equals(BuildConfig.AiyaSDKVersionName)) {
+            assets.clearCache();
+            sp.edit().putString("v", BuildConfig.AiyaSDKVersionName).apply();
+        }
+        return new File(licensePath).exists() || assets.doCopy();
+
     }
 
     @SuppressLint("HardwareIds")
@@ -142,12 +151,7 @@ public void init(final Context context,final String configPath,final String appK
             @Override
             public void run() {
                 Log.e("start prepare resource");
-                boolean pb;
-                if(new File(configPath).exists()){
-                    pb=true;
-                }else{
-                    pb=prepareResource(context,configPath);
-                }
+                boolean pb=prepareResource(context,configPath);
                 Log.e("prepare resource success:"+pb);
                 if(pb){
                     mObservable.notifyState(new Event(Event.RESOURCE_READY,Event.RESOURCE_READY,"资源准备完成",null));
diff --git a/AiyaEffectsSDK/src/main/java/com/aiyaapp/camera/sdk/base/Assets.java b/AiyaEffectsSDK/src/main/java/com/aiyaapp/camera/sdk/base/Assets.java
@@ -67,6 +67,10 @@ public boolean doCopy() {
         return a;
     }
 
+    public void clearCache(){
+        deleteFile(rootDir);
+    }
+
     private boolean copyForSticker(){
         Log.d("check data for sticker");
         return copyFileFromAssets("modelsticker",getSD()+"/AiyaCamera/model_sticker");
diff --git a/AiyaEffectsSDK/src/main/java/com/aiyaapp/camera/sdk/filter/GroupFilter.java b/AiyaEffectsSDK/src/main/java/com/aiyaapp/camera/sdk/filter/GroupFilter.java
@@ -10,6 +10,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Queue;
+import java.util.Vector;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
 import android.content.res.Resources;
@@ -25,7 +26,7 @@ public class GroupFilter extends AFilter{
 
     public GroupFilter(Resources res) {
         super(res);
-        mFilters=new ArrayList<>();
+        mFilters=new Vector<>();
         mFilterQueue=new ConcurrentLinkedQueue<>();
     }
 
@@ -67,7 +68,8 @@ public void draw(){
         updateFilter();
         textureIndex=0;
         GLES20.glViewport(0,0,width,height);
-        for (AFilter filter:mFilters){
+        for (int i=0;i<mFilters.size();i++){
+            AFilter filter=mFilters.get(i);
             GLES20.glBindFramebuffer(GLES20.GL_FRAMEBUFFER, fFrame[0]);
             GLES20.glFramebufferTexture2D(GLES20.GL_FRAMEBUFFER, GLES20.GL_COLOR_ATTACHMENT0,
                 GLES20.GL_TEXTURE_2D, fTexture[textureIndex%2], 0);
diff --git a/AiyaEffectsSDK/src/main/java/com/aiyaapp/camera/sdk/widget/AiyaCameraView.java b/AiyaEffectsSDK/src/main/java/com/aiyaapp/camera/sdk/widget/AiyaCameraView.java
@@ -64,6 +64,8 @@ public class AiyaCameraView extends GLSurfaceView implements GLSurfaceView.Rende
     private int[] fFrame = new int[1];
     private int[] fTexture = new int[1];
 
+    private Runnable callbackIfCameraOpenFailed;
+
     public AiyaCameraView(Context context) {
         this(context,null);
     }
@@ -101,6 +103,10 @@ public void onResume() {
         }
     }
 
+    public void setCameraOpenFaildCallback(Runnable runnable){
+        callbackIfCameraOpenFailed=runnable;
+    }
+
     public AiyaCamera getCamera(){
         return mCamera;
     }
@@ -124,36 +130,42 @@ public void onSurfaceCreated(GL10 gl, EGLConfig config) {
 
     private void open(final int cameraId){
         mCamera.close();
-        mCamera.open(cameraId);
-        mEffectFilter.setFlag(cameraId);
-        final Point previewSize=mCamera.getPreviewSize();
-        dataWidth=previewSize.x;
-        dataHeight=previewSize.y;
-        //预览大小被更改时，回调不为空，需要重新计算最后的导出矩阵
-        if(mFrameCallback!=null){
-            setFrameCallback(frameCallbackWidth,frameCallbackHeight,mFrameCallback);
-        }
-        if(cameraBuffer==null){
-            cameraBuffer=new byte[3][dataWidth*dataHeight*4];
-        }
-        for (int i=0;i<3;i++){
-            mCamera.addBuffer(cameraBuffer[i]);
-        }
-        mCamera.setOnPreviewFrameCallbackWithBuffer(new AiyaCamera.PreviewFrameCallback() {
-
-            @Override
-            public void onPreviewFrame(byte[] bytes, int width, int height) {
-                EData.data.setCameraCallbackTime(System.currentTimeMillis());
-                if(isSetParm){
-                    mBytesQueue.add(bytes);
-                    requestRender();
-                }else{
-                    mCamera.addBuffer(bytes);
+        try {
+            mCamera.open(cameraId);
+            mEffectFilter.setFlag(cameraId);
+            final Point previewSize=mCamera.getPreviewSize();
+            dataWidth=previewSize.x;
+            dataHeight=previewSize.y;
+            //预览大小被更改时，回调不为空，需要重新计算最后的导出矩阵
+            if(mFrameCallback!=null){
+                setFrameCallback(frameCallbackWidth,frameCallbackHeight,mFrameCallback);
+            }
+            if(cameraBuffer==null){
+                cameraBuffer=new byte[3][dataWidth*dataHeight*4];
+            }
+            for (int i=0;i<3;i++){
+                mCamera.addBuffer(cameraBuffer[i]);
+            }
+            mCamera.setOnPreviewFrameCallbackWithBuffer(new AiyaCamera.PreviewFrameCallback() {
+
+                @Override
+                public void onPreviewFrame(byte[] bytes, int width, int height) {
+                    EData.data.setCameraCallbackTime(System.currentTimeMillis());
+                    if(isSetParm){
+                        mBytesQueue.add(bytes);
+                        requestRender();
+                    }else{
+                        mCamera.addBuffer(bytes);
+                    }
                 }
+            });
+            mCamera.setPreviewTexture(mEffectFilter.getTexture());
+            mCamera.preview();
+        }catch (Exception e){
+            if(callbackIfCameraOpenFailed!=null){
+                callbackIfCameraOpenFailed.run();
             }
-        });
-        mCamera.setPreviewTexture(mEffectFilter.getTexture());
-        mCamera.preview();
+        }
     }
 
     public void switchCamera(){
diff --git a/build.gradle b/build.gradle
@@ -17,8 +17,8 @@ buildscript {
 }
 
 ext{
-    vCode=334
-    vName="v3.4.0beta"
+    vCode=340
+    vName="v3.4.0"
 }
 
 
diff --git a/demo/src/main/assets/modelsticker/fadai/fadai_blue.mtl b/demo/src/main/assets/modelsticker/fadai/fadai_blue.mtl
@@ -5,9 +5,3 @@ Ka 0.00 0.00 0.00
 Tf 1.00 1.00 1.00
 map_Kd fadai_000.png
 Ni 1.00
-newmtl initialShadingGroup
-illum 4
-Kd 0.50 0.50 0.50
-Ka 0.00 0.00 0.00
-Tf 1.00 1.00 1.00
-Ni 1.00
diff --git a/demo/src/main/assets/modelsticker/fadai/fadai_blue.obj b/demo/src/main/assets/modelsticker/fadai/fadai_blue.obj
@@ -2,10 +2,10 @@
 
 mtllib fadai_blue.mtl
 g default
-v -0.076437 0.061274 -0.040172
-v 0.107236 0.061274 -0.040172
-v -0.076437 0.170142 -0.040172
-v 0.107236 0.170142 -0.040172
+v -0.080437 0.061274 -0.040172
+v 0.103236 0.061274 -0.040172
+v -0.080437 0.170142 -0.040172
+v 0.103236 0.170142 -0.040172
 vt 0.000000 0.000000
 vt 1.000000 0.000000
 vt 1.000000 1.000000
diff --git a/demo/src/main/assets/modelsticker/giraffe/giraffe.obj b/demo/src/main/assets/modelsticker/giraffe/giraffe.obj
@@ -2,10 +2,10 @@
 
 mtllib giraffe.mtl
 g default
-v -0.154348 -0.132939 -0.072972
-v 0.178348 -0.132939 -0.072972
-v -0.154348 0.060025 -0.072972
-v 0.178348 0.060025 -0.072972
+v -0.018623 -0.047069 0.018714
+v 0.026623 -0.047069 0.018714
+v -0.018623 -0.007145 0.018714
+v 0.026623 -0.007145 0.018714
 vt 0.000000 0.000000
 vt 1.000000 0.000000
 vt 1.000000 1.000000
@@ -15,14 +15,14 @@ vn 0.000000 0.000000 1.000000
 vn 0.000000 0.000000 1.000000
 vn 0.000000 0.000000 1.000000
 s off
-g giraffe:pPlane4
-usemtl giraffe:lambert3SG
+g bizi
+usemtl giraffe:phong1SG
 f 1/1/1 2/2/2 4/3/3 3/4/4
 g default
-v -0.154348 0.023378 -0.054608
-v 0.178348 0.023378 -0.054608
-v -0.154348 0.168433 -0.054608
-v 0.178348 0.168433 -0.054608
+v -0.076345 -0.054438 -0.000141
+v 0.072703 -0.054438 -0.000141
+v -0.076345 -0.001206 -0.000141
+v 0.072703 -0.001206 -0.000141
 vt 0.000000 0.000000
 vt 1.000000 0.000000
 vt 1.000000 1.000000
@@ -32,14 +32,14 @@ vn 0.000000 0.000000 1.000000
 vn 0.000000 0.000000 1.000000
 vn 0.000000 0.000000 1.000000
 s off
-g giraffe:pPlane6
-usemtl giraffe:lambert5SG
+g saihong
+usemtl giraffe:lambert4SG
 f 5/5/5 6/6/6 8/7/7 7/8/8
 g default
-v -0.062524 -0.054438 -0.000141
-v 0.086524 -0.054438 -0.000141
-v -0.062524 -0.001206 -0.000141
-v 0.086524 -0.001206 -0.000141
+v -0.162348 0.023378 -0.054608
+v 0.170348 0.023378 -0.054608
+v -0.162348 0.168433 -0.054608
+v 0.170348 0.168433 -0.054608
 vt 0.000000 0.000000
 vt 1.000000 0.000000
 vt 1.000000 1.000000
@@ -49,14 +49,14 @@ vn 0.000000 0.000000 1.000000
 vn 0.000000 0.000000 1.000000
 vn 0.000000 0.000000 1.000000
 s off
-g giraffe:pPlane5
-usemtl giraffe:lambert4SG
+g erduo
+usemtl giraffe:lambert5SG
 f 9/9/9 10/10/10 12/11/11 11/12/12
 g default
-v -0.010623 -0.047069 0.018714
-v 0.034623 -0.047069 0.018714
-v -0.010623 -0.007145 0.018714
-v 0.034623 -0.007145 0.018714
+v -0.162348 -0.132939 -0.072972
+v 0.170348 -0.132939 -0.072972
+v -0.162348 0.060025 -0.072972
+v 0.170348 0.060025 -0.072972
 vt 0.000000 0.000000
 vt 1.000000 0.000000
 vt 1.000000 1.000000
@@ -66,6 +66,6 @@ vn 0.000000 0.000000 1.000000
 vn 0.000000 0.000000 1.000000
 vn 0.000000 0.000000 1.000000
 s off
-g giraffe:pPlane3
-usemtl giraffe:phong1SG
+g mian
+usemtl giraffe:lambert3SG
 f 13/13/13 14/14/14 16/15/15 15/16/16
diff --git a/readme.md b/readme.md
@@ -11,7 +11,7 @@ See [English Document](readme_en.md)
 宝宝特效 AiyaEffectsSDK 涵盖Android、iOS两个平台，基于自主研发的人脸识别模块，作为一款动态贴纸和动画特效高效渲染的解决方案
 
 ### 1.1 版本信息
-**当前版本：AiyaEffects SDK V3.3.0** [查看历史版本](https://github.com/aiyaapp/AiyaEffectsAndroid/wiki/%E5%8E%86%E5%8F%B2%E7%89%88%E6%9C%AC)
+**当前版本：AiyaEffects SDK V3.4.0** [查看历史版本](https://github.com/aiyaapp/AiyaEffectsAndroid/wiki/%E5%8E%86%E5%8F%B2%E7%89%88%E6%9C%AC)
 
 ### 1.2 集成示例
 * [集成到金山云的示例](https://github.com/aiyaapp/AiyaEffectsWithKSVCAndroid)
@@ -47,6 +47,6 @@ Android版AiyaEffectsSDK minSdkVersion为18，即Android4.3以上可用。
 ## 8. 反馈与建议
 - 主页: [宝宝特效](http://www.bbtexiao.com)
 - 邮箱: <liudawei@aiyaapp.com>
-- QQ讨论群: 建设中
+- QQ讨论群: 650242833
 
 <a href="http://www.bbtexiao.com/"><img src="doc/logo.png" border="0" alt="宝宝特效" /></a>
diff --git a/readme_en.md b/readme_en.md
@@ -11,7 +11,7 @@ See [Chinese Document](readme_en.md)
 AiyaEffectsSDK is a high-performance rendering solution about dynamic stickers and animation effects which based on the independent research and development of face recognition module and it can be used to Android/iOS , two platforms.
 
 ### 1.1 Version Info
-**Current Version：AiyaEffects SDK V3.3.0** [version history](https://github.com/aiyaapp/AiyaEffectsAndroid/wiki/VersionHistory)
+**Current Version：AiyaEffects SDK V3.4.0** [version history](https://github.com/aiyaapp/AiyaEffectsAndroid/wiki/VersionHistory)
 
 ### 1.2 Integration Examples
 * [AiyaEffectsSDK with KSVC Demo](https://github.com/aiyaapp/AiyaEffectsWithKSVCAndroid)
@@ -48,5 +48,6 @@ The document of user-defined stickers and animations is not officially opened ye
 - Homepage: [AiyaEffects](http://www.bbtexiao.com)
 - Email: <liudawei@aiyaapp.com>
 - Issues: [issues](https://github.com/aiyaapp/AiyaEffectsAndroid/issues)
+- QQ: 650242833
 
 <a href="http://www.bbtexiao.com/"><img src="doc/logo.png" border="0" alt="AiyaEffectsSDK" /></a>

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ android {`
`14`	`14`	`versionName rootProject.ext.vName`
`15`	`15`
`16`	`16`	`testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"`
`17`		`-`
	`17`	`+ buildConfigField("String","AiyaSDKVersionName","\""+rootProject.ext.vName+"\"")`
`18`	`18`	`}`
`19`	`19`	`buildTypes {`
`20`	`20`	`release {`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,8 @@ buildscript {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`ext{`
`20`		`- vCode=334`
`21`		`- vName="v3.4.0beta"`
	`20`	`+ vCode=340`
	`21`	`+ vName="v3.4.0"`
`22`	`22`	`}`
`23`	`23`
`24`	`24`