yutou/pdlivexp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

补充美颜模型和美颜配置

Browse Source
This commit is contained in:
zlzw
2022-09-19 15:43:06 +08:00
parent 8ef917ebb6
commit c634d29e79
365 changed files with 5751 additions and 1296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
FaceUnity/src/main/res/layout/layout_animo_control.xml Normal file
View File

@@ -0,0 +1,64 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/lyt_bottom"
android:layout_width="match_parent"
android:layout_height="@dimen/x266"
android:background="@color/primary_list"
android:gravity="bottom"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/x167"
android:layout_gravity="center_vertical"
android:background="@color/primary_list"
android:gravity="center_vertical"
android:orientation="vertical">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scrollbars="none" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/x1"
android:background="@color/divider_line_color" />
<com.yunbao.faceunity.checkbox.CheckGroup
android:id="@+id/rg_anim"
android:layout_width="match_parent"
android:layout_height="@dimen/x98"
android:background="@color/primary_list">
<com.yunbao.faceunity.checkbox.CheckBoxCompat
android:id="@+id/cb_animoji"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@color/transparent"
android:button="@null"
android:checked="true"
android:gravity="center"
android:text="@string/animoji_filter"
android:textColor="@color/bottom_radio_color"
android:textSize="@dimen/text_size_26" />
<com.yunbao.faceunity.checkbox.CheckBoxCompat
android:id="@+id/cb_filter"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@color/transparent"
android:button="@null"
android:gravity="center"
android:text="@string/cartoon_filter"
android:textColor="@color/bottom_radio_color"
android:textSize="@dimen/text_size_26" />
</com.yunbao.faceunity.checkbox.CheckGroup>
</LinearLayout>

131
FaceUnity/src/main/res/layout/layout_body_beauty_control.xml
View File

@@ -3,96 +3,79 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/cyt_main"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="@dimen/x268"
android:background="#BD050F14"
android:gravity="center_horizontal"
android:orientation="vertical">
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/switch_compat"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/x20"
android:layout_marginBottom="@dimen/x20"
android:checked="true"
android:theme="@style/SwitchCompat"
android:layout_marginStart="@dimen/x10" />
<com.yunbao.faceunity.seekbar.DiscreteSeekBar
android:id="@+id/beauty_seek_bar"
android:layout_width="@dimen/x528"
android:layout_height="@dimen/x48"
android:layout_marginTop="@dimen/x24"
android:layout_marginBottom="@dimen/x16"
app:dsb_indicatorColor="@color/main_color"
app:dsb_indicatorElevation="0dp"
app:dsb_indicatorPopupEnabled="true"
app:dsb_max="100"
app:dsb_min="0"
app:dsb_progressColor="@color/main_color"
app:dsb_rippleColor="@color/main_color"
app:dsb_scrubberHeight="@dimen/x4"
app:dsb_thumbSize="@dimen/x32"
app:dsb_trackBaseHeight="@dimen/x16"
app:dsb_trackColor="@color/colorWhite"
app:dsb_trackHeight="@dimen/x4"
app:dsb_value="0" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/x268"
android:background="#BD050F14"
android:gravity="center_horizontal"
android:orientation="vertical">
<com.yunbao.faceunity.seekbar.DiscreteSeekBar
android:id="@+id/seek_bar"
android:layout_width="@dimen/x528"
android:layout_height="@dimen/x48"
android:layout_marginTop="@dimen/x24"
android:layout_marginBottom="@dimen/x16"
app:dsb_indicatorColor="@color/main_color"
app:dsb_indicatorElevation="0dp"
app:dsb_indicatorPopupEnabled="true"
app:dsb_max="100"
app:dsb_min="0"
app:dsb_progressColor="@color/main_color"
app:dsb_rippleColor="@color/main_color"
app:dsb_scrubberHeight="@dimen/x4"
app:dsb_thumbSize="@dimen/x32"
app:dsb_trackBaseHeight="@dimen/x16"
app:dsb_trackColor="@color/colorWhite"
app:dsb_trackHeight="@dimen/x4"
app:dsb_value="0" />
android:layout_height="@dimen/x180"
android:layout_gravity="bottom"
android:orientation="horizontal">
<LinearLayout
android:layout_width="match_parent"
android:id="@+id/lyt_beauty_recover"
android:layout_width="@dimen/x132"
android:layout_height="@dimen/x180"
android:layout_gravity="bottom"
android:orientation="horizontal">
android:gravity="center_horizontal"
android:orientation="vertical">
<LinearLayout
android:id="@+id/lyt_beauty_recover"
android:layout_width="@dimen/x132"
android:layout_height="@dimen/x180"
android:layout_gravity="bottom"
android:gravity="center_horizontal"
android:orientation="vertical">
<ImageView
android:id="@+id/iv_beauty_recover"
android:layout_width="@dimen/x88"
android:layout_height="@dimen/x88"
android:layout_marginBottom="@dimen/x18"
android:scaleType="centerInside"
android:src="@mipmap/icon_control_recover" />
<ImageView
android:id="@+id/iv_beauty_recover"
android:layout_width="@dimen/x88"
android:layout_height="@dimen/x88"
android:layout_marginBottom="@dimen/x18"
android:scaleType="centerInside"
android:src="@mipmap/icon_control_recover" />
<TextView
android:id="@+id/tv_beauty_recover"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginBottom="@dimen/x30"
android:gravity="center_vertical"
android:text="@string/recover"
android:textColor="@color/tv_main_color_selector"
android:textSize="@dimen/text_size_20" />
</LinearLayout>
<View
android:id="@+id/iv_line"
android:layout_width="@dimen/x1"
android:layout_height="@dimen/x40"
android:layout_marginTop="@dimen/x40"
android:background="@color/divider_line_color" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="@dimen/x180" />
<TextView
android:id="@+id/tv_beauty_recover"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginBottom="@dimen/x30"
android:gravity="center_vertical"
android:text="@string/recover"
android:textColor="@color/tv_main_color_selector"
android:textSize="@dimen/text_size_20" />
</LinearLayout>
<View
android:id="@+id/iv_line"
android:layout_width="@dimen/x1"
android:layout_height="@dimen/x40"
android:layout_marginTop="@dimen/x40"
android:background="@color/divider_line_color" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="@dimen/x180" />
</LinearLayout>
</LinearLayout>

