Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
Crusoekid committed Nov 11, 2020
1 parent 4990926 commit d50d2b2
Show file tree
Hide file tree
Showing 17 changed files with 52 additions and 52 deletions.
11 changes: 9 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,18 @@ The ```build.gradle``` in Project add
}

```
The ```build.gradle``` in Main Module add
The ```build.gradle``` in Main Module add,select which function you need.But the ```core``` is must.
```java
dependencies {
...
implementation 'com.tengine.android:tenginekit:1.1.4'
// Must!!!!
implementation 'com.tengine.tenginekit:core:0.0.1'
// Function on Face
implementation 'com.tengine.tenginekit:face:0.0.1'
// Function on Hand
implementation 'com.tengine.tenginekit:hand:0.0.1'
// Function on Body
implementation 'com.tengine.tenginekit:body:0.0.1'
...
}
```
Expand Down
16 changes: 11 additions & 5 deletions docs/README_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,20 @@ Project中的build.gradle添加
}
```
主Module中的build.gradle添加
```
主Module中的```build.gradle```添加,选择你需要的功能。```core```是必须的。
```java
dependencies {
...
implementation 'com.tengine.android:tenginekit:1.1.4'
// Must!!!!
implementation 'com.tengine.tenginekit:core:0.0.1'
// Function on Face
implementation 'com.tengine.tenginekit:face:0.0.1'
// Function on Hand
implementation 'com.tengine.tenginekit:hand:0.0.1'
// Function on Body
implementation 'com.tengine.tenginekit:body:0.0.1'
...
}
```
}

# 系统
Android
Expand Down
5 changes: 3 additions & 2 deletions sample/FaceDemo/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ android {
compileSdkVersion 28
buildToolsVersion '28.0.3'
defaultConfig {
applicationId "com.tenginekit.Demo"
applicationId "com.tenginekit.FaceDemo"
minSdkVersion 19
targetSdkVersion 28
versionCode 1
Expand Down Expand Up @@ -50,7 +50,8 @@ dependencies {
implementation 'com.makeramen:roundedimageview:2.3.0'
implementation 'com.google.android.material:material:1.0.0'

implementation 'com.tengine.android:tenginekit:1.1.3'
implementation 'com.tengine.tenginekit:core:0.0.1'
implementation 'com.tengine.tenginekit:face:0.0.1'

implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support:recyclerview-v7:28.0.0'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import com.faceDemo.utils.MyLogger;
import com.faceDemo.utils.SensorEventUtil;
import com.tenginekit.AndroidConfig;
import com.tenginekit.Face;
import com.tenginekit.KitCore;

public abstract class CameraActivity extends AppCompatActivity implements
Expand Down Expand Up @@ -82,7 +81,8 @@ public void Init() {
CameraActivity.this,
AndroidConfig
.create()
.setCameraMode().openFunc(AndroidConfig.Func.BlazeFace).openFunc(AndroidConfig.Func.Landmark)
.setCameraMode()
.openFunc(AndroidConfig.Func.BlazeFace).openFunc(AndroidConfig.Func.Landmark)
.setDefaultInputImageFormat()
.setInputImageSize(previewWidth, previewHeight)
.setOutputImageSize((int) ScreenWidth, (int) ScreenHeight)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
import com.faceDemo.encoder.CircleEncoder;
import com.faceDemo.encoder.EncoderBus;
import com.faceDemo.encoder.RectEncoder;
import com.tenginekit.Face;
import com.tenginekit.KitCore;
import com.tenginekit.model.FaceDetectInfo;
import com.tenginekit.model.FaceLandmarkInfo;
import com.tenginekit.face.Face;
import com.tenginekit.face.FaceDetectInfo;
import com.tenginekit.face.FaceLandmarkInfo;
import com.tenginekit.model.TenginekitPoint;

import java.util.ArrayList;
Expand Down
4 changes: 2 additions & 2 deletions sample/GoogleBodyDemo/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ dependencies {
implementation 'com.makeramen:roundedimageview:2.3.0'
implementation 'com.google.android.material:material:1.0.0'

implementation 'com.tengine.android:tenginekit:1.1.3'

implementation 'com.tengine.tenginekit:core:0.0.1'
implementation 'com.tengine.tenginekit:body:0.0.1'
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support:recyclerview-v7:28.0.0'
implementation 'com.android.support:design:28.0.0'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
import com.bodyDemo.encoder.CircleEncoder;
import com.bodyDemo.encoder.EncoderBus;
import com.bodyDemo.encoder.RectEncoder;
import com.tenginekit.Body;
import com.tenginekit.KitCore;
import com.tenginekit.model.BodyDetectInfo;
import com.tenginekit.model.BodyLandmarkInfo;
import com.tenginekit.body.Body;
import com.tenginekit.body.BodyDetectInfo;
import com.tenginekit.body.BodyLandmarkInfo;
import com.tenginekit.model.TenginekitPoint;

import java.util.ArrayList;
Expand Down
3 changes: 2 additions & 1 deletion sample/GoogleFaceDemo/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ dependencies {
implementation 'com.makeramen:roundedimageview:2.3.0'
implementation 'com.google.android.material:material:1.0.0'

implementation 'com.tengine.android:tenginekit:1.1.3'
implementation 'com.tengine.tenginekit:core:0.0.1'
implementation 'com.tengine.tenginekit:face:0.0.1'

implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support:recyclerview-v7:28.0.0'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import com.faceDemo.utils.MyLogger;
import com.faceDemo.utils.SensorEventUtil;
import com.tenginekit.AndroidConfig;
import com.tenginekit.Face;
import com.tenginekit.KitCore;

public abstract class CameraActivity extends AppCompatActivity implements
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
package com.faceDemo.activity;

import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Canvas;
import android.graphics.Rect;
import android.media.FaceDetector;
import android.os.Environment;
import android.util.Log;
import android.util.Size;

Expand All @@ -17,20 +13,13 @@
import com.faceDemo.encoder.EncoderBus;
import com.faceDemo.encoder.EyeEncoder;
import com.faceDemo.encoder.RectEncoder;
import com.tenginekit.AndroidConfig;
import com.tenginekit.Face;
import com.tenginekit.Image;
import com.tenginekit.KitCore;
import com.tenginekit.model.FaceDetectInfo;
import com.tenginekit.model.FaceIrisInfo;
import com.tenginekit.model.FaceLandmark3dInfo;
import com.tenginekit.model.FaceLandmarkInfo;
import com.tenginekit.KitCore;;
import com.tenginekit.face.Face;
import com.tenginekit.face.FaceDetectInfo;
import com.tenginekit.face.FaceIrisInfo;
import com.tenginekit.face.FaceLandmark3dInfo;
import com.tenginekit.model.TenginekitPoint;

import java.io.File;
import java.io.FileOutputStream;
import java.nio.Buffer;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;

Expand Down
3 changes: 2 additions & 1 deletion sample/GoogleHandDemo/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ dependencies {
implementation 'com.makeramen:roundedimageview:2.3.0'
implementation 'com.google.android.material:material:1.0.0'

implementation 'com.tengine.android:tenginekit:1.1.3'
implementation 'com.tengine.tenginekit:core:0.0.1'
implementation 'com.tengine.tenginekit:hand:0.0.1'

implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support:recyclerview-v7:28.0.0'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import com.faceDemo.utils.MyLogger;
import com.faceDemo.utils.SensorEventUtil;
import com.tenginekit.AndroidConfig;
import com.tenginekit.Face;
import com.tenginekit.KitCore;

public abstract class CameraActivity extends AppCompatActivity implements
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,11 @@
import com.faceDemo.encoder.CircleEncoder;
import com.faceDemo.encoder.EncoderBus;
import com.faceDemo.encoder.RectEncoder;
import com.tenginekit.Face;
import com.tenginekit.Hand;

import com.tenginekit.KitCore;
import com.tenginekit.model.FaceDetectInfo;
import com.tenginekit.model.FaceLandmarkInfo;
import com.tenginekit.model.HandDetectInfo;
import com.tenginekit.model.HandLandmarkInfo;
import com.tenginekit.hand.Hand;
import com.tenginekit.hand.HandDetectInfo;
import com.tenginekit.hand.HandLandmarkInfo;
import com.tenginekit.model.TenginekitPoint;

import java.util.ArrayList;
Expand Down
3 changes: 2 additions & 1 deletion sample/ImageDemo/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ dependencies {
implementation 'com.makeramen:roundedimageview:2.3.0'
implementation 'com.google.android.material:material:1.0.0'

implementation 'com.tengine.android:tenginekit:1.1.3'
implementation 'com.tengine.tenginekit:core:0.0.1'
implementation 'com.tengine.tenginekit:face:0.0.1'

implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support:recyclerview-v7:28.0.0'
Expand Down
Binary file added sample/ImageDemo/app/src/main/assets/1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed sample/ImageDemo/app/src/main/assets/5.jpg
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,18 @@
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.text.NoCopySpan;
import android.util.Log;
import android.util.Size;
import android.widget.ImageView;

import androidx.appcompat.app.AppCompatActivity;

import com.faceDemo.R;
import com.faceDemo.utils.FileHandler;
import com.tenginekit.AndroidConfig;
import com.tenginekit.Face;
import com.tenginekit.KitCore;
import com.tenginekit.model.FaceDetectInfo;
import com.tenginekit.model.FaceLandmarkInfo;
import com.tenginekit.face.Face;
import com.tenginekit.face.FaceDetectInfo;
import com.tenginekit.face.FaceLandmarkInfo;
import com.tenginekit.model.TenginekitPoint;

import java.nio.ByteBuffer;
Expand Down Expand Up @@ -61,7 +59,7 @@ public void run() {
CanvasInit();
Bitmap bb = null;
try {
Drawable d = Drawable.createFromStream(getAssets().open("5.jpg"), null);
Drawable d = Drawable.createFromStream(getAssets().open("1.jpg"), null);
showImage.setImageDrawable(d);
bb = ((BitmapDrawable) d).getBitmap();

Expand Down

0 comments on commit d50d2b2

Please sign in to comment.