pull request ->v3.3.0 (#26)

* add process error event

* Enhance rendering efficiency

* share library to bintray

* use new model

* Recovery of gitpack

* update readme

Author: doggycoder

AiyaEffectsSDK/bintrayUpload.gradle

@@ -0,0 +1,81 @@
+apply plugin: 'com.github.dcendents.android-maven'
+apply plugin: 'com.jfrog.bintray'
+// 配置版本
+version = rootProject.ext.vName
+
+// 定义相关网站
+def siteUrl = 'https://github.com/aiyaapp/AiyaEffectsAndroid'  // 项目的主页
+def gitUrl = 'https://github.com/aiyaapp/AiyaEffectsAndroid.git'
+group = "com.aiyaapp.aiya"
+
+install {
+  repositories.mavenInstaller {
+    // This generates POM.xml with proper parameters
+    pom {
+      project {
+        packaging 'aar'
+        // Add your description here
+        name 'AiyaEffectsSDK'
+        url siteUrl
+        // Set your license
+        licenses {
+          license {
+            name 'The Apache Software License, Version 2.0'
+            url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+          }
+        }
+        developers {
+          developer {
+            id 'doggycoder'        //填写的一些基本信息
+            name 'doggycoder'
+            email '158183202@qq.com' // 填写邮箱
+          }
+        }
+        scm {
+          connection gitUrl
+          developerConnection gitUrl
+          url siteUrl
+        }
+      }
+    }
+  }
+}
+
+// 打包 javadocjar 和 sourcejar
+task sourcesJar(type: Jar) {
+  from android.sourceSets.main.java.srcDirs
+  classifier = 'sources'
+}
+task javadoc(type: Javadoc) {
+  source = android.sourceSets.main.java.srcDirs
+  classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+}
+task javadocJar(type: Jar, dependsOn: javadoc) {
+  classifier = 'javadoc'
+  from javadoc.destinationDir
+}
+artifacts {
+  archives javadocJar
+  archives sourcesJar
+}
+Properties properties = new Properties()
+properties.load(project.rootProject.file('local.properties').newDataInputStream())
+bintray {
+  user = properties.getProperty("bintray.user")
+  key = properties.getProperty("bintray.apikey")
+  configurations = ['archives']
+  pkg {
+    repo = "maven"
+    name = "AiyaEffectsSDK"    //发布到JCenter上的项目名字
+    websiteUrl = siteUrl
+    vcsUrl = gitUrl
+    licenses = ["Apache-2.0"]
+    publish = true
+  }
+}
+javadoc { //jav doc采用utf-8编码否则会报“GBK的不可映射字符”错误
+  options{
+    encoding "UTF-8"
+    charSet 'UTF-8'
+  }
+}

AiyaEffectsSDK/build.gradle

@@ -1,6 +1,6 @@
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
-group='com.github.doggycoder'
+group='com.aiyaapp.aiya'
 
 android {
 
@@ -58,3 +58,5 @@ dependencies {
     })
     testCompile 'junit:junit:4.12'
 }
+
+apply from: "bintrayUpload.gradle"

AiyaEffectsSDK/libs/arm64-v8a/libAiyaJniWrapper.so