84
FaceUnity/src/main/res/layout/layout_face_beauty_control.xml
View File

@@ -2,20 +2,33 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="@dimen/x472"
android:gravity="bottom"
android:orientation="vertical">
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/switch_compat"
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/x20"
android:layout_marginBottom="@dimen/x20"
android:checked="true"
android:theme="@style/SwitchCompat"
android:layout_marginLeft="@dimen/x10" />
android:layout_height="wrap_content">
<com.yunbao.faceunity.widget.TouchStateImageView
android:id="@+id/iv_compare"
android:layout_width="@dimen/x72"
android:layout_height="@dimen/x72"
android:layout_marginStart="@dimen/x34"
android:layout_marginBottom="@dimen/x34"
android:src="@mipmap/icon_beauty_face_contrast"
android:visibility="gone" />
<Button
android:id="@+id/iv_reset"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginEnd="@dimen/x34"
android:text="去除效果"
android:visibility="gone" />
</RelativeLayout>
<LinearLayout
android:id="@+id/fyt_bottom_view"
@@ -25,7 +38,7 @@
android:orientation="vertical">
<com.yunbao.faceunity.seekbar.DiscreteSeekBar
android:id="@+id/seek_bar"
android:id="@+id/beauty_seek_bar"
android:layout_width="@dimen/x528"
android:layout_height="@dimen/x48"
android:layout_gravity="center_horizontal"
@@ -45,6 +58,7 @@
app:dsb_trackHeight="@dimen/x4"
app:dsb_value="0" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/x180"
@@ -70,14 +84,41 @@
android:id="@+id/tv_beauty_recover"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:layout_marginBottom="@dimen/x30"
android:gravity="center_vertical"
android:text="@string/recover"
android:textColor="@color/tv_main_color_selector"
android:textSize="@dimen/text_size_20" />
</LinearLayout>
<LinearLayout
android:id="@+id/lyt_style_recover"
android:layout_width="@dimen/x132"
android:layout_height="@dimen/x180"
android:gravity="center_horizontal"
android:orientation="vertical"
android:visibility="gone">
<ImageView
android:layout_width="@dimen/x88"
android:layout_height="@dimen/x88"
android:layout_marginBottom="@dimen/x18"
android:scaleType="centerInside"
android:src="@drawable/icon_beauty_style_none_selector" />
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginBottom="@dimen/x30"
android:gravity="center_vertical"
android:text="@string/beauty_face_style_none"
android:textColor="@color/tv_main_color_selector"
android:textSize="@dimen/text_size_20" />
</LinearLayout>
<View
android:id="@+id/iv_line"
android:layout_width="@dimen/x1"
@@ -104,7 +145,7 @@
android:id="@+id/beauty_radio_group"
android:layout_width="match_parent"
android:layout_height="@dimen/x98"
android:background="@color/primary_list"
android:background="#BD050F14"
android:orientation="horizontal">
<com.yunbao.faceunity.checkbox.CheckBoxCompat
@@ -117,7 +158,7 @@
android:gravity="center"
android:text="@string/beauty_radio_skin_beauty"
android:textColor="@color/bottom_radio_color"
android:textSize="@dimen/text_size_26"/>
android:textSize="@dimen/text_size_26" />
<com.yunbao.faceunity.checkbox.CheckBoxCompat
android:id="@+id/beauty_radio_face_shape"
@@ -129,7 +170,7 @@
android:gravity="center"
android:text="@string/beauty_radio_face_shape"
android:textColor="@color/bottom_radio_color"
android:textSize="@dimen/text_size_26"/>
android:textSize="@dimen/text_size_26" />
<com.yunbao.faceunity.checkbox.CheckBoxCompat
android:id="@+id/beauty_radio_filter"
@@ -142,5 +183,18 @@
android:text="@string/beauty_radio_filter"
android:textColor="@color/bottom_radio_color"
android:textSize="@dimen/text_size_26" />
<com.yunbao.faceunity.checkbox.CheckBoxCompat
android:id="@+id/beauty_radio_style"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@color/transparent"
android:button="@null"
android:gravity="center"
android:text="@string/beauty_radio_style"
android:textColor="@color/bottom_radio_color"
android:textSize="@dimen/text_size_26" />
</com.yunbao.faceunity.checkbox.CheckGroup>
</LinearLayout>

