Merge branch 'dev_20221020'

FaceUnity/src/main/java/com/yunbao/faceunity/FaceManager.java

@@ -19,11 +19,15 @@ import com.faceunity.core.enumeration.FUInputTextureEnum;
 import com.faceunity.core.enumeration.FUTransformMatrixEnum;
 import com.faceunity.core.faceunity.FUAIKit;
 import com.faceunity.core.utils.CameraUtils;
+import com.yunbao.faceunity.data.FaceBeautyDataFactory;
 import com.yunbao.faceunity.data.FaceUnityDataFactory;
+import com.yunbao.faceunity.entity.FaceBeautyBean;
+import com.yunbao.faceunity.entity.FaceBeautyFilterBean;
 import com.yunbao.faceunity.listener.FURendererListener;
 import com.yunbao.faceunity.ui.FaceUnityView;
 import com.yunbao.faceunity.utils.CSVUtils;
 import com.yunbao.faceunity.utils.FURenderer;
+import com.yunbao.faceunity.utils.FaceSPUtils;
 import com.yunbao.faceunity.utils.FaceUnityData;
 import com.yunbao.faceunity.utils.net.OkHttpUtils;
 
@@ -31,6 +35,8 @@ import java.io.File;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
 
 import cn.rongcloud.rtc.api.RCRTCEngine;
 import cn.rongcloud.rtc.api.callback.IRCRTCVideoOutputFrameListener;
@@ -83,6 +89,7 @@ public class FaceManager implements SensorEventListener {
 
     /**
      * 注册长按对比键事件
+     *
      * @param faceUnityView
      */
     public void setFaceUnityView(FaceUnityView faceUnityView) {
@@ -98,6 +105,44 @@ public class FaceManager implements SensorEventListener {
             }
         });
     }
