补充美颜模型和美颜配置

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) {

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);

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
+    }
 }

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<FaceBeautyBean> buildShapeParams() {
         ArrayList<FaceBeautyBean> 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;
     }
 

FaceUnity/src/main/res/drawable/icon_beauty_shape_brow_height_close_selector.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@mipmap/icon_beauty_box_brow_height_close_checked" android:state_selected="true" />
+    <item android:drawable="@mipmap/icon_beauty_box_brow_height_close_normal" />
+</selector>

FaceUnity/src/main/res/drawable/icon_beauty_shape_brow_height_open_selector.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@mipmap/icon_beauty_box_brow_height_open_checked" android:state_selected="true" />
+    <item android:drawable="@mipmap/icon_beauty_box_brow_height_open_normal" />
+</selector>

FaceUnity/src/main/res/drawable/icon_beauty_shape_brow_space_close_selector.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@mipmap/icon_beauty_box_brow_space_close_checked" android:state_selected="true" />
+    <item android:drawable="@mipmap/icon_beauty_box_brow_space_close_normal" />
+</selector>

FaceUnity/src/main/res/drawable/icon_beauty_shape_brow_space_open_selector.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@mipmap/icon_beauty_box_brow_space_open_checked" android:state_selected="true" />
+    <item android:drawable="@mipmap/icon_beauty_box_brow_space_open_normal" />
+</selector>

FaceUnity/src/main/res/values-zh-rCN/strings.xml

@@ -6,27 +6,18 @@
     <string name="camera_dialog_open">重试</string>
     <string name="camera_dialog_back">退出</string>
 
-    <string name="home_function_name_beauty">美颜</string>
-    <string name="home_function_name_makeup">美妆</string>
-    <string name="home_function_name_sticker">贴纸</string>
-    <string name="home_function_name_beauty_body">美体</string>
-
+    <string name="fu_base_debug">Resolution:\n\t%dX%d\nFPS: %d\nRender time:\n\t%dms</string>
+    <string name="save_photo_success">保存照片成功！</string>
+    <string name="save_video_success">保存视频成功！</string>
+    <string name="save_video_failed">保存视频失败！</string>
+    <string name="save_video_too_short">视频太短啦！</string>
+    <string name="save_video_wait">视频处理中请稍等</string>
     <string name="fu_base_is_tracking_text">未检测到人脸</string>
-    <string name="toast_not_detect_face">未检测到人脸</string>
-    <string name="toast_not_detect_body">未检测到人体</string>
-    <string name="toast_not_detect_gesture">未检测到手势</string>
-    <string name="toast_not_detect_face_or_body">未检测到人脸或人体</string>
+    <string name="fu_base_incomplete_face_text">人脸不全</string>
+    <string name="fu_base_input_type_single">单输入</string>
+    <string name="fu_base_input_type_double">双输入</string>
 
-    <string name="confirm">确定</string>
-    <string name="cancel">取消</string>
-    <string name="dialog_confirm_delete">确定删除所选中的道具？</string>
-    <string name="dialog_reset_avatar_model">是否将所有参数恢复到默认值?</string>
-    <string name="toast_delete_succeed">删除成功</string>
-    <string name="toast_delete_failed">删除失败</string>
-    <string name="live_photo_save_succeed">道具保存成功</string>
-
-    <string name="recover">恢复</string>
-    <string name="beauty_box_heavy_blur_fine">精细磨皮</string>
+    <string name="beauty_box_heavy_blur_fine">磨皮</string>
     <string name="beauty_box_color_level">美白</string>
     <string name="beauty_box_red_level">红润</string>
     <string name="beauty_box_sharpen">锐化</string>
@@ -34,6 +25,10 @@
     <string name="beauty_box_tooth_whiten">美牙</string>
     <string name="beauty_box_eye_enlarge">大眼</string>
     <string name="beauty_box_eye_circle">圆眼</string>
+    <string name="beauty_box_cheek_natural">自然</string>
+    <string name="beauty_box_cheek_goddess">女神</string>
+    <string name="beauty_box_cheek_long_face">长脸</string>
+    <string name="beauty_box_cheek_round_face">圆脸</string>
     <string name="beauty_box_cheek_thinning">瘦脸</string>
     <string name="beauty_box_cheek_v">V脸</string>
     <string name="beauty_box_cheek_narrow">窄脸</string>
@@ -52,23 +47,246 @@
     <string name="beauty_micro_pouch">去黑眼圈</string>
     <string name="beauty_micro_nasolabial">去法令纹</string>
     <string name="beauty_micro_smile">微笑嘴角</string>
+    <string name="beauty_brow_height">眉毛上下</string>
+    <string name="beauty_brow_space">眉间距</string>
     <string name="beauty_micro_canthus">开眼角</string>
     <string name="beauty_micro_philtrum">缩人中</string>
     <string name="beauty_micro_long_nose">长鼻</string>
     <string name="beauty_micro_eye_space">眼距</string>
     <string name="beauty_micro_eye_rotate">眼睛角度</string>
 