118
FaceUnity/src/main/res/layout/layout_faceunity.xml
View File

@@ -3,107 +3,41 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:id="@+id/layout_faceunity_menu1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:orientation="vertical">
android:layout_height="wrap_content">
<com.yunbao.faceunity.control.BodyBeautyControlView
android:id="@+id/control_body"
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/menu_group"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:visibility="gone" />
android:layout_height="match_parent" />
</LinearLayout>
<LinearLayout
android:id="@+id/layout_faceunity_menu2"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.yunbao.faceunity.control.FaceBeautyControlView
android:id="@+id/control_beauty"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom" />
<com.yunbao.faceunity.control.MakeupControlView
android:id="@+id/control_makeup"
<com.google.android.material.tabs.TabLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:visibility="gone" />
android:layout_height="match_parent">
<com.yunbao.faceunity.control.PropControlView
android:id="@+id/control_prop"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:visibility="gone" />
<com.google.android.material.tabs.TabItem
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Monday" />
<ImageView
android:id="@+id/line"
android:layout_width="match_parent"
android:layout_height="@dimen/x1"
android:background="@color/primary_list"
android:src="@color/divider_line_color" />
<com.google.android.material.tabs.TabItem
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Tuesday" />
<com.google.android.material.tabs.TabItem
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Wednesday" />
</com.google.android.material.tabs.TabLayout>
</LinearLayout>
<com.yunbao.faceunity.checkbox.CheckGroup
android:id="@+id/group_function"
android:layout_width="match_parent"
android:layout_height="@dimen/x98"
android:layout_gravity="bottom"
android:background="@color/primary_list"
android:orientation="horizontal">
<com.yunbao.faceunity.checkbox.CheckBoxCompat
android:id="@+id/radio_beauty"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@color/transparent"
android:button="@null"
android:gravity="center"
android:text="@string/home_function_name_beauty"
android:textColor="@color/bottom_radio_color"
android:textSize="@dimen/text_size_26" />
<com.yunbao.faceunity.checkbox.CheckBoxCompat
android:id="@+id/radio_sticker"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@color/transparent"
android:button="@null"
android:gravity="center"
android:text="@string/home_function_name_sticker"
android:textColor="@color/bottom_radio_color"
android:textSize="@dimen/text_size_26" />
<com.yunbao.faceunity.checkbox.CheckBoxCompat
android:id="@+id/radio_makeup"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@color/transparent"
android:button="@null"
android:gravity="center"
android:text="@string/home_function_name_makeup"
android:textColor="@color/bottom_radio_color"
android:textSize="@dimen/text_size_26" />
<com.yunbao.faceunity.checkbox.CheckBoxCompat
android:id="@+id/radio_body"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@color/transparent"
android:button="@null"
android:gravity="center"
android:text="@string/home_function_name_beauty_body"
android:textColor="@color/bottom_radio_color"
android:textSize="@dimen/text_size_26" />
</com.yunbao.faceunity.checkbox.CheckGroup>
</LinearLayout>