@@ -83,6 +83,7 @@ public class AiyaEffects implements ISdkManager {
     private int forceCloseTrack=FALSE;
 
     private Event mProcessEvent=new Event(Event.PROCESS_END,Event.PROCESS_PLAY,"",null);
+    private Event mInfoEvent=new Event(Event.PROCESS_ERROR,0,"",null);
 
     private AiyaEffects(){
         mObservable=new ActionObservable();
@@ -314,9 +315,7 @@ public void run() {
                     long start=System.currentTimeMillis();
                     int trackCode=mAiyaCameraJni.track(trackData,mTrackWidth,mTrackHeight,info,
                         trackIndex);
-                    Log.e("track------------------------>"+(System.currentTimeMillis()-start));
-
-                    Log.e("info","info----:"+info[0]+"/"+info[1]+"/"+info[10]+"/"+info[11]);
+                    Log.d("track------------------------>"+(System.currentTimeMillis()-start));
 
                     if(mTrackCallback!=null){
                         mTrackCallback.onTrack(trackCode,info);
@@ -350,6 +349,10 @@ public void process(int textureId, int trackIndex) {
             if(ret==STATE_EFFECT_END){
                 mProcessEvent.strTag=currentEffect;
                 mObservable.notifyState(mProcessEvent);
+            }else if(ret<0){
+                mInfoEvent.intTag=ret;
+                mInfoEvent.strTag="process error";
+                mObservable.notifyState(mInfoEvent);
             }
             if(mMode==MODE_GIFT&&ret==STATE_EFFECT_END){
                 setEffect(null);

AiyaEffectsSDK/libs/arm64-v8a/libaftk.so

@@ -27,6 +27,7 @@ public class Event {
 
     public static final int PROCESS_PLAY=0xE002;
     public static final int PROCESS_END=0xE004;
+    public static final int PROCESS_ERROR=0xE008;
 
     public int eventType;
     public int intTag;

AiyaEffectsSDK/libs/arm64-v8a/libayeffects.so

@@ -10,14 +10,15 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
 }
 
 ext{
-    vCode=321
-    vName="v3.2.0_a1"
+    vCode=330
+    vName="v3.3.0"
 }
 
 

AiyaEffectsSDK/libs/armeabi-v7a/libAiyaJniWrapper.so

@@ -5,13 +5,13 @@
 
 See [English Document](readme_en.md)
 
-[![](https://jitpack.io/v/aiyaapp/AiyaEffectsAndroid.svg)](https://jitpack.io/#aiyaapp/AiyaEffectsAndroid)
+[![](https://jitpack.io/v/aiyaapp/AiyaEffectsAndroid.svg)](https://jitpack.io/#aiyaapp/AiyaEffectsAndroid)[ ![Download](https://api.bintray.com/packages/doggycoder/maven/AiyaEffectsSDK/images/download.svg) ](https://bintray.com/doggycoder/maven/AiyaEffectsSDK/_latestVersion)
 
 ## 1. 概述
 宝宝特效 AiyaEffectsSDK 涵盖Android、iOS两个平台，基于自主研发的人脸识别模块，作为一款动态贴纸和动画特效高效渲染的解决方案
 
 ### 1.1 版本信息
-**当前版本：AiyaEffects SDK V3.2.0** [查看历史版本](https://github.com/aiyaapp/AiyaEffectsAndroid/wiki/%E5%8E%86%E5%8F%B2%E7%89%88%E6%9C%AC)
+**当前版本：AiyaEffects SDK V3.3.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)

AiyaEffectsSDK/libs/armeabi-v7a/libaftk.so

@@ -5,13 +5,13 @@
 
 See [Chinese Document](readme_en.md)
 
-[![](https://jitpack.io/v/aiyaapp/AiyaEffectsAndroid.svg)](https://jitpack.io/#aiyaapp/AiyaEffectsAndroid)
+[![](https://jitpack.io/v/aiyaapp/AiyaEffectsAndroid.svg)](https://jitpack.io/#aiyaapp/AiyaEffectsAndroid)[ ![Download](https://api.bintray.com/packages/doggycoder/maven/AiyaEffectsSDK/images/download.svg) ](https://bintray.com/doggycoder/maven/AiyaEffectsSDK/_latestVersion)
 
 ## 1. Summary
 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.2.0** [version history](doc/version_info.md)
+**Current Version：AiyaEffects SDK V3.3.0** [version history](https://github.com/aiyaapp/AiyaEffectsAndroid/wiki/VersionHistory)
 
 ### 1.2 Integration Examples
 * [AiyaEffectsSDK with KSVC Demo](https://github.com/aiyaapp/AiyaEffectsWithKSVCAndroid)