+    <string name="makeup_radio_lipstick">口红</string>
+    <string name="makeup_radio_blusher">腮红</string>
+    <string name="makeup_radio_eyebrow">眉毛</string>
+    <string name="makeup_radio_eye_shadow">眼影</string>
+    <string name="makeup_radio_eye_liner">眼线</string>
+    <string name="makeup_radio_eyelash">睫毛</string>
+    <string name="makeup_radio_contact_lens">美瞳</string>
+    <string name="makeup_radio_foundation">粉底</string>
+    <string name="makeup_radio_highlight">高光</string>
+    <string name="makeup_radio_shadow">阴影</string>
+    <string name="makeup_radio_remove">卸妆</string>
+    <string name="makeup_customize">自定义</string>
+    <string name="makeup_peach_blossom">桃花</string>
+    <string name="makeup_boyfriend">男友</string>
+    <string name="makeup_clear">清透</string>
+    <string name="makeup_grapefruit">西柚</string>
+    <string name="select_data_photo">选择图片</string>
+    <string name="select_data_video">选择视频</string>
+    <string name="select_data_title">请从相册中选择图片或视频</string>
+    <string name="image_file_does_not_exist">所选图片文件不存在。</string>
+    <string name="video_file_does_not_exist">所选视频文件不存在。</string>
+
+    <string name="future_warrior">张嘴试试</string>
+    <string name="jet_mask">鼓腮帮子</string>
+    <string name="sdx2">皱眉试试</string>
+    <string name="luhantongkuan_ztt_fu">眨一眨眼</string>
+    <string name="qingqing_ztt_fu">嘟嘴试试</string>
+    <string name="xiaobianzi_zh_fu">微笑触发</string>
+    <string name="xiaoxueshen_ztt_fu">吹气触发</string>
+    <string name="hez_ztt_fu">张嘴试试</string>
+    <string name="push_hand">推出手掌</string>
+    <string name="fu_lm_koreaheart">单手手指比心</string>
+    <string name="ssd_thread_six">比个六</string>
+    <string name="ssd_thread_cute">双拳靠近脸颊卖萌</string>
+
     <string name="origin">原图</string>
     <string name="bailiang_1">白亮 1</string>
+    <string name="bailiang_2">白亮 2</string>
+    <string name="bailiang_3">白亮 3</string>
+    <string name="bailiang_4">白亮 4</string>
+    <string name="bailiang_5">白亮 5</string>
+    <string name="bailiang_6">白亮 6</string>
+    <string name="bailiang_7">白亮 7</string>
     <string name="fennen_1">粉嫩 1</string>
+    <string name="fennen_2">粉嫩 2</string>
+    <string name="fennen_3">粉嫩 3</string>
+    <string name="fennen_5">粉嫩 5</string>
+    <string name="fennen_6">粉嫩 6</string>
+    <string name="fennen_7">粉嫩 7</string>
+    <string name="fennen_8">粉嫩 8</string>
+    <string name="xiaoqingxin_1">小清新 1</string>
+    <string name="xiaoqingxin_3">小清新 3</string>
+    <string name="xiaoqingxin_4">小清新 4</string>
+    <string name="xiaoqingxin_6">小清新 6</string>
     <string name="lengsediao_1">冷色调 1</string>
+    <string name="lengsediao_2">冷色调 2</string>
+    <string name="lengsediao_3">冷色调 3</string>
+    <string name="lengsediao_4">冷色调 4</string>
+    <string name="lengsediao_7">冷色调 7</string>
+    <string name="lengsediao_8">冷色调 8</string>
+    <string name="lengsediao_11">冷色调 11</string>
+    <string name="nuansediao_1">暖色调 1</string>
+    <string name="nuansediao_2">暖色调 2</string>
+    <string name="gexing_1">个性 1</string>
+    <string name="gexing_2">个性 2</string>
+    <string name="gexing_3">个性 3</string>
+    <string name="gexing_4">个性 4</string>
+    <string name="gexing_5">个性 5</string>
+    <string name="gexing_7">个性 7</string>
+    <string name="gexing_10">个性 10</string>
+    <string name="gexing_11">个性 11</string>
+    <string name="heibai_1">黑白 1</string>
+    <string name="heibai_2">黑白 2</string>
+    <string name="heibai_3">黑白 3</string>
+    <string name="heibai_4">黑白 4</string>
     <string name="ziran_1">自然 1</string>
+    <string name="ziran_2">自然 2</string>
+    <string name="ziran_3">自然 3</string>
+    <string name="ziran_4">自然 4</string>
+    <string name="ziran_5">自然 5</string>
+    <string name="ziran_6">自然 6</string>
+    <string name="ziran_7">自然 7</string>
+    <string name="ziran_8">自然 8</string>
     <string name="zhiganhui_1">质感灰 1</string>
+    <string name="zhiganhui_2">质感灰 2</string>
+    <string name="zhiganhui_3">质感灰 3</string>
+    <string name="zhiganhui_4">质感灰 4</string>
+    <string name="zhiganhui_5">质感灰 5</string>
+    <string name="zhiganhui_6">质感灰 6</string>
+    <string name="zhiganhui_7">质感灰 7</string>
+    <string name="zhiganhui_8">质感灰 8</string>
+    <string name="mitao_1">蜜桃 1</string>
+    <string name="mitao_2">蜜桃 2</string>
+    <string name="mitao_3">蜜桃 3</string>
+    <string name="mitao_4">蜜桃 4</string>
+    <string name="mitao_5">蜜桃 5</string>
+    <string name="mitao_6">蜜桃 6</string>
+    <string name="mitao_7">蜜桃 7</string>
+    <string name="mitao_8">蜜桃 8</string>
 