+    public void loadConfig(){
+        initFaceBeauty();
+    }
+    public void initFaceBeauty() {
+        FaceBeautyDataFactory faceBeautyDataFactory;
+        faceBeautyDataFactory = new FaceBeautyDataFactory();
+        Map<String, ?> configMap = FaceSPUtils.getInstance().getAll();
+        for (String key : configMap.keySet()) {
+            if ("FilterViewHolder_".equals(key)) {
+                for (FaceBeautyFilterBean filter : faceBeautyDataFactory.getBeautyFilters()) {
+                    if (filter.getKey().equals(configMap.get(key))&&!"origin".equals(configMap.get(key))) {
+                        faceBeautyDataFactory.onFilterSelected(filter.getKey(), Double.parseDouble((String) Objects.requireNonNull(configMap.get("FilterViewHolder_" + configMap.get(key) + "_val")))/100, filter.getDesRes());
+                        Log.i(TAG, "test: 设置滤镜  ="+filter.getKey()+" val = "+configMap.get("FilterViewHolder_" + configMap.get(key) + "_val"));
+                        break;
+                    }
+                }
+            } else if (key.startsWith("BeautySkinViewHolder_")) {
+                String name = key.replace("BeautySkinViewHolder_", "");
+                for (FaceBeautyBean bean : faceBeautyDataFactory.getShapeBeauty()) {
+                    if (bean.getKey().equals(name)) {
+                        faceBeautyDataFactory.updateParamIntensity(bean.getKey(),Double.parseDouble((String) Objects.requireNonNull(configMap.get(key))));
+                        Log.i(TAG, "test: 设置美颜 = "+bean.getKey()+" val = "+configMap.get(key));
+                        break;
+                    }
+                }
+            }else if(key.startsWith("BeautyShapeViewHolder")){
+                String name = key.replace("BeautyShapeViewHolder_", "");
+                for (FaceBeautyBean bean : faceBeautyDataFactory.getShapeBeauty()) {
+                    if (bean.getKey().equals(name)) {
+                        faceBeautyDataFactory.updateParamIntensity(bean.getKey(),Double.parseDouble((String) Objects.requireNonNull(configMap.get(key))));
+                        Log.i(TAG, "test: 设置美肤 = "+bean.getKey()+" val = "+configMap.get(key));
+                        break;
+                    }
+                }
+            }
+
+        }
+    }
 
     /**
      * 监听人脸识别个数

FaceUnity/src/main/java/com/yunbao/faceunity/adapters/ContainerRecyclerAdapter.java

@@ -4,7 +4,6 @@ import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;

FaceUnity/src/main/java/com/yunbao/faceunity/adapters/vh/AnimojiViewHolder.java

@@ -66,7 +66,7 @@ public class AnimojiViewHolder extends BaseViewHolder {
 
     @Override
     public void reset(List<? extends BaseBean> list) {
-        adapter.del(getName(this));
+        adapter.save(getName(this),"0");
         adapter.getAnimojiDataFactory().onAnimojiSelected((AnimojiBean) list.get(0));
         adapter.setSelectPosition(0);
     }

FaceUnity/src/main/java/com/yunbao/faceunity/adapters/vh/BigHeadViewHolder.java

@@ -71,7 +71,7 @@ public class BigHeadViewHolder extends BaseViewHolder {
 
     @Override
     public void reset(List<? extends BaseBean> list) {
-        adapter.del(getName(this));
+        adapter.save(getName(this),list.get(0).getKey());
         adapter.getPropDataFactory().setPropType(FunctionEnum.BIG_HEAD);
         adapter.getPropDataFactory().onItemSelected((PropBean) list.get(0));
         adapter.setSelectPosition(0);

FaceUnity/src/main/java/com/yunbao/faceunity/adapters/vh/FilterViewHolder.java

@@ -9,6 +9,8 @@ import androidx.annotation.NonNull;
 import com.yunbao.faceunity.R;
 import com.yunbao.faceunity.entity.BaseBean;
 import com.yunbao.faceunity.entity.FaceBeautyFilterBean;
+import com.yunbao.faceunity.seekbar.DiscreteSeekBar;
+import com.yunbao.faceunity.utils.SeekBarUtils;
 
 import java.util.List;
 
@@ -18,6 +20,7 @@ import java.util.List;
 public class FilterViewHolder extends BaseViewHolder {
     private ImageView icon;
     private TextView title;
+    private String KEY_VAL;
 
     public FilterViewHolder(@NonNull View itemView) {
         super(itemView);
@@ -28,6 +31,28 @@ public class FilterViewHolder extends BaseViewHolder {
             adapter.getFaceBeautyDataFactory().onFilterSelected(bean.getKey(), bean.getIntensity(), bean.getDesRes());
             setSelectPosition(getAdapterPosition());
             saveData();
+            if("origin".equals(bean.getKey())){
+                adapter.hideSeekBar();
+                return;
+            }
+            adapter.showSeekBar();
+            adapter.getSeekBar().setMax(100);
+            adapter.getSeekBar().setTag(bean);
+            adapter.getSeekBar().setOnProgressChangeListener(new DiscreteSeekBar.OnSimpleProgressChangeListener(){
+                @Override
+                public void onProgressChanged(DiscreteSeekBar seekBar, int value, boolean fromUser) {
+                    super.onProgressChanged(seekBar, value, fromUser);
+                    KEY_VAL=getName(FilterViewHolder.this)+((BaseBean)seekBar.getTag()).getKey()+"_val";
+                    double toValue = SeekBarUtils.Companion.seekToValue(1, value, seekBar.getMin());
+                    adapter.getFaceBeautyDataFactory().updateFilterIntensity(toValue);
+                    adapter.save(KEY_VAL,value+"");
+                }
+            });
+            if(adapter.getString(KEY_VAL)==null) {
+                adapter.getSeekBar().setProgress((int) (bean.getIntensity() * 100));
+            }else{
+                adapter.getSeekBar().setProgress(Integer.parseInt(adapter.getString(KEY_VAL)));
+            }
         });
     }
 
@@ -47,6 +72,7 @@ public class FilterViewHolder extends BaseViewHolder {
     @Override
     public boolean loadData() {
         FaceBeautyFilterBean bean = (FaceBeautyFilterBean) itemView.getTag();
+        KEY_VAL=getName(FilterViewHolder.this)+bean.getKey()+"_val";
         String val = adapter.getString(getName(this));
         if (val == null) {
             return false;
@@ -56,6 +82,9 @@ public class FilterViewHolder extends BaseViewHolder {
         }
         icon.setSelected(true);
         title.setSelected(true);
+        if(adapter.getString(KEY_VAL)!=null) {
+            bean.setIntensity(Double.parseDouble(adapter.getString(KEY_VAL))/100);
+        }
         adapter.getFaceBeautyDataFactory().onFilterSelected(bean.getKey(), bean.getIntensity(), bean.getDesRes());
         return true;
     }
@@ -68,8 +97,14 @@ public class FilterViewHolder extends BaseViewHolder {
 
     @Override
     public void reset(List<? extends BaseBean> list) {
-        adapter.del(getName(this));
+        FaceBeautyFilterBean bean = (FaceBeautyFilterBean) list.get(0);
-        itemView.callOnClick();
+        for (BaseBean baseBean : list) {
+            String key=getName(this)+baseBean.getKey()+"_val";
+            adapter.save(key,"40");
+        }
+        adapter.hideSeekBar();
+        adapter.save(getName(this),bean.getKey());
+        adapter.getFaceBeautyDataFactory().onFilterSelected(bean.getKey(), bean.getIntensity(), bean.getDesRes());
         adapter.setSelectPosition(0);
     }
 }

FaceUnity/src/main/java/com/yunbao/faceunity/adapters/vh/FineStickerViewHolder.java

@@ -72,7 +72,7 @@ public class FineStickerViewHolder extends BaseViewHolder implements StickerDown
 
     @Override
     public void reset(List<? extends BaseBean> list) {
-        adapter.del(getName(this));
+        adapter.save(getName(this),list.get(0).getKey());
         itemView.callOnClick();
         adapter.setSelectPosition(0);
     }

FaceUnity/src/main/java/com/yunbao/faceunity/adapters/vh/MakeupCustomItemViewHolder.java

@@ -115,11 +115,10 @@ public class MakeupCustomItemViewHolder extends BaseViewHolder {
 
     @Override
     public void reset(List<? extends BaseBean> list) {
-        adapter.del(getName(this));
+        adapter.save(getName(this),list.get(0).getKey());
         for (BaseBean bean : list) {
             adapter.del(getName(this) + bean.getKey() + "_val");
         }
-        itemView.callOnClick();
         adapter.setSelectPosition(0);
     }
 

FaceUnity/src/main/java/com/yunbao/faceunity/adapters/vh/MakeupViewHolder.java

@@ -73,7 +73,7 @@ public class MakeupViewHolder extends BaseViewHolder {
 
     @Override
     public void reset(List<? extends BaseBean>list) {
-        adapter.del(getName(this));
+        adapter.save(getName(this),list.get(0).getKey());
         FaceSPUtils.getInstance().delStart("MakeupCustomItemViewHolder");
         adapter.getMakeupDataFactory().onMakeupCombinationSelected((MakeupCombinationBean) list.get(0));
         adapter.getMakeupDataFactory().clearAll();

FaceUnity/src/main/java/com/yunbao/faceunity/adapters/vh/StickerViewHolder.java

@@ -70,7 +70,7 @@ public class StickerViewHolder extends BaseViewHolder{
 
     @Override
     public void reset(List<? extends BaseBean> list) {
-        adapter.del(getName(this));
+        adapter.save(getName(this),list.get(0).getKey());
         adapter.getPropDataFactory().setPropType(FunctionEnum.STICKER);
         adapter.getPropDataFactory().onItemSelected((PropBean) list.get(0));
         adapter.setSelectPosition(0);

FaceUnity/src/main/java/com/yunbao/faceunity/adapters/vh/StyleViewHolder.java

@@ -46,7 +46,9 @@ public class StyleViewHolder extends BaseViewHolder{
         BaseBean bean= (BaseBean) itemView.getTag();
         String val = adapter.getString(getName(this));
         if(val==null){
-            return false;
+            icon.setSelected(false);
+            title.setSelected(false);
+            return true;
         }
         if(!val.equals(bean.getKey())){
             return false;
@@ -66,8 +68,9 @@ public class StyleViewHolder extends BaseViewHolder{
 
     @Override
     public void reset(List<? extends BaseBean> list) {
-        adapter.del(getName(this));
+     //   adapter.save(getName(this),list.get(0).getKey());
-        itemView.callOnClick();
         adapter.setSelectPosition(0);
+        adapter.del(getName(this));
+        adapter.getFaceBeautyDataFactory().onStyleSelected(null);
     }
 }

FaceUnity/src/main/java/com/yunbao/faceunity/data/FaceBeautyDataFactory.java

@@ -85,6 +85,19 @@ public class FaceBeautyDataFactory extends AbstractFaceBeautyDataFactory {
     public FaceBeautyDataFactory(FaceBeautyListener listener) {
         mFaceBeautyListener = listener;
     }
+    public FaceBeautyDataFactory(){
+        mFaceBeautyListener=new FaceBeautyListener() {
+            @Override
+            public void onFilterSelected(int res) {
+
+            }
+
+            @Override
+            public void onFaceBeautyEnable(boolean enable) {
+
+            }
+        };
+    }
 
 
     /**

FaceUnity/src/main/java/com/yunbao/faceunity/ui/FaceUnityView.java

@@ -4,7 +4,6 @@ import android.content.Context;
 import android.util.AttributeSet;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
-import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -15,10 +14,12 @@ import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.google.android.material.tabs.TabLayout;
+import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.utils.WordUtil;
 import com.yunbao.faceunity.R;
 import com.yunbao.faceunity.adapters.ContainerRecyclerAdapter;
 import com.yunbao.faceunity.adapters.MenuGroupRecyclerAdapter;
+import com.yunbao.faceunity.adapters.vh.StyleViewHolder;
 import com.yunbao.faceunity.data.FaceParam;
 import com.yunbao.faceunity.data.FineStickerDataFactory;
 import com.yunbao.faceunity.entity.BaseBean;
@@ -33,6 +34,7 @@ import com.yunbao.faceunity.repo.FaceBeautySource;
 import com.yunbao.faceunity.repo.MakeupSource;
 import com.yunbao.faceunity.repo.PropSource;
 import com.yunbao.faceunity.seekbar.DiscreteSeekBar;
+import com.yunbao.faceunity.utils.FaceSPUtils;
 import com.yunbao.faceunity.utils.net.StickerDownloadHelper;
 
 import java.util.ArrayList;
@@ -57,6 +59,7 @@ public class FaceUnityView extends LinearLayout implements StickerDownloadHelper
     private DiscreteSeekBar seekBar;
     private IFaceUnityInter iFaceUnityInter;
     private ConstraintLayout titleLayout;
+    private static final String TAG = "美颜";
 
     public FaceUnityView(Context context) {
         super(context);
@@ -104,6 +107,7 @@ public class FaceUnityView extends LinearLayout implements StickerDownloadHelper
         initMenuGroup();
         setContainerRecycler(new ArrayList<>());
         initViewClick();
+        gotoFaceBeauty();
     }
 
     /**
@@ -168,6 +172,25 @@ public class FaceUnityView extends LinearLayout implements StickerDownloadHelper
         menuDiy.setVisibility(GONE);
     }
 
+    /**
+     * 目前只需要美颜功能，进入后直奔美颜
+     */
+    private void gotoFaceBeauty() {
+        LinkedHashMap<Integer, Integer> map = new LinkedHashMap<>();
+        map.put(R.string.beauty_radio_skin_beauty, FaceParam.FACE_BEAUTY_SKIN);
+        map.put(R.string.beauty_radio_face_shape, FaceParam.FACE_BEAUTY_SHAPE);
+        map.put(R.string.beauty_radio_filter, FaceParam.FACE_BEAUTY_FILTER);
+        map.put(R.string.beauty_radio_style, FaceParam.FACE_BEAUTY_STYLE);
+        setContainerRecycler(FaceBeautySource.buildSkinParams());
+        changeRecyclerItemCount(2);
+        setTab(createTabs(map));
+        menuGroup.setVisibility(GONE);
+        titleLayout.setVisibility(GONE);
+        back.setVisibility(GONE);
+        menu2Back.setVisibility(GONE);
+        menu2.setVisibility(VISIBLE);
+    }
+
     /**
      * 配置主菜单
      */
