diff --git a/FaceUnity/src/main/assets/makeup/chaomo.bundle b/FaceUnity/src/main/assets/makeup/chaomo.bundle new file mode 100644 index 000000000..1fe066467 Binary files /dev/null and b/FaceUnity/src/main/assets/makeup/chaomo.bundle differ diff --git a/FaceUnity/src/main/assets/makeup/chuju.bundle b/FaceUnity/src/main/assets/makeup/chuju.bundle new file mode 100644 index 000000000..e305fb652 Binary files /dev/null and b/FaceUnity/src/main/assets/makeup/chuju.bundle differ diff --git a/FaceUnity/src/main/assets/makeup/chuqiu.bundle b/FaceUnity/src/main/assets/makeup/chuqiu.bundle new file mode 100644 index 000000000..44ee9310f Binary files /dev/null and b/FaceUnity/src/main/assets/makeup/chuqiu.bundle differ diff --git a/FaceUnity/src/main/assets/makeup/diadiatu.bundle b/FaceUnity/src/main/assets/makeup/diadiatu.bundle new file mode 100644 index 000000000..89a9e82cb Binary files /dev/null and b/FaceUnity/src/main/assets/makeup/diadiatu.bundle differ diff --git a/FaceUnity/src/main/assets/makeup/dongling.bundle b/FaceUnity/src/main/assets/makeup/dongling.bundle new file mode 100644 index 000000000..32d298843 Binary files /dev/null and b/FaceUnity/src/main/assets/makeup/dongling.bundle differ diff --git a/FaceUnity/src/main/assets/makeup/gangfeng.bundle b/FaceUnity/src/main/assets/makeup/gangfeng.bundle new file mode 100644 index 000000000..a8122028f Binary files /dev/null and b/FaceUnity/src/main/assets/makeup/gangfeng.bundle differ diff --git a/FaceUnity/src/main/assets/makeup/guofeng.bundle b/FaceUnity/src/main/assets/makeup/guofeng.bundle new file mode 100644 index 000000000..7accb7084 Binary files /dev/null and b/FaceUnity/src/main/assets/makeup/guofeng.bundle differ diff --git a/FaceUnity/src/main/assets/makeup/hongfeng.bundle b/FaceUnity/src/main/assets/makeup/hongfeng.bundle new file mode 100644 index 000000000..ef4791e7d Binary files /dev/null and b/FaceUnity/src/main/assets/makeup/hongfeng.bundle differ diff --git a/FaceUnity/src/main/assets/makeup/hunxie.bundle b/FaceUnity/src/main/assets/makeup/hunxie.bundle new file mode 100644 index 000000000..dadea8d79 Binary files /dev/null and b/FaceUnity/src/main/assets/makeup/hunxie.bundle differ diff --git a/FaceUnity/src/main/assets/makeup/jianling.bundle b/FaceUnity/src/main/assets/makeup/jianling.bundle new file mode 100644 index 000000000..a2c29b49b Binary files /dev/null and b/FaceUnity/src/main/assets/makeup/jianling.bundle differ diff --git a/FaceUnity/src/main/assets/makeup/linjia.bundle b/FaceUnity/src/main/assets/makeup/linjia.bundle new file mode 100644 index 000000000..205476c8c Binary files /dev/null and b/FaceUnity/src/main/assets/makeup/linjia.bundle differ diff --git a/FaceUnity/src/main/assets/makeup/nuandong.bundle b/FaceUnity/src/main/assets/makeup/nuandong.bundle new file mode 100644 index 000000000..2d3f202af Binary files /dev/null and b/FaceUnity/src/main/assets/makeup/nuandong.bundle differ diff --git a/FaceUnity/src/main/assets/makeup/oumei.bundle b/FaceUnity/src/main/assets/makeup/oumei.bundle new file mode 100644 index 000000000..c2aaee19a Binary files /dev/null and b/FaceUnity/src/main/assets/makeup/oumei.bundle differ diff --git a/FaceUnity/src/main/assets/makeup/qianzhihe.bundle b/FaceUnity/src/main/assets/makeup/qianzhihe.bundle new file mode 100644 index 000000000..8b01613b4 Binary files /dev/null and b/FaceUnity/src/main/assets/makeup/qianzhihe.bundle differ diff --git a/FaceUnity/src/main/assets/makeup/renyu.bundle b/FaceUnity/src/main/assets/makeup/renyu.bundle new file mode 100644 index 000000000..9d1a0e314 Binary files /dev/null and b/FaceUnity/src/main/assets/makeup/renyu.bundle differ diff --git a/FaceUnity/src/main/assets/makeup/rose.bundle b/FaceUnity/src/main/assets/makeup/rose.bundle new file mode 100644 index 000000000..c5292c559 Binary files /dev/null and b/FaceUnity/src/main/assets/makeup/rose.bundle differ diff --git a/FaceUnity/src/main/assets/makeup/shaonv.bundle b/FaceUnity/src/main/assets/makeup/shaonv.bundle new file mode 100644 index 000000000..1525c841b Binary files /dev/null and b/FaceUnity/src/main/assets/makeup/shaonv.bundle differ diff --git a/FaceUnity/src/main/assets/makeup/tianmei.bundle b/FaceUnity/src/main/assets/makeup/tianmei.bundle new file mode 100644 index 000000000..252c9d35b Binary files /dev/null and b/FaceUnity/src/main/assets/makeup/tianmei.bundle differ diff --git a/FaceUnity/src/main/assets/makeup/wumei.bundle b/FaceUnity/src/main/assets/makeup/wumei.bundle new file mode 100644 index 000000000..8199e47fd Binary files /dev/null and b/FaceUnity/src/main/assets/makeup/wumei.bundle differ diff --git a/FaceUnity/src/main/assets/makeup/xinggan.bundle b/FaceUnity/src/main/assets/makeup/xinggan.bundle new file mode 100644 index 000000000..18055a693 Binary files /dev/null and b/FaceUnity/src/main/assets/makeup/xinggan.bundle differ diff --git a/FaceUnity/src/main/assets/makeup/yanshimao.bundle b/FaceUnity/src/main/assets/makeup/yanshimao.bundle new file mode 100644 index 000000000..cd8c16f4a Binary files /dev/null and b/FaceUnity/src/main/assets/makeup/yanshimao.bundle differ diff --git a/FaceUnity/src/main/assets/makeup/ziyun.bundle b/FaceUnity/src/main/assets/makeup/ziyun.bundle new file mode 100644 index 000000000..e3cef9ad0 Binary files /dev/null and b/FaceUnity/src/main/assets/makeup/ziyun.bundle differ diff --git a/FaceUnity/src/main/java/com/yunbao/faceunity/FaceManager.java b/FaceUnity/src/main/java/com/yunbao/faceunity/FaceManager.java index 86c52b0b4..83abcb033 100644 --- a/FaceUnity/src/main/java/com/yunbao/faceunity/FaceManager.java +++ b/FaceUnity/src/main/java/com/yunbao/faceunity/FaceManager.java @@ -69,8 +69,8 @@ public class FaceManager implements SensorEventListener { if (isInit) { return; } - FURenderManager.setCoreDebug(FULogger.LogLevel.DEBUG); - FURenderManager.setKitDebug(FULogger.LogLevel.DEBUG); + FURenderManager.setCoreDebug(FULogger.LogLevel.OFF); + FURenderManager.setKitDebug(FULogger.LogLevel.OFF); FURenderManager.registerFURender(context, Authpack.A(), new OperateCallback() { @Override public void onSuccess(int i, @NonNull String s) { diff --git a/FaceUnity/src/main/java/com/yunbao/faceunity/data/FaceBeautyDataFactory.java b/FaceUnity/src/main/java/com/yunbao/faceunity/data/FaceBeautyDataFactory.java index e1b7ddd39..a23b83838 100644 --- a/FaceUnity/src/main/java/com/yunbao/faceunity/data/FaceBeautyDataFactory.java +++ b/FaceUnity/src/main/java/com/yunbao/faceunity/data/FaceBeautyDataFactory.java @@ -202,17 +202,21 @@ public class FaceBeautyDataFactory extends AbstractFaceBeautyDataFactory { put(FaceBeautyParam.FACE_SHAPE_INTENSITY, defaultFaceBeauty::setSharpenIntensity); put(FaceBeautyParam.CHEEK_THINNING_INTENSITY, defaultFaceBeauty::setCheekThinningIntensity); put(FaceBeautyParam.CHEEK_V_INTENSITY, defaultFaceBeauty::setCheekVIntensity); - put(FaceBeautyParam.CHEEK_NARROW_INTENSITY_V2, defaultFaceBeauty::setCheekNarrowIntensityV2); + put(FaceBeautyParam.CHEEK_LONG_INTENSITY, defaultFaceBeauty::setCheekLongIntensity); + put(FaceBeautyParam.CHEEK_CIRCLE_INTENSITY, defaultFaceBeauty::setCheekCircleIntensity); + put(FaceBeautyParam.CHEEK_NARROW_INTENSITY, defaultFaceBeauty::setCheekNarrowIntensity); put(FaceBeautyParam.CHEEK_SHORT_INTENSITY, defaultFaceBeauty::setCheekShortIntensity); - put(FaceBeautyParam.CHEEK_SMALL_INTENSITY_V2, defaultFaceBeauty::setCheekSmallIntensityV2); + put(FaceBeautyParam.CHEEK_SMALL_INTENSITY, defaultFaceBeauty::setCheekSmallIntensity); put(FaceBeautyParam.INTENSITY_CHEEKBONES_INTENSITY, defaultFaceBeauty::setCheekBonesIntensity); put(FaceBeautyParam.INTENSITY_LOW_JAW_INTENSITY, defaultFaceBeauty::setLowerJawIntensity); - put(FaceBeautyParam.EYE_ENLARGING_INTENSITY_V2, defaultFaceBeauty::setEyeEnlargingIntensityV2); + put(FaceBeautyParam.EYE_ENLARGING_INTENSITY, defaultFaceBeauty::setEyeEnlargingIntensity); put(FaceBeautyParam.EYE_CIRCLE_INTENSITY, defaultFaceBeauty::setEyeCircleIntensity); + put(FaceBeautyParam.BROW_HEIGHT_INTENSITY, defaultFaceBeauty::setBrowHeightIntensity); + put(FaceBeautyParam.BROW_SPACE_INTENSITY, defaultFaceBeauty::setBrowSpaceIntensity); put(FaceBeautyParam.CHIN_INTENSITY, defaultFaceBeauty::setChinIntensity); - put(FaceBeautyParam.FOREHEAD_INTENSITY_V2, defaultFaceBeauty::setForHeadIntensityV2); - put(FaceBeautyParam.NOSE_INTENSITY_V2, defaultFaceBeauty::setNoseIntensityV2); - put(FaceBeautyParam.MOUTH_INTENSITY_V2, defaultFaceBeauty::setMouthIntensityV2); + put(FaceBeautyParam.FOREHEAD_INTENSITY, defaultFaceBeauty::setForHeadIntensity); + put(FaceBeautyParam.NOSE_INTENSITY, defaultFaceBeauty::setNoseIntensity); + put(FaceBeautyParam.MOUTH_INTENSITY, defaultFaceBeauty::setMouthIntensity); put(FaceBeautyParam.CANTHUS_INTENSITY, defaultFaceBeauty::setCanthusIntensity); put(FaceBeautyParam.EYE_SPACE_INTENSITY, defaultFaceBeauty::setEyeSpaceIntensity); put(FaceBeautyParam.EYE_ROTATE_INTENSITY, defaultFaceBeauty::setEyeRotateIntensity); @@ -236,17 +240,21 @@ public class FaceBeautyDataFactory extends AbstractFaceBeautyDataFactory { put(FaceBeautyParam.FACE_SHAPE_INTENSITY, defaultFaceBeauty::getSharpenIntensity); put(FaceBeautyParam.CHEEK_THINNING_INTENSITY, defaultFaceBeauty::getCheekThinningIntensity); put(FaceBeautyParam.CHEEK_V_INTENSITY, defaultFaceBeauty::getCheekVIntensity); - put(FaceBeautyParam.CHEEK_NARROW_INTENSITY_V2, defaultFaceBeauty::getCheekNarrowIntensityV2); + put(FaceBeautyParam.CHEEK_LONG_INTENSITY, defaultFaceBeauty::getCheekLongIntensity); + put(FaceBeautyParam.CHEEK_CIRCLE_INTENSITY, defaultFaceBeauty::getCheekCircleIntensity); + put(FaceBeautyParam.CHEEK_NARROW_INTENSITY, defaultFaceBeauty::getCheekNarrowIntensity); put(FaceBeautyParam.CHEEK_SHORT_INTENSITY, defaultFaceBeauty::getCheekShortIntensity); - put(FaceBeautyParam.CHEEK_SMALL_INTENSITY_V2, defaultFaceBeauty::getCheekSmallIntensityV2); + put(FaceBeautyParam.CHEEK_SMALL_INTENSITY, defaultFaceBeauty::getCheekSmallIntensity); put(FaceBeautyParam.INTENSITY_CHEEKBONES_INTENSITY, defaultFaceBeauty::getCheekBonesIntensity); put(FaceBeautyParam.INTENSITY_LOW_JAW_INTENSITY, defaultFaceBeauty::getLowerJawIntensity); - put(FaceBeautyParam.EYE_ENLARGING_INTENSITY_V2, defaultFaceBeauty::getEyeEnlargingIntensityV2); + put(FaceBeautyParam.EYE_ENLARGING_INTENSITY, defaultFaceBeauty::getEyeEnlargingIntensity); put(FaceBeautyParam.EYE_CIRCLE_INTENSITY, defaultFaceBeauty::getEyeCircleIntensity); + put(FaceBeautyParam.BROW_HEIGHT_INTENSITY, defaultFaceBeauty::getBrowHeightIntensity); + put(FaceBeautyParam.BROW_SPACE_INTENSITY, defaultFaceBeauty::getBrowSpaceIntensity); put(FaceBeautyParam.CHIN_INTENSITY, defaultFaceBeauty::getChinIntensity); - put(FaceBeautyParam.FOREHEAD_INTENSITY_V2, defaultFaceBeauty::getForHeadIntensityV2); - put(FaceBeautyParam.NOSE_INTENSITY_V2, defaultFaceBeauty::getNoseIntensityV2); - put(FaceBeautyParam.MOUTH_INTENSITY_V2, defaultFaceBeauty::getMouthIntensityV2); + put(FaceBeautyParam.FOREHEAD_INTENSITY, defaultFaceBeauty::getForHeadIntensity); + put(FaceBeautyParam.NOSE_INTENSITY, defaultFaceBeauty::getNoseIntensity); + put(FaceBeautyParam.MOUTH_INTENSITY, defaultFaceBeauty::getMouthIntensity); put(FaceBeautyParam.CANTHUS_INTENSITY, defaultFaceBeauty::getCanthusIntensity); put(FaceBeautyParam.EYE_SPACE_INTENSITY, defaultFaceBeauty::getEyeSpaceIntensity); put(FaceBeautyParam.EYE_ROTATE_INTENSITY, defaultFaceBeauty::getEyeRotateIntensity); diff --git a/FaceUnity/src/main/java/com/yunbao/faceunity/entity/FaceBeautyBean.java b/FaceUnity/src/main/java/com/yunbao/faceunity/entity/FaceBeautyBean.java index afbe1e2c1..bb0aebb1f 100644 --- a/FaceUnity/src/main/java/com/yunbao/faceunity/entity/FaceBeautyBean.java +++ b/FaceUnity/src/main/java/com/yunbao/faceunity/entity/FaceBeautyBean.java @@ -10,6 +10,9 @@ public class FaceBeautyBean { private int desRes;//描述 private int closeRes;//图片 private int openRes;//图片 + private int toastDesRes; + private boolean canUseFunction; + private ButtonType buttonType=ButtonType.NORMAL_BUTTON; public FaceBeautyBean(String key, int desRes, int closeRes, int openRes) { this.key = key; @@ -18,6 +21,16 @@ public class FaceBeautyBean { this.openRes = openRes; } + public FaceBeautyBean(String key, int desRes, int closeRes, int openRes, int toastDesRes, boolean canUseFunction) { + this.key = key; + this.desRes = desRes; + this.closeRes = closeRes; + this.openRes = openRes; + this.toastDesRes = toastDesRes; + this.canUseFunction = canUseFunction; + this.buttonType = buttonType; + } + public String getKey() { return key; } @@ -49,4 +62,9 @@ public class FaceBeautyBean { public void setOpenRes(int openRes) { this.openRes = openRes; } + enum ButtonType{ + NORMAL_BUTTON, + BACK_BUTTON, + SUB_ITEM_BUTTON + } } diff --git a/FaceUnity/src/main/java/com/yunbao/faceunity/repo/FaceBeautySource.java b/FaceUnity/src/main/java/com/yunbao/faceunity/repo/FaceBeautySource.java index a654983f4..4cd981b63 100644 --- a/FaceUnity/src/main/java/com/yunbao/faceunity/repo/FaceBeautySource.java +++ b/FaceUnity/src/main/java/com/yunbao/faceunity/repo/FaceBeautySource.java @@ -9,6 +9,8 @@ import com.yunbao.faceunity.R; import com.yunbao.faceunity.entity.FaceBeautyBean; import com.yunbao.faceunity.entity.FaceBeautyFilterBean; import com.yunbao.faceunity.entity.ModelAttributeData; +import com.yunbao.faceunity.utils.FaceUnityConfig; +import com.yunbao.faceunity.utils.FuDeviceUtils; import java.io.File; import java.util.ArrayList; @@ -115,33 +117,42 @@ public class FaceBeautySource { */ public static ArrayList buildShapeParams() { ArrayList params = new ArrayList<>(); + //瘦脸 params.add( new FaceBeautyBean( FaceBeautyParam.CHEEK_THINNING_INTENSITY, R.string.beauty_box_cheek_thinning, R.drawable.icon_beauty_shape_face_cheekthin_close_selector, R.drawable.icon_beauty_shape_face_cheekthin_open_selector ) ); + + //V脸 params.add( new FaceBeautyBean( FaceBeautyParam.CHEEK_V_INTENSITY, R.string.beauty_box_cheek_v, R.drawable.icon_beauty_shape_face_v_close_selector, R.drawable.icon_beauty_shape_face_v_open_selector ) ); + + //窄脸 params.add( new FaceBeautyBean( - FaceBeautyParam.CHEEK_NARROW_INTENSITY_V2, R.string.beauty_box_cheek_narrow, + FaceBeautyParam.CHEEK_NARROW_INTENSITY, R.string.beauty_box_cheek_narrow, R.drawable.icon_beauty_shape_face_narrow_close_selector, R.drawable.icon_beauty_shape_face_narrow_open_selector ) ); + + //小脸 -> 短脸 --使用的参数是以前小脸的 params.add( new FaceBeautyBean( FaceBeautyParam.CHEEK_SHORT_INTENSITY, R.string.beauty_box_cheek_short, R.drawable.icon_beauty_shape_face_short_close_selector, R.drawable.icon_beauty_shape_face_short_open_selector ) ); + + //小脸 -> 新增 params.add( new FaceBeautyBean( - FaceBeautyParam.CHEEK_SMALL_INTENSITY_V2, R.string.beauty_box_cheek_small, + FaceBeautyParam.CHEEK_SMALL_INTENSITY, R.string.beauty_box_cheek_small, R.drawable.icon_beauty_shape_face_little_close_selector, R.drawable.icon_beauty_shape_face_little_open_selector ) ); @@ -159,7 +170,7 @@ public class FaceBeautySource { ); params.add( new FaceBeautyBean( - FaceBeautyParam.EYE_ENLARGING_INTENSITY_V2, R.string.beauty_box_eye_enlarge, + FaceBeautyParam.EYE_ENLARGING_INTENSITY, R.string.beauty_box_eye_enlarge, R.drawable.icon_beauty_shape_enlarge_eye_close_selector, R.drawable.icon_beauty_shape_enlarge_eye_open_selector ) ); @@ -177,19 +188,19 @@ public class FaceBeautySource { ); params.add( new FaceBeautyBean( - FaceBeautyParam.FOREHEAD_INTENSITY_V2, R.string.beauty_box_intensity_forehead, + FaceBeautyParam.FOREHEAD_INTENSITY, R.string.beauty_box_intensity_forehead, R.drawable.icon_beauty_shape_forehead_close_selector, R.drawable.icon_beauty_shape_forehead_open_selector ) ); params.add( new FaceBeautyBean( - FaceBeautyParam.NOSE_INTENSITY_V2, R.string.beauty_box_intensity_nose, + FaceBeautyParam.NOSE_INTENSITY, R.string.beauty_box_intensity_nose, R.drawable.icon_beauty_shape_thin_nose_close_selector, R.drawable.icon_beauty_shape_thin_nose_open_selector ) ); params.add( new FaceBeautyBean( - FaceBeautyParam.MOUTH_INTENSITY_V2, R.string.beauty_box_intensity_mouth, + FaceBeautyParam.MOUTH_INTENSITY, R.string.beauty_box_intensity_mouth, R.drawable.icon_beauty_shape_mouth_close_selector, R.drawable.icon_beauty_shape_mouth_open_selector ) ); @@ -229,6 +240,20 @@ public class FaceBeautySource { R.drawable.icon_beauty_shape_smile_close_selector, R.drawable.icon_beauty_shape_smile_open_selector ) ); + params.add( + new FaceBeautyBean( + FaceBeautyParam.BROW_HEIGHT_INTENSITY, R.string.beauty_brow_height, + R.drawable.icon_beauty_shape_brow_height_close_selector, R.drawable.icon_beauty_shape_brow_height_open_selector, + R.string.brow_height_tips,FaceUnityConfig.DEVICE_LEVEL > FuDeviceUtils.DEVICE_LEVEL_MID + ) + ); + params.add( + new FaceBeautyBean( + FaceBeautyParam.BROW_SPACE_INTENSITY, R.string.beauty_brow_space, + R.drawable.icon_beauty_shape_brow_space_close_selector, R.drawable.icon_beauty_shape_brow_space_open_selector, + R.string.brow_space_tips,FaceUnityConfig.DEVICE_LEVEL > FuDeviceUtils.DEVICE_LEVEL_MID + ) + ); return params; } @@ -254,23 +279,25 @@ public class FaceBeautySource { params.put(FaceBeautyParam.CHEEK_LONG_INTENSITY, new ModelAttributeData(0.0, 0.0, 0.0, 1.0)); params.put(FaceBeautyParam.CHEEK_CIRCLE_INTENSITY, new ModelAttributeData(0.0, 0.0, 0.0, 1.0)); params.put(FaceBeautyParam.CHEEK_V_INTENSITY, new ModelAttributeData(0.5, 0.0, 0.0, 1.0)); - params.put(FaceBeautyParam.CHEEK_NARROW_INTENSITY_V2, new ModelAttributeData(0.0, 0.0, 0.0, 1.0)); + params.put(FaceBeautyParam.CHEEK_NARROW_INTENSITY, new ModelAttributeData(0.0, 0.0, 0.0, 1.0)); params.put(FaceBeautyParam.CHEEK_SHORT_INTENSITY, new ModelAttributeData(0.0, 0.0, 0.0, 1.0)); - params.put(FaceBeautyParam.CHEEK_SMALL_INTENSITY_V2, new ModelAttributeData(0.0, 0.0, 0.0, 1.0)); + params.put(FaceBeautyParam.CHEEK_SMALL_INTENSITY, new ModelAttributeData(0.0, 0.0, 0.0, 1.0)); params.put(FaceBeautyParam.INTENSITY_CHEEKBONES_INTENSITY, new ModelAttributeData(0.0, 0.0, 0.0, 1.0)); params.put(FaceBeautyParam.INTENSITY_LOW_JAW_INTENSITY, new ModelAttributeData(0.0, 0.0, 0.0, 1.0)); - params.put(FaceBeautyParam.EYE_ENLARGING_INTENSITY_V2, new ModelAttributeData(0.4, 0.0, 0.0, 1.0)); + params.put(FaceBeautyParam.EYE_ENLARGING_INTENSITY, new ModelAttributeData(0.4, 0.0, 0.0, 1.0)); params.put(FaceBeautyParam.EYE_CIRCLE_INTENSITY, new ModelAttributeData(0.0, 0.0, 0.0, 1.0)); params.put(FaceBeautyParam.CHIN_INTENSITY, new ModelAttributeData(0.3, 0.5, 0.0, 1.0)); - params.put(FaceBeautyParam.FOREHEAD_INTENSITY_V2, new ModelAttributeData(0.3, 0.5, 0.0, 1.0)); - params.put(FaceBeautyParam.NOSE_INTENSITY_V2, new ModelAttributeData(0.5, 0.0, 0.0, 1.0)); - params.put(FaceBeautyParam.MOUTH_INTENSITY_V2, new ModelAttributeData(0.4, 0.5, 0.0, 1.0)); + params.put(FaceBeautyParam.FOREHEAD_INTENSITY, new ModelAttributeData(0.3, 0.5, 0.0, 1.0)); + params.put(FaceBeautyParam.NOSE_INTENSITY, new ModelAttributeData(0.5, 0.0, 0.0, 1.0)); + params.put(FaceBeautyParam.MOUTH_INTENSITY, new ModelAttributeData(0.4, 0.5, 0.0, 1.0)); params.put(FaceBeautyParam.CANTHUS_INTENSITY, new ModelAttributeData(0.0, 0.0, 0.0, 1.0)); params.put(FaceBeautyParam.EYE_SPACE_INTENSITY, new ModelAttributeData(0.5, 0.5, 0.0, 1.0)); params.put(FaceBeautyParam.EYE_ROTATE_INTENSITY, new ModelAttributeData(0.5, 0.5, 0.0, 1.0)); params.put(FaceBeautyParam.LONG_NOSE_INTENSITY, new ModelAttributeData(0.5, 0.5, 0.0, 1.0)); params.put(FaceBeautyParam.PHILTRUM_INTENSITY, new ModelAttributeData(0.5, 0.5, 0.0, 1.0)); params.put(FaceBeautyParam.SMILE_INTENSITY, new ModelAttributeData(0.0, 0.0, 0.0, 1.0)); + params.put(FaceBeautyParam.BROW_HEIGHT_INTENSITY, new ModelAttributeData(0.5, 0.5, 0.0, 1.0)); + params.put(FaceBeautyParam.BROW_SPACE_INTENSITY, new ModelAttributeData(0.5, 0.5, 0.0, 1.0)); return params; } diff --git a/FaceUnity/src/main/res/drawable/icon_beauty_shape_brow_height_close_selector.xml b/FaceUnity/src/main/res/drawable/icon_beauty_shape_brow_height_close_selector.xml new file mode 100644 index 000000000..57b1ab4d0 --- /dev/null +++ b/FaceUnity/src/main/res/drawable/icon_beauty_shape_brow_height_close_selector.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/FaceUnity/src/main/res/drawable/icon_beauty_shape_brow_height_open_selector.xml b/FaceUnity/src/main/res/drawable/icon_beauty_shape_brow_height_open_selector.xml new file mode 100644 index 000000000..33ef8ecdf --- /dev/null +++ b/FaceUnity/src/main/res/drawable/icon_beauty_shape_brow_height_open_selector.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/FaceUnity/src/main/res/drawable/icon_beauty_shape_brow_space_close_selector.xml b/FaceUnity/src/main/res/drawable/icon_beauty_shape_brow_space_close_selector.xml new file mode 100644 index 000000000..f86e0320b --- /dev/null +++ b/FaceUnity/src/main/res/drawable/icon_beauty_shape_brow_space_close_selector.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/FaceUnity/src/main/res/drawable/icon_beauty_shape_brow_space_open_selector.xml b/FaceUnity/src/main/res/drawable/icon_beauty_shape_brow_space_open_selector.xml new file mode 100644 index 000000000..aaf636905 --- /dev/null +++ b/FaceUnity/src/main/res/drawable/icon_beauty_shape_brow_space_open_selector.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_brow_height_close_checked.png b/FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_brow_height_close_checked.png new file mode 100644 index 000000000..ae386c0f8 Binary files /dev/null and b/FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_brow_height_close_checked.png differ diff --git a/FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_brow_height_close_normal.png b/FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_brow_height_close_normal.png new file mode 100644 index 000000000..0e93911fc Binary files /dev/null and b/FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_brow_height_close_normal.png differ diff --git a/FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_brow_height_open_checked.png b/FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_brow_height_open_checked.png new file mode 100644 index 000000000..6bfb915bd Binary files /dev/null and b/FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_brow_height_open_checked.png differ diff --git a/FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_brow_height_open_normal.png b/FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_brow_height_open_normal.png new file mode 100644 index 000000000..a4e5aa876 Binary files /dev/null and b/FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_brow_height_open_normal.png differ diff --git a/FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_brow_space_close_checked.png b/FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_brow_space_close_checked.png new file mode 100644 index 000000000..075d7dd80 Binary files /dev/null and b/FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_brow_space_close_checked.png differ diff --git a/FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_brow_space_close_normal.png b/FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_brow_space_close_normal.png new file mode 100644 index 000000000..22da58b51 Binary files /dev/null and b/FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_brow_space_close_normal.png differ diff --git a/FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_brow_space_open_checked.png b/FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_brow_space_open_checked.png new file mode 100644 index 000000000..64547f75e Binary files /dev/null and b/FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_brow_space_open_checked.png differ diff --git a/FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_brow_space_open_normal.png b/FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_brow_space_open_normal.png new file mode 100644 index 000000000..22a98f4b6 Binary files /dev/null and b/FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_brow_space_open_normal.png differ diff --git a/FaceUnity/src/main/res/values-zh-rCN/strings.xml b/FaceUnity/src/main/res/values-zh-rCN/strings.xml index 3958866f0..2231f27a0 100644 --- a/FaceUnity/src/main/res/values-zh-rCN/strings.xml +++ b/FaceUnity/src/main/res/values-zh-rCN/strings.xml @@ -6,27 +6,18 @@ 重试 退出 - 美颜 - 美妆 - 贴纸 - 美体 - + Resolution:\n\t%dX%d\nFPS: %d\nRender time:\n\t%dms + 保存照片成功! + 保存视频成功! + 保存视频失败! + 视频太短啦! + 视频处理中请稍等 未检测到人脸 - 未检测到人脸 - 未检测到人体 - 未检测到手势 - 未检测到人脸或人体 + 人脸不全 + 单输入 + 双输入 - 确定 - 取消 - 确定删除所选中的道具? - 是否将所有参数恢复到默认值? - 删除成功 - 删除失败 - 道具保存成功 - - 恢复 - 精细磨皮 + 磨皮 美白 红润 锐化 @@ -34,6 +25,10 @@ 美牙 大眼 圆眼 + 自然 + 女神 + 长脸 + 圆脸 瘦脸 V脸 窄脸 @@ -52,23 +47,246 @@ 去黑眼圈 去法令纹 微笑嘴角 + 眉毛上下 + 眉间距 开眼角 缩人中 长鼻 眼距 眼睛角度 + 口红 + 腮红 + 眉毛 + 眼影 + 眼线 + 睫毛 + 美瞳 + 粉底 + 高光 + 阴影 + 卸妆 + 自定义 + 桃花 + 男友 + 清透 + 西柚 + 选择图片 + 选择视频 + 请从相册中选择图片或视频 + 所选图片文件不存在。 + 所选视频文件不存在。 + + 张嘴试试 + 鼓腮帮子 + 皱眉试试 + 眨一眨眼 + 嘟嘴试试 + 微笑触发 + 吹气触发 + 张嘴试试 + 推出手掌 + 单手手指比心 + 比个六 + 双拳靠近脸颊卖萌 + 原图 白亮 1 + 白亮 2 + 白亮 3 + 白亮 4 + 白亮 5 + 白亮 6 + 白亮 7 粉嫩 1 + 粉嫩 2 + 粉嫩 3 + 粉嫩 5 + 粉嫩 6 + 粉嫩 7 + 粉嫩 8 + 小清新 1 + 小清新 3 + 小清新 4 + 小清新 6 冷色调 1 + 冷色调 2 + 冷色调 3 + 冷色调 4 + 冷色调 7 + 冷色调 8 + 冷色调 11 + 暖色调 1 + 暖色调 2 + 个性 1 + 个性 2 + 个性 3 + 个性 4 + 个性 5 + 个性 7 + 个性 10 + 个性 11 + 黑白 1 + 黑白 2 + 黑白 3 + 黑白 4 自然 1 + 自然 2 + 自然 3 + 自然 4 + 自然 5 + 自然 6 + 自然 7 + 自然 8 质感灰 1 + 质感灰 2 + 质感灰 3 + 质感灰 4 + 质感灰 5 + 质感灰 6 + 质感灰 7 + 质感灰 8 + 蜜桃 1 + 蜜桃 2 + 蜜桃 3 + 蜜桃 4 + 蜜桃 5 + 蜜桃 6 + 蜜桃 7 + 蜜桃 8 - 卸妆 - 奶茶 - 豆沙 - 超A + + 风格 1 + 风格 2 + 风格 3 + 风格 4 + 风格 5 + 风格 6 + 风格 7 + 使用%s先取消“风格推荐” + + 对准线框 正脸拍摄 + 替换失败 + 未识别模板的人脸,请重新选择模板 + 未检测到人脸,请重新拍摄 + 人脸不全,请重新拍摄 + 人脸偏转角度过大,请正脸拍摄。 + 知道啦 + 检测到多人,请选择一人进行换脸 + + Animoji + 动漫滤镜 + + 删除模型 + 新建模型 + 编辑模型 + + 发型 + 脸型 + 眼睛 + 嘴唇 + 鼻子 + + 脸型长度 + 脸颊宽度 + 下颚宽度 + 下巴高低 + 眼睛位置 + 眼角高度 + 眼睛高低 + 眼睛宽窄 + 鼻子位置 + 鼻翼宽窄 + 鼻头高低 + 嘴部位置 + 上唇厚度 + 下唇厚度 + 嘴唇宽度 + 你还没有创建过模型哦 + 是否将所有参数恢复到默认值? + 自定义 + 保存成功 + + 返回后当前操作将不会被保存哦 + 删除 + 取消 + 删除(%d) + 删除道具 + 全选 + 你还没有创建过道具哦 + 确定 + 取消 + 确定删除所选中的道具? + 删除成功 + 删除失败 + 道具保存成功 + 恢复 + + 雾面 + 润泽Ⅰ + 润泽Ⅱ + 珠光 + 咬唇 + 苹果肌 + 扇形 + 眼角 + 微醺 + 高光 I + 高光 II + 阴影 I + 蜜糖 + 奶茶 + 水波 + 鎏金 + 孔雀 + 星河 + 落目 + 极光 + 柳叶眉 + 野生眉 + 古典眉 + 标准眉 + 单色眼影 + 双色眼影 I + 双色眼影 II + 双色眼影 III + 三色眼影 I + 三色眼影 II + 自然型 I + 自然型 II + 浓密型 I + 浓密型 II + 夸张型 I + 夸张型 II + 猫眼 + 下垂眼 + 拉开眼距 + 拉近眼距 + 长眼 + 圆眼 + + 嗲嗲兔 + 冻龄 + 国风 + 混血 + 性感 + 甜美 + 邻家 + 欧美 + 妩媚 + 减龄 + 暖冬 + 红枫 + 少女 + 紫韵 + 厌世猫 + 人鱼 + 初秋 + 千纸鹤 + 超模 + 雏菊 + 港风 + Rose 瘦身 长腿 @@ -77,9 +295,47 @@ 美臀 小头 瘦腿 + 未检测到人体 + 全身驱动 + 半身驱动 + 载入图片或视频 + 未检测到手势 + + 抠像 + 背景 + 关键颜色 + 相似度 + 平滑 + 祛色度 + 安全区域 + 科技 + 沙滩 + 教室 + 森林 + 水墨画 + 请使用纯色背景拍摄,推荐绿色幕布效果最佳 + 我知道了 + + 下载失败 + 返回 + + 白色区域为安全区域,不参与绿幕抠像 + + 眉毛上下功能仅支持在高端机上使用 + 眉间距功能仅支持在高端机上使用 + 美颜 + 美妆 + 贴纸 + 美体 + 未检测到人脸 + 未检测到人脸或人体 + + 奶茶 + 豆沙 + 超A diff --git a/FaceUnity/src/main/res/values/strings.xml b/FaceUnity/src/main/res/values/strings.xml index 8692ac78a..7c5a24b58 100644 --- a/FaceUnity/src/main/res/values/strings.xml +++ b/FaceUnity/src/main/res/values/strings.xml @@ -5,26 +5,17 @@ Retry quit - Beautification - Makeup - Sticker - Body - + Resolution:\n\t%dX%d\nFPS: %d\nRender time:\n\t%dms + Save photo successfully! + Save video successfully! + Save video failed! + The video is to short! + Please wait while the video is processing No face tracking - No face tracking - No body tracking - No gesture tracking - No face or body tracking + Incomplete face + SingleInput + DualInput - Yes - Cancel - Are you sure to delete? - Reset all parameters to default? - Delete succeed - Delete failed - Save succeed - - Recover Fine smooth Whiten Ruddy @@ -33,10 +24,14 @@ Tooth whiten Eye enlarge Eye round - Cheek thin - V face + Natural + Goddess + Long face + Round face Cheekbone Jawbone + Cheek thin + V face CheekNarrow Cheek short Cheek small @@ -48,28 +43,254 @@ Reshape Filter Presets + Lipstick + Blush + Eyebrow + Eye shadow + Eye liner + Eyelash + Contact lens + Foundation + Highlight + Shadow + Remove + Custom + Peach + Boyfriend + Clear + Grapefruit Circle Wrinkles Smile + Brow height + Brow space Canthus Philtrum Length Eye distance Slant + None + Style 1 + Style 2 + Style 3 + Style 4 + Style 5 + Style 6 + Style 7 + To use %s, cancel \'Presets\' first. + + Photo + Video + Choose photo or video from your album + The selected image file does not exist. + The selected video file does not exist. + + Open your mouth + Puff your cheeks + Frown + Blink + Give me a kiss + Have a Smile + Whistle + Open your mouth + High five + Finger heart + Shaka sign + Holding fist Origin Bright 1 + Bright 2 + Bright 3 + Bright 4 + Bright 5 + Bright 6 + Bright 7 Pink 1 + Pink 2 + Pink 3 + Pink 5 + Pink 6 + Pink 7 + Pink 8 + Fresh 1 + Fresh 3 + Fresh 4 + Fresh 6 Cold tone 1 + Cold tone 2 + Cold tone 3 + Cold tone 4 + Cold tone 7 + Cold tone 8 + Cold tone 11 + Warm tone 1 + Warm tone 2 + Personality 1 + Personality 2 + Personality 3 + Personality 4 + Personality 5 + Personality 7 + Personality 10 + Personality 11 + Fade 1 + Fade 2 + Fade 3 + Fade 4 Nature 1 + Nature 2 + Nature 3 + Nature 4 + Nature 5 + Nature 6 + Nature 7 + Nature 8 Grey 1 + Grey 2 + Grey 3 + Grey 4 + Grey 5 + Grey 6 + Grey 7 + Grey 8 + Peach 1 + Peach 2 + Peach 3 + Peach 4 + Peach 5 + Peach 6 + Peach 7 + Peach 8 + Please take photos by positive face. + change face failed + No template face detected, please re-upload + No face detected, please re-upload + No face detected, please re-upload + Side face angle is too greater, please re-upload + OK + Multiple people detected, please choose one person for face fusion - Remover + Animoji + Cartoon filter + + Custom won\'t be saved after return + Delete + Cancel + Delete (%d) + Not created model + Delete model + All + Yes + Cancel + Are you sure to delete? + Delete succeed + Delete failed + Save succeed + + Delete model + Create model + Edit model + + Hair style + Face shape + Eyes + Mouth + Nose + + Face length + Cheek width + Jaw width + Jaw length + Eye position + Canthus position + Eye width + Eye length + Nose position + Nose width + Nose height + Mouth position + Upper lip thickness + Down lip thickness + Lip width + No model has been created + Reset all parameters to default? + Custom + Save succeed + Recover + + Matte + Moist + Water + Pearl + Bitelip + Apple muscle + Sector + Canthus + Tipsy + Highlight I + Highlight II + Shadow I + Honey + Milk tea + Ripple + Gilding + Peacock + Milky way + Curtain + Aurora + Willow + Wild + Classical + Standard + Monochrome + Dichromatic I + Dichromatic II + Dichromatic III + Tricolor I + Tricolor II + Natural I + Natural II + Denseness I + Denseness II + Hyperbole I + Hyperbole II + Cats eye + Drooping eye + Expand Eye distance + Shorten Eye distance + Long eye + Round eye + diadiatu + Freezing age + National style + Mixed race + Sexy + Sweet + Next-door + European + Charming + Tender + Warm + Maple + Maiden + Purple + Cat + Mermaid + Autumn + Crane + Model + Daisy + HK style + Rose Milk tea Bean paste Super a - + Beautification + Makeup + Sticker + Body Body Leg @@ -78,6 +299,34 @@ Hip Head shrink Thin leg + No body tracking + Body driver + Bust driver + Load picture or video + No gesture tracking + + Keying + Background + Key color + Similarity + Smoothness + Transparency + Safe Area + Technology + Sand + Classroom + Forest + Ink + Please use a solid background, a green screen is recommended for the best effect + I know + + Download failed, please check the network and try again + back + + The white area is a safe area and does not participate in green screen matting + + This function is only supported for high-end computers + This function is only supported for high-end computers