-    <string name="makeup_radio_remove">卸妆</string>
-    <string name="makeup_combination_naicha">奶茶</string>
-    <string name="makeup_combination_dousha">豆沙</string>
-    <string name="makeup_combination_chaoa">超A</string>
+    <string name="beauty_face_style_none">无</string>
+    <string name="beauty_face_style_1">风格 1</string>
+    <string name="beauty_face_style_2">风格 2</string>
+    <string name="beauty_face_style_3">风格 3</string>
+    <string name="beauty_face_style_4">风格 4</string>
+    <string name="beauty_face_style_5">风格 5</string>
+    <string name="beauty_face_style_6">风格 6</string>
+    <string name="beauty_face_style_7">风格 7</string>
+    <string name="beauty_face_style_toast">使用%s先取消“风格推荐”</string>
+
+    <string name="poster_take_photo">对准线框 正脸拍摄</string>
+    <string name="poster_change_face_error">替换失败</string>
+    <string name="poster_template_face_none">未识别模板的人脸，请重新选择模板</string>
+    <string name="dialog_no_track_face">未检测到人脸，请重新拍摄</string>
+    <string name="dialog_no_incomplete_face">人脸不全，请重新拍摄</string>
+    <string name="dialog_face_rotation_not_valid">人脸偏转角度过大，请正脸拍摄。</string>
+    <string name="dialog_got">知道啦</string>
+    <string name="tip_dual_face">检测到多人，请选择一人进行换脸</string>
+
+    <string name="animoji_filter">Animoji</string>
+    <string name="cartoon_filter">动漫滤镜</string>
+
+    <string name="delete_avatar_model">删除模型</string>
+    <string name="new_avatar_model">新建模型</string>
+    <string name="edit_avatar_model">编辑模型</string>
+
+    <string name="avatar_face_hair">发型</string>
+    <string name="avatar_face_face">脸型</string>
+    <string name="avatar_face_eye">眼睛</string>
+    <string name="avatar_face_lip">嘴唇</string>
+    <string name="avatar_face_nose">鼻子</string>
+
+    <string name="avatar_face_length">脸型长度</string>
+    <string name="avatar_face_width">脸颊宽度</string>
+    <string name="avatar_chin_width">下颚宽度</string>
+    <string name="avatar_chin_height">下巴高低</string>
+    <string name="avatar_eye_position">眼睛位置</string>
+    <string name="avatar_eye_corner_height">眼角高度</string>
+    <string name="avatar_eye_height">眼睛高低</string>
+    <string name="avatar_eye_width">眼睛宽窄</string>
+    <string name="avatar_nose_position">鼻子位置</string>
+    <string name="avatar_nose_width">鼻翼宽窄</string>
+    <string name="avatar_nose_height">鼻头高低</string>
+    <string name="avatar_mouth_position">嘴部位置</string>
+    <string name="avatar_up_lip_thickness">上唇厚度</string>
+    <string name="avatar_down_lip_thickness">下唇厚度</string>
+    <string name="avatar_lip_width">嘴唇宽度</string>
+    <string name="model_empty_tip">你还没有创建过模型哦</string>
+    <string name="dialog_reset_avatar_model">是否将所有参数恢复到默认值?</string>
+    <string name="avatar_face_customize">自定义</string>
+    <string name="avatar_save_succeed">保存成功</string>
+
+    <string name="live_photo_back_not_save">返回后当前操作将不会被保存哦</string>
+    <string name="live_photo_btn_delete">删除</string>
+    <string name="live_photo_btn_cancel">取消</string>
+    <string name="live_photo_btn_delete_">删除(%d)</string>
+    <string name="live_photo_delete_effect">删除道具</string>
+    <string name="live_photo__delete_all">全选</string>
+    <string name="live_photo_empty_list_tip">你还没有创建过道具哦</string>
+    <string name="confirm">确定</string>
+    <string name="cancel">取消</string>
+    <string name="dialog_confirm_delete">确定删除所选中的道具？</string>
+    <string name="toast_delete_succeed">删除成功</string>
+    <string name="toast_delete_failed">删除失败</string>
+    <string name="live_photo_save_succeed">道具保存成功</string>
+    <string name="recover">恢复</string>
+
+    <string name="makeup_lip_fog">雾面</string>
+    <string name="makeup_lip_moist1">润泽Ⅰ</string>
+    <string name="makeup_lip_moist2">润泽Ⅱ</string>
+    <string name="makeup_lip_pearl">珠光</string>
+    <string name="makeup_lip_bitelip">咬唇</string>
+    <string name="makeup_blusher_apple">苹果肌</string>
+    <string name="makeup_blusher_fan">扇形</string>
+    <string name="makeup_blusher_eye_corner">眼角</string>
+    <string name="makeup_blusher_slight_drunk">微醺</string>
+    <string name="makeup_highlight_one">高光 I</string>
+    <string name="makeup_highlight_two">高光 II</string>
+    <string name="makeup_shadow_one">阴影 I</string>
+    <string name="makeup_pupil_1">蜜糖</string>
+    <string name="makeup_pupil_2">奶茶</string>
+    <string name="makeup_pupil_3">水波</string>
+    <string name="makeup_pupil_4">鎏金</string>
+    <string name="makeup_pupil_5">孔雀</string>
+    <string name="makeup_pupil_6">星河</string>
+    <string name="makeup_pupil_7">落目</string>
+    <string name="makeup_pupil_8">极光</string>
+    <string name="makeup_eyebrow_willow">柳叶眉</string>
+    <string name="makeup_eyebrow_wild">野生眉</string>
+    <string name="makeup_eyebrow_classical">古典眉</string>
+    <string name="makeup_eyebrow_standard">标准眉</string>
+    <string name="makeup_eye_shadow_single">单色眼影</string>
+    <string name="makeup_eye_shadow_double1">双色眼影 I</string>
+    <string name="makeup_eye_shadow_double2">双色眼影 II</string>
+    <string name="makeup_eye_shadow_double3">双色眼影 III</string>
+    <string name="makeup_eye_shadow_triple1">三色眼影 I</string>
+    <string name="makeup_eye_shadow_triple2">三色眼影 II</string>
+    <string name="makeup_eyelash_natural1">自然型 I</string>
+    <string name="makeup_eyelash_natural2">自然型 II</string>
+    <string name="makeup_eyelash_thick1">浓密型 I</string>
+    <string name="makeup_eyelash_thick2">浓密型 II</string>
+    <string name="makeup_eyelash_exaggerate1">夸张型 I</string>
+    <string name="makeup_eyelash_exaggerate2">夸张型 II</string>
+    <string name="makeup_eye_linear_cat">猫眼</string>
+    <string name="makeup_eye_linear_drooping">下垂眼</string>
+    <string name="makeup_eye_linear_pull_open">拉开眼距</string>
+    <string name="makeup_eye_linear_pull_close">拉近眼距</string>
+    <string name="makeup_eye_linear_long">长眼</string>
+    <string name="makeup_eye_linear_circular">圆眼</string>
+
+    <string name="makeup_combination_diadiatu">嗲嗲兔</string>
+    <string name="makeup_combination_dongling">冻龄</string>
+    <string name="makeup_combination_guofeng">国风</string>
+    <string name="makeup_combination_hunxie">混血</string>
+    <string name="makeup_combination_sexy">性感</string>
+    <string name="makeup_combination_sweet">甜美</string>
+    <string name="makeup_combination_neighbor">邻家</string>
+    <string name="makeup_combination_occident">欧美</string>
+    <string name="makeup_combination_charming">妩媚</string>
+    <string name="makeup_combination_jianling">减龄</string>
+    <string name="makeup_combination_nuandong">暖冬</string>
+    <string name="makeup_combination_hongfeng">红枫</string>
+    <string name="makeup_combination_shaonv">少女</string>
+    <string name="makeup_combination_ziyun">紫韵</string>
+    <string name="makeup_combination_yanshimao">厌世猫</string>
+    <string name="makeup_combination_renyu">人鱼</string>
+    <string name="makeup_combination_chuqiu">初秋</string>
+    <string name="makeup_combination_qianzhihe">千纸鹤</string>
+    <string name="makeup_combination_chaomo">超模</string>
+    <string name="makeup_combination_chuju">雏菊</string>
+    <string name="makeup_combination_gangfeng">港风</string>
+    <string name="makeup_combination_rose">Rose</string>
 
     <string name="slimming">瘦身</string>
     <string name="long_legs">长腿</string>