@@ -287,12 +310,26 @@ public class FaceUnityView extends LinearLayout implements StickerDownloadHelper
         tabLayout.removeAllTabs();
         for (TabLayout.Tab tab : tabs) {
             tabLayout.addTab(tab);
+            if (tab.getTag() instanceof Integer) {
+                if (FaceSPUtils.getInstance().getString(StyleViewHolder.class.getSimpleName() + "_") != null && (int) tab.getTag() == FaceParam.FACE_BEAUTY_STYLE) {
+                    ToastUtil.show("请先重置风格推荐");
+                    tab.select();
+                    changeRecyclerItemCount(5);
+                    setContainerRecycler(FaceBeautySource.buildStylesParams());
+                }
+            }
         }
+
         tabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
             @Override
             public void onTabSelected(TabLayout.Tab tab) {
                 Object tabTag = tab.getTag();
                 if (tabTag instanceof Integer) {
+                    if (FaceSPUtils.getInstance().getString(StyleViewHolder.class.getSimpleName() + "_") != null && (int) tab.getTag() < FaceParam.FACE_BEAUTY_STYLE) {
+                        ToastUtil.show("请先重置风格推荐");
+                        tabLayout.getTabAt(3).select();
+                        return;
+                    }
                     switch ((int) tab.getTag()) {
                         case FaceParam.FACE_BEAUTY_SKIN:
                             changeRecyclerItemCount(2);
@@ -407,7 +444,8 @@ public class FaceUnityView extends LinearLayout implements StickerDownloadHelper
             containerRecycler.setLayoutManager(new GridLayoutManager(mContext, 2));
             containerRecycler.setAdapter(containerAdapter);
         }
-        titleLayout.setVisibility(title.getVisibility()==GONE?INVISIBLE:VISIBLE);
+        // titleLayout.setVisibility(title.getVisibility()==GONE?INVISIBLE:VISIBLE);
+        // Log.i(TAG, "setContainerRecycler: " + list.size());
         containerAdapter.setList(list);
         containerAdapter.notifyDataSetChanged();
     }

FaceUnity/src/main/java/com/yunbao/faceunity/utils/FURenderer.java

@@ -55,7 +55,7 @@ public class FURenderer extends IFURenderer {
     private FURenderKit mFURenderKit;
 
     /* AI道具*/
-    private String BUNDLE_AI_FACE = "model" + File.separator + "ai_face_processor.bundle";
+    private String BUNDLE_AI_FACE = "model" + File.separator + "ai_face_processor_lite.bundle";
     private String BUNDLE_AI_HUMAN = "model" + File.separator + "ai_human_processor.bundle";
 
     /* GL 线程 ID */
@@ -87,8 +87,8 @@ public class FURenderer extends IFURenderer {
      */
     @Override
     public void setup(Context context) {
-        FURenderManager.setKitDebug(FULogger.LogLevel.OFF);
+        FURenderManager.setKitDebug(FULogger.LogLevel.INFO);
-        FURenderManager.setCoreDebug(FULogger.LogLevel.OFF);
+        FURenderManager.setCoreDebug(FULogger.LogLevel.INFO);
         FURenderManager.registerFURender(context, Authpack.A(), new OperateCallback() {
             @Override
             public void onSuccess(int i, @NotNull String s) {

FaceUnity/src/main/java/com/yunbao/faceunity/utils/FaceSPUtils.java

@@ -5,6 +5,8 @@ import android.content.SharedPreferences;
 
 import com.yunbao.common.CommonAppContext;
 
+import java.util.Map;
+
 public class FaceSPUtils {
     private static FaceSPUtils utils;
     private SharedPreferences mSharedPreferences;
@@ -38,4 +40,7 @@ public class FaceSPUtils {
             }
         }
     }
+    public Map<String, ?> getAll(){
+        return mSharedPreferences.getAll();
+    }
 }

FaceUnity/src/main/java/com/yunbao/faceunity/utils/FaceUnityConfig.java

@@ -15,7 +15,7 @@ public class FaceUnityConfig {
 
     /************************** 算法Model  ******************************/
     // 人脸识别
-    public static String BUNDLE_AI_FACE = "model" + File.separator + "ai_face_processor.bundle";
+    public static String BUNDLE_AI_FACE = "model" + File.separator + "ai_face_processor_lite.bundle";
     // 手势
     public static String BUNDLE_AI_HAND = "model" + File.separator + "ai_hand_processor.bundle";
 

FaceUnity/src/main/res/layout/layout_faceunity.xml

@@ -59,6 +59,7 @@
             android:id="@+id/titleLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:visibility="gone"
             android:layout_marginTop="16dp"
             >
 
@@ -178,11 +179,11 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:visibility="gone">
+            android:visibility="visible">
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="25dp"
+                android:layout_height="35dp"
                 android:gravity="center"
                 android:orientation="horizontal">
 
@@ -202,7 +203,7 @@
 
                 <HorizontalScrollView
                     android:layout_width="0dp"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
                     android:layout_marginStart="10dp"
                     android:layout_marginEnd="10dp"
                     android:layout_weight="1">
@@ -214,6 +215,8 @@
                         app:tabMaxWidth="100dp"
                         app:tabMode="scrollable"
                         app:tabSelectedTextColor="#F6F7FB"
+                        app:tabIndicatorColor="#F6F7FB"
+                        app:tabIndicatorFullWidth="false"
                         app:tabTextColor="#9A9A9A" />
                 </HorizontalScrollView>