美颜

libBytedance/src/main/java/im/zego/bytedance/beauty/fragment/EffectFragment.java

@@ -25,11 +25,7 @@ import static im.zego.bytedance.beauty.manager.EffectDataManager.TYPE_CLOSE;
 import static im.zego.bytedance.beauty.manager.EffectDataManager.TYPE_FILTER;
 import static im.zego.bytedance.beauty.manager.EffectDataManager.TYPE_FILTER_AMG;
 import static im.zego.bytedance.beauty.manager.EffectDataManager.TYPE_HAIR_DYE;
-import static im.zego.bytedance.beauty.manager.EffectDataManager.TYPE_HAIR_DYE_FULL;
 import static im.zego.bytedance.beauty.manager.EffectDataManager.TYPE_HAIR_DYE_HIGHLIGHT;
-import static im.zego.bytedance.beauty.manager.EffectDataManager.TYPE_LIPSTICK;
-import static im.zego.bytedance.beauty.manager.EffectDataManager.TYPE_LIPSTICK_GLOSSY;
-import static im.zego.bytedance.beauty.manager.EffectDataManager.TYPE_LIPSTICK_MATTE;
 import static im.zego.bytedance.beauty.manager.EffectDataManager.TYPE_MAKEUP_HAIR;
 
 import android.annotation.SuppressLint;
@@ -1207,20 +1203,21 @@ public class EffectFragment extends TabBoardFragment implements View.OnClickList
         if (item == null) {
             return;
         }
-        mEffectCallback.onMakeUpItemSelect(item);
         if (item.getPath() != null && item.getPath().startsWith("stickers/")) { // 是贴纸，不需要显示进度条
+            mEffectCallback.onStickSelect(item);
             pb.setVisibility(View.GONE);
             isShowBeautyProProcessBarRT(false);
         } else { // 风格装要显示进度，并且显示选项
+            mEffectCallback.onMakeUpSelect(item);
             updateProgressWithItem(item);
             mCurrentItem = item;
             mCurrentItem.setSelectedRelation(true);
-            if (item.getId() != EffectDataManager.TYPE_CLOSE) {
-                item.setSelected(true);
-                if (LocalParamDataManager.useLocalParamStorage()) {
-                    LocalParamDataManager.saveComposerNode(item);
-                }
-            }
+//            if (item.getId() != EffectDataManager.TYPE_CLOSE) {
+//                item.setSelected(true);
+//                if (LocalParamDataManager.useLocalParamStorage()) {
+//                    LocalParamDataManager.saveComposerNode(item);
+//                }
+//            }
         }
     }
 
@@ -1360,7 +1357,16 @@ public class EffectFragment extends TabBoardFragment implements View.OnClickList
 
         void updateComposerNodeIntensity(String node, String key, float value);
 
+        /**
+         * 贴纸选择
+         * @param item
+         */
+        void onStickSelect(EffectButtonItem item);
 
-        void onMakeUpItemSelect(EffectButtonItem item);
+        /**
+         * 风格装选择
+         * @param item
+         */
+        void onMakeUpSelect(EffectButtonItem item);
     }
 }

module_live/src/main/java/com/yc/module_live/view/RoomActivity.kt

@@ -2752,25 +2752,22 @@ class RoomActivity : BaseActivity<RoomVm>(), LiveDialogFragmentListener, VoicePr
         LogUtils.d("3. updateComposerNodeIntensity +$node  $key $value")
     }
 
-    // 风格装使用
-    private var mSelected: EffectButtonItem? = null
-
-    override fun onMakeUpItemSelect(item: EffectButtonItem?) {
+    override fun onStickSelect(item: EffectButtonItem?) {
         if (!item?.path.isNullOrEmpty() && item?.path?.startsWith("stickers/") == true) {
             if (item?.path == "stickers/close") {
                 mEffectManager?.setSticker("")
                 return
             }
             mEffectManager?.setSticker(item?.path)
-            return
         }
+    }
+
+    // 风格装使用
+    private var mSelected: EffectButtonItem? = null
+    override fun onMakeUpSelect(item: EffectButtonItem?) {
         if (mSelected != null && mSelected?.id != TYPE_CLOSE) {
             if (mSelected?.node != null) {
-                mEffectManager!!.removeComposeNodes(
-                    arrayOf(
-                        mSelected?.node?.path!!
-                    )
-                )
+                mEffectManager!!.removeComposeNodes(arrayOf(mSelected?.node?.path!!))
                 if (item!!.id == TYPE_CLOSE) {
                     //  {zh} 重置强度值  {en} Reset strength value
                     if (!LocalParamDataManager.useLocalParamStorage()) {
@@ -2786,11 +2783,7 @@ class RoomActivity : BaseActivity<RoomVm>(), LiveDialogFragmentListener, VoicePr
         if (mSelected?.node == null) {
             return
         }
-        mEffectManager!!.appendComposeNodes(
-            arrayOf(
-                mSelected?.node?.path!!
-            )
-        )
+        mEffectManager!!.appendComposeNodes(arrayOf(mSelected?.node?.path!!))
         if (item!!.node != null) {
             for (i in 0 until mSelected?.node?.keyArray?.size!!) {
                 mEffectManager!!.updateComposerNodeIntensity(