@@ -77,9 +295,47 @@
     <string name="beautify_hip_slim">美臀</string>
     <string name="beautify_head_slim">小头</string>
     <string name="beautify_leg_thin_slim">瘦腿</string>
+    <string name="toast_not_detect_body">未检测到人体</string>
+    <string name="pta_human_full_body">全身驱动</string>
+    <string name="pta_human_half_body">半身驱动</string>
 
 
+    <string name="select_data_photo_or_video">载入图片或视频</string>
+    <string name="toast_not_detect_gesture">未检测到手势</string>
+
+    <string name="bg_seg_green_graphic">抠像</string>
+    <string name="bg_seg_green_background">背景</string>
+    <string name="bg_seg_green_key_color">关键颜色</string>
+    <string name="bg_seg_green_similarity">相似度</string>
+    <string name="bg_seg_green_smooth">平滑</string>
+    <string name="bg_seg_green_alpha">祛色度</string>
+    <string name="bg_seg_green_safe_area">安全区域</string>
+    <string name="bg_seg_green_science">科技</string>
+    <string name="bg_seg_green_beach">沙滩</string>
+    <string name="bg_seg_green_classroom">教室</string>
+    <string name="bg_seg_green_forest">森林</string>
+    <string name="bg_seg_green_ink">水墨画</string>
+    <string name="dialog_guide_bg_seg_green">请使用纯色背景拍摄，推荐绿色幕布效果最佳</string>
+    <string name="dialog_i_know">我知道了</string>
+
+    <string name="download_error">下载失败</string>
+    <string name="back">返回</string>
+
+    <string name="safe_area_tips">白色区域为安全区域，不参与绿幕抠像</string>
+
+    <string name="brow_height_tips">眉毛上下功能仅支持在高端机上使用</string>
+    <string name="brow_space_tips">眉间距功能仅支持在高端机上使用</string>
 
 
+    <string name="home_function_name_beauty">美颜</string>
+    <string name="home_function_name_makeup">美妆</string>
+    <string name="home_function_name_sticker">贴纸</string>
+    <string name="home_function_name_beauty_body">美体</string>
 
+    <string name="toast_not_detect_face">未检测到人脸</string>
+    <string name="toast_not_detect_face_or_body">未检测到人脸或人体</string>
+
+    <string name="makeup_combination_naicha">奶茶</string>
+    <string name="makeup_combination_dousha">豆沙</string>
+    <string name="makeup_combination_chaoa">超A</string>
 </resources>

FaceUnity/src/main/res/values/strings.xml

@@ -5,26 +5,17 @@
     <string name="camera_dialog_open">Retry</string>
     <string name="camera_dialog_back">quit</string>
 
-    <string name="home_function_name_beauty">Beautification</string>
-    <string name="home_function_name_makeup">Makeup</string>
-    <string name="home_function_name_sticker">Sticker</string>
-    <string name="home_function_name_beauty_body">Body</string>
-
+    <string name="fu_base_debug">Resolution:\n\t%dX%d\nFPS: %d\nRender time:\n\t%dms</string>
+    <string name="save_photo_success">Save photo successfully!</string>
+    <string name="save_video_success">Save video successfully!</string>
+    <string name="save_video_failed">Save video failed!</string>
+    <string name="save_video_too_short">The video is to short!</string>
+    <string name="save_video_wait">Please wait while the video is processing</string>
     <string name="fu_base_is_tracking_text">No face tracking</string>
-    <string name="toast_not_detect_face">No face tracking</string>
-    <string name="toast_not_detect_body">No body tracking</string>
-    <string name="toast_not_detect_gesture">No gesture tracking</string>
-    <string name="toast_not_detect_face_or_body">No face or body tracking</string>
+    <string name="fu_base_incomplete_face_text">Incomplete face</string>
+    <string name="fu_base_input_type_single">SingleInput</string>
+    <string name="fu_base_input_type_double">DualInput</string>
 
-    <string name="confirm">Yes</string>
-    <string name="cancel">Cancel</string>
-    <string name="dialog_confirm_delete">Are you sure to delete?</string>
-    <string name="dialog_reset_avatar_model">Reset all parameters to default?</string>
-    <string name="toast_delete_succeed">Delete succeed</string>
-    <string name="toast_delete_failed">Delete failed</string>
-    <string name="live_photo_save_succeed">Save succeed</string>
-
-    <string name="recover">Recover</string>
     <string name="beauty_box_heavy_blur_fine">Fine smooth</string>
     <string name="beauty_box_color_level">Whiten</string>
     <string name="beauty_box_red_level">Ruddy</string>
@@ -33,10 +24,14 @@
     <string name="beauty_box_tooth_whiten">Tooth whiten</string>
     <string name="beauty_box_eye_enlarge">Eye enlarge</string>
     <string name="beauty_box_eye_circle">Eye round</string>
-    <string name="beauty_box_cheek_thinning">Cheek thin</string>
-    <string name="beauty_box_cheek_v">V face</string>
+    <string name="beauty_box_cheek_natural">Natural</string>
+    <string name="beauty_box_cheek_goddess">Goddess</string>
+    <string name="beauty_box_cheek_long_face">Long face</string>
+    <string name="beauty_box_cheek_round_face">Round face</string>
     <string name="beauty_box_cheekbones">Cheekbone</string>
     <string name="beauty_box_lower_jaw">Jawbone</string>
+    <string name="beauty_box_cheek_thinning">Cheek thin</string>
+    <string name="beauty_box_cheek_v">V face</string>
     <string name="beauty_box_cheek_narrow">CheekNarrow</string>
     <string name="beauty_box_cheek_short">Cheek short</string>
     <string name="beauty_box_cheek_small">Cheek small</string>
@@ -48,28 +43,254 @@
     <string name="beauty_radio_face_shape">Reshape</string>
     <string name="beauty_radio_filter">Filter</string>
     <string name="beauty_radio_style">Presets</string>
+    <string name="makeup_radio_lipstick">Lipstick</string>
+    <string name="makeup_radio_blusher">Blush</string>
+    <string name="makeup_radio_eyebrow">Eyebrow</string>
+    <string name="makeup_radio_eye_shadow">Eye shadow</string>
+    <string name="makeup_radio_eye_liner">Eye liner</string>
+    <string name="makeup_radio_eyelash">Eyelash</string>
+    <string name="makeup_radio_contact_lens">Contact lens</string>
+    <string name="makeup_radio_foundation">Foundation</string>
+    <string name="makeup_radio_highlight">Highlight</string>
+    <string name="makeup_radio_shadow">Shadow</string>
+    <string name="makeup_radio_remove">Remove</string>
+    <string name="makeup_customize">Custom</string>
+    <string name="makeup_peach_blossom">Peach</string>
+    <string name="makeup_boyfriend">Boyfriend</string>
+    <string name="makeup_clear">Clear</string>
+    <string name="makeup_grapefruit">Grapefruit</string>
     <string name="beauty_micro_pouch">Circle</string>
     <string name="beauty_micro_nasolabial">Wrinkles</string>
     <string name="beauty_micro_smile">Smile</string>
+    <string name="beauty_brow_height">Brow height</string>
+    <string name="beauty_brow_space">Brow space</string>
     <string name="beauty_micro_canthus">Canthus</string>
     <string name="beauty_micro_philtrum">Philtrum</string>
     <string name="beauty_micro_long_nose">Length</string>
     <string name="beauty_micro_eye_space">Eye distance</string>
     <string name="beauty_micro_eye_rotate">Slant</string>
+    <string name="beauty_face_style_none">None</string>
+    <string name="beauty_face_style_1">Style 1</string>
+    <string name="beauty_face_style_2">Style 2</string>
+    <string name="beauty_face_style_3">Style 3</string>
+    <string name="beauty_face_style_4">Style 4</string>
+    <string name="beauty_face_style_5">Style 5</string>
+    <string name="beauty_face_style_6">Style 6</string>
+    <string name="beauty_face_style_7">Style 7</string>
+    <string name="beauty_face_style_toast">To use %s, cancel \'Presets\' first.</string>
+
+    <string name="select_data_photo">Photo</string>
+    <string name="select_data_video">Video</string>
+    <string name="select_data_title">Choose photo or video from your album</string>
+    <string name="image_file_does_not_exist">The selected image file does not exist.</string>
+    <string name="video_file_does_not_exist">The selected video file does not exist.</string>
+
+    <string name="future_warrior">Open your mouth</string>
+    <string name="jet_mask">Puff your cheeks</string>
+    <string name="sdx2">Frown</string>
+    <string name="luhantongkuan_ztt_fu">Blink</string>
+    <string name="qingqing_ztt_fu">Give me a kiss</string>
+    <string name="xiaobianzi_zh_fu">Have a Smile</string>
+    <string name="xiaoxueshen_ztt_fu">Whistle</string>
+    <string name="hez_ztt_fu">Open your mouth</string>
+    <string name="push_hand">High five</string>
+    <string name="fu_lm_koreaheart">Finger heart</string>
+    <string name="ssd_thread_six">Shaka sign</string>
+    <string name="ssd_thread_cute">Holding fist</string>
 
     <string name="origin">Origin</string>
     <string name="bailiang_1">Bright 1</string>
+    <string name="bailiang_2">Bright 2</string>
+    <string name="bailiang_3">Bright 3</string>
+    <string name="bailiang_4">Bright 4</string>
+    <string name="bailiang_5">Bright 5</string>
+    <string name="bailiang_6">Bright 6</string>
+    <string name="bailiang_7">Bright 7</string>
     <string name="fennen_1">Pink 1</string>
+    <string name="fennen_2">Pink 2</string>
+    <string name="fennen_3">Pink 3</string>
+    <string name="fennen_5">Pink 5</string>
+    <string name="fennen_6">Pink 6</string>
+    <string name="fennen_7">Pink 7</string>
+    <string name="fennen_8">Pink 8</string>
+    <string name="xiaoqingxin_1">Fresh 1</string>
+    <string name="xiaoqingxin_3">Fresh 3</string>
+    <string name="xiaoqingxin_4">Fresh 4</string>
+    <string name="xiaoqingxin_6">Fresh 6</string>
     <string name="lengsediao_1">Cold tone 1</string>
+    <string name="lengsediao_2">Cold tone 2</string>
+    <string name="lengsediao_3">Cold tone 3</string>
+    <string name="lengsediao_4">Cold tone 4</string>
+    <string name="lengsediao_7">Cold tone 7</string>
+    <string name="lengsediao_8">Cold tone 8</string>
+    <string name="lengsediao_11">Cold tone 11</string>
+    <string name="nuansediao_1">Warm tone 1</string>
+    <string name="nuansediao_2">Warm tone 2</string>
+    <string name="gexing_1">Personality 1</string>
+    <string name="gexing_2">Personality 2</string>
+    <string name="gexing_3">Personality 3</string>
+    <string name="gexing_4">Personality 4</string>
+    <string name="gexing_5">Personality 5</string>
+    <string name="gexing_7">Personality 7</string>
+    <string name="gexing_10">Personality 10</string>
+    <string name="gexing_11">Personality 11</string>
+    <string name="heibai_1">Fade 1</string>
+    <string name="heibai_2">Fade 2</string>
+    <string name="heibai_3">Fade 3</string>
+    <string name="heibai_4">Fade 4</string>
     <string name="ziran_1">Nature 1</string>
+    <string name="ziran_2">Nature 2</string>
+    <string name="ziran_3">Nature 3</string>
+    <string name="ziran_4">Nature 4</string>
+    <string name="ziran_5">Nature 5</string>
+    <string name="ziran_6">Nature 6</string>
+    <string name="ziran_7">Nature 7</string>
+    <string name="ziran_8">Nature 8</string>
     <string name="zhiganhui_1">Grey 1</string>
+    <string name="zhiganhui_2">Grey 2</string>
+    <string name="zhiganhui_3">Grey 3</string>
+    <string name="zhiganhui_4">Grey 4</string>
+    <string name="zhiganhui_5">Grey 5</string>
+    <string name="zhiganhui_6">Grey 6</string>
+    <string name="zhiganhui_7">Grey 7</string>
+    <string name="zhiganhui_8">Grey 8</string>
+    <string name="mitao_1">Peach 1</string>
+    <string name="mitao_2">Peach 2</string>
+    <string name="mitao_3">Peach 3</string>
+    <string name="mitao_4">Peach 4</string>
+    <string name="mitao_5">Peach 5</string>
+    <string name="mitao_6">Peach 6</string>
+    <string name="mitao_7">Peach 7</string>
+    <string name="mitao_8">Peach 8</string>
 
+    <string name="poster_take_photo">Please take photos by positive face.</string>
+    <string name="poster_change_face_error">change face failed</string>
+    <string name="poster_template_face_none">No template face detected, please re-upload</string>
+    <string name="dialog_no_track_face">No face detected, please re-upload</string>
+    <string name="dialog_no_incomplete_face">No face detected, please re-upload</string>
+    <string name="dialog_face_rotation_not_valid">Side face angle is too greater, please re-upload</string>
+    <string name="dialog_got">OK</string>
+    <string name="tip_dual_face">Multiple people detected, please choose one person for face fusion</string>
 
-    <string name="makeup_radio_remove">Remover</string>
+    <string name="animoji_filter">Animoji</string>
+    <string name="cartoon_filter">Cartoon filter</string>
+
+    <string name="live_photo_back_not_save">Custom won\'t be saved after return</string>
+    <string name="live_photo_btn_delete">Delete</string>
+    <string name="live_photo_btn_cancel">Cancel</string>
+    <string name="live_photo_btn_delete_">Delete (%d)</string>
+    <string name="live_photo_empty_list_tip">Not created model</string>
+    <string name="live_photo_delete_effect">Delete model</string>
+    <string name="live_photo__delete_all">All</string>
+    <string name="confirm">Yes</string>
+    <string name="cancel">Cancel</string>
+    <string name="dialog_confirm_delete">Are you sure to delete?</string>
+    <string name="toast_delete_succeed">Delete succeed</string>
+    <string name="toast_delete_failed">Delete failed</string>
+    <string name="live_photo_save_succeed">Save succeed</string>
+
+    <string name="delete_avatar_model">Delete model</string>
+    <string name="new_avatar_model">Create model</string>
+    <string name="edit_avatar_model">Edit model</string>
+
+    <string name="avatar_face_hair">Hair style</string>
+    <string name="avatar_face_face">Face shape</string>
+    <string name="avatar_face_eye">Eyes</string>
+    <string name="avatar_face_lip">Mouth</string>
+    <string name="avatar_face_nose">Nose</string>
+
+    <string name="avatar_face_length">Face length</string>
+    <string name="avatar_face_width">Cheek width</string>
+    <string name="avatar_chin_width">Jaw width</string>
+    <string name="avatar_chin_height">Jaw length</string>
+    <string name="avatar_eye_position">Eye position</string>
+    <string name="avatar_eye_corner_height">Canthus position</string>
+    <string name="avatar_eye_height">Eye width</string>
+    <string name="avatar_eye_width">Eye length</string>
+    <string name="avatar_nose_position">Nose position</string>
+    <string name="avatar_nose_width">Nose width</string>
+    <string name="avatar_nose_height">Nose height</string>
+    <string name="avatar_mouth_position">Mouth position</string>
+    <string name="avatar_up_lip_thickness">Upper lip thickness</string>
+    <string name="avatar_down_lip_thickness">Down lip thickness</string>
+    <string name="avatar_lip_width">Lip width</string>
+    <string name="model_empty_tip">No model has been created</string>
+    <string name="dialog_reset_avatar_model">Reset all parameters to default?</string>
+    <string name="avatar_face_customize">Custom</string>
+    <string name="avatar_save_succeed">Save succeed</string>
+    <string name="recover">Recover</string>
+
+    <string name="makeup_lip_fog">Matte</string>
+    <string name="makeup_lip_moist1">Moist</string>
+    <string name="makeup_lip_moist2">Water</string>
+    <string name="makeup_lip_pearl">Pearl</string>
+    <string name="makeup_lip_bitelip">Bitelip</string>
+    <string name="makeup_blusher_apple">Apple muscle</string>
+    <string name="makeup_blusher_fan">Sector</string>
+    <string name="makeup_blusher_eye_corner">Canthus</string>
+    <string name="makeup_blusher_slight_drunk">Tipsy</string>
+    <string name="makeup_highlight_one">Highlight I</string>
+    <string name="makeup_highlight_two">Highlight II </string>
+    <string name="makeup_shadow_one">Shadow I</string>
+    <string name="makeup_pupil_1">Honey</string>
+    <string name="makeup_pupil_2">Milk tea</string>
+    <string name="makeup_pupil_3">Ripple</string>
+    <string name="makeup_pupil_4">Gilding</string>
+    <string name="makeup_pupil_5">Peacock</string>
+    <string name="makeup_pupil_6">Milky way</string>
+    <string name="makeup_pupil_7">Curtain</string>
+    <string name="makeup_pupil_8">Aurora</string>
+    <string name="makeup_eyebrow_willow">Willow</string>
+    <string name="makeup_eyebrow_wild">Wild</string>
+    <string name="makeup_eyebrow_classical">Classical</string>
+    <string name="makeup_eyebrow_standard">Standard</string>
+    <string name="makeup_eye_shadow_single">Monochrome</string>
+    <string name="makeup_eye_shadow_double1">Dichromatic I</string>
+    <string name="makeup_eye_shadow_double2">Dichromatic II</string>
+    <string name="makeup_eye_shadow_double3">Dichromatic III</string>
+    <string name="makeup_eye_shadow_triple1">Tricolor I</string>
+    <string name="makeup_eye_shadow_triple2">Tricolor II</string>
+    <string name="makeup_eyelash_natural1">Natural I</string>
+    <string name="makeup_eyelash_natural2">Natural II</string>
+    <string name="makeup_eyelash_thick1">Denseness I</string>
+    <string name="makeup_eyelash_thick2">Denseness II</string>
+    <string name="makeup_eyelash_exaggerate1">Hyperbole I</string>
+    <string name="makeup_eyelash_exaggerate2">Hyperbole II</string>
+    <string name="makeup_eye_linear_cat">Cats eye</string>
+    <string name="makeup_eye_linear_drooping">Drooping eye</string>
+    <string name="makeup_eye_linear_pull_open">Expand Eye distance</string>
+    <string name="makeup_eye_linear_pull_close">Shorten Eye distance</string>
+    <string name="makeup_eye_linear_long">Long eye</string>
+    <string name="makeup_eye_linear_circular">Round eye</string>
+    <string name="makeup_combination_diadiatu">diadiatu</string>
+    <string name="makeup_combination_dongling">Freezing age</string>
+    <string name="makeup_combination_guofeng">National style</string>
+    <string name="makeup_combination_hunxie">Mixed race</string>
+    <string name="makeup_combination_sexy">Sexy</string>
+    <string name="makeup_combination_sweet">Sweet</string>
+    <string name="makeup_combination_neighbor">Next-door</string>
+    <string name="makeup_combination_occident">European</string>
+    <string name="makeup_combination_charming">Charming</string>
+    <string name="makeup_combination_jianling">Tender</string>
+    <string name="makeup_combination_nuandong">Warm</string>
+    <string name="makeup_combination_hongfeng">Maple</string>
+    <string name="makeup_combination_shaonv">Maiden</string>
+    <string name="makeup_combination_ziyun">Purple</string>
+    <string name="makeup_combination_yanshimao">Cat</string>
+    <string name="makeup_combination_renyu">Mermaid</string>
+    <string name="makeup_combination_chuqiu">Autumn</string>
+    <string name="makeup_combination_qianzhihe">Crane</string>
+    <string name="makeup_combination_chaomo">Model</string>
+    <string name="makeup_combination_chuju">Daisy</string>
+    <string name="makeup_combination_gangfeng">HK style</string>
+    <string name="makeup_combination_rose">Rose</string>
     <string name="makeup_combination_naicha">Milk tea</string>
     <string name="makeup_combination_dousha">Bean paste</string>
     <string name="makeup_combination_chaoa">Super a</string>
-
+    <string name="home_function_name_beauty">Beautification</string>
+    <string name="home_function_name_makeup">Makeup</string>
+    <string name="home_function_name_sticker">Sticker</string>
+    <string name="home_function_name_beauty_body">Body</string>
 
     <string name="slimming">Body</string>
     <string name="long_legs">Leg</string>
@@ -78,6 +299,34 @@
     <string name="beautify_hip_slim">Hip</string>
     <string name="beautify_head_slim">Head shrink</string>
     <string name="beautify_leg_thin_slim">Thin leg</string>
+    <string name="toast_not_detect_body">No body tracking</string>
+    <string name="pta_human_full_body">Body driver</string>
+    <string name="pta_human_half_body">Bust driver</string>
 
 
+    <string name="select_data_photo_or_video">Load picture or video</string>
+    <string name="toast_not_detect_gesture">No gesture tracking</string>
+
+    <string name="bg_seg_green_graphic">Keying</string>
+    <string name="bg_seg_green_background">Background</string>
+    <string name="bg_seg_green_key_color">Key color</string>
+    <string name="bg_seg_green_similarity">Similarity</string>
+    <string name="bg_seg_green_smooth">Smoothness</string>
+    <string name="bg_seg_green_alpha">Transparency</string>
+    <string name="bg_seg_green_safe_area">Safe Area</string>
+    <string name="bg_seg_green_science">Technology</string>
+    <string name="bg_seg_green_beach">Sand</string>
+    <string name="bg_seg_green_classroom">Classroom</string>
+    <string name="bg_seg_green_forest">Forest</string>
+    <string name="bg_seg_green_ink">Ink</string>
+    <string name="dialog_guide_bg_seg_green">Please use a solid background, a green screen is recommended for the best effect</string>
+    <string name="dialog_i_know">I know</string>
+
+    <string name="download_error">Download failed, please check the network and try again</string>
+    <string name="back">back</string>
+
+    <string name="safe_area_tips">The white area is a safe area and does not participate in green screen matting</string>
+
+    <string name="brow_height_tips">This function is only supported for high-end computers</string>
+    <string name="brow_space_tips">This function is only supported for high-end computers</string>
 </resources>