风格装

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

@@ -1207,8 +1207,8 @@ public class EffectFragment extends TabBoardFragment implements View.OnClickList
         if (item == null) {
             return;
         }
+        mEffectCallback.onMakeUpItemSelect(item);
         if (item.getPath() != null && item.getPath().startsWith("stickers/")) { // 是贴纸，不需要显示进度条
-            mEffectCallback.onMakeUpItemSelect(item);
             pb.setVisibility(View.GONE);
             isShowBeautyProProcessBarRT(false);
         } else { // 风格装要显示进度，并且显示选项

libBytedance/src/main/java/im/zego/bytedance/beauty/manager/EffectDataManager.java

@@ -2181,12 +2181,12 @@ public class EffectDataManager {
                 R.string.sticker_2d,
                 new EffectButtonItem[]{
                         new EffectButtonItem(TYPE_CLOSE, R.drawable.clear, R.string.close),
-                        new EffectButtonItem(TYPE_LOCAL_STYLE_MAKEUP_2D, R.drawable.icon_baixi, R.string.style_makeup_baixi, new ComposerNode("style_makeup_local/baixi", new String[]{"Filter_ALL", "Makeup_ALL"}, getDefaultIntensity(TYPE_STYLE_MAKEUP, LITE_ASIA)), "baixi"),
-                        new EffectButtonItem(TYPE_LOCAL_STYLE_MAKEUP_2D, R.drawable.icon_weisuyan, R.string.style_makeup_weisuyan, new ComposerNode("style_makeup_local/weisuyan", new String[]{"Filter_ALL", "Makeup_ALL"}, getDefaultIntensity(TYPE_STYLE_MAKEUP, LITE_ASIA)), "weisuyan"),
-                        new EffectButtonItem(TYPE_LOCAL_STYLE_MAKEUP_2D, R.drawable.icon_xuejie, R.string.style_makeup_xuejie, new ComposerNode("style_makeup_local/xuejie", new String[]{"Filter_ALL", "Makeup_ALL"}, getDefaultIntensity(TYPE_STYLE_MAKEUP, LITE_ASIA)), "xuejie"),
-                        new EffectButtonItem(TYPE_LOCAL_STYLE_MAKEUP_2D, R.drawable.icon_xuemei, R.string.style_makeup_xuemei, new ComposerNode("style_makeup_local/xuemei", new String[]{"Filter_ALL", "Makeup_ALL"}, getDefaultIntensity(TYPE_STYLE_MAKEUP, LITE_ASIA)), "xuemei"),
-                        new EffectButtonItem(TYPE_LOCAL_STYLE_MAKEUP_2D, R.drawable.icon_tianmei, R.string.style_makeup_tianmei, new ComposerNode("style_makeup_local/tianmei", new String[]{"Filter_ALL", "Makeup_ALL"}, getDefaultIntensity(TYPE_STYLE_MAKEUP, LITE_ASIA)), "tianmei"),
-                        new EffectButtonItem(TYPE_LOCAL_STYLE_MAKEUP_2D, R.drawable.icon_qingtou, R.string.style_makeup_qingtou, new ComposerNode("style_makeup_local/qingtou", new String[]{"Filter_ALL", "Makeup_ALL"}, getDefaultIntensity(TYPE_STYLE_MAKEUP, LITE_ASIA)), "qingtou"),
+                        new EffectButtonItem(TYPE_LOCAL_STYLE_MAKEUP_2D, R.drawable.icon_baixi, R.string.style_makeup_baixi, new ComposerNode("style_makeup/baixi", new String[]{"Filter_ALL", "Makeup_ALL"}, getDefaultIntensity(TYPE_STYLE_MAKEUP, LITE_ASIA)), "baixi"),
+                        new EffectButtonItem(TYPE_LOCAL_STYLE_MAKEUP_2D, R.drawable.icon_weisuyan, R.string.style_makeup_weisuyan, new ComposerNode("style_makeup/weisuyan", new String[]{"Filter_ALL", "Makeup_ALL"}, getDefaultIntensity(TYPE_STYLE_MAKEUP, LITE_ASIA)), "weisuyan"),
+                        new EffectButtonItem(TYPE_LOCAL_STYLE_MAKEUP_2D, R.drawable.icon_xuejie, R.string.style_makeup_xuejie, new ComposerNode("style_makeup/xuejie", new String[]{"Filter_ALL", "Makeup_ALL"}, getDefaultIntensity(TYPE_STYLE_MAKEUP, LITE_ASIA)), "xuejie"),
+                        new EffectButtonItem(TYPE_LOCAL_STYLE_MAKEUP_2D, R.drawable.icon_xuemei, R.string.style_makeup_xuemei, new ComposerNode("style_makeup/xuemei", new String[]{"Filter_ALL", "Makeup_ALL"}, getDefaultIntensity(TYPE_STYLE_MAKEUP, LITE_ASIA)), "xuemei"),
+                        new EffectButtonItem(TYPE_LOCAL_STYLE_MAKEUP_2D, R.drawable.icon_tianmei, R.string.style_makeup_tianmei, new ComposerNode("style_makeup/tianmei", new String[]{"Filter_ALL", "Makeup_ALL"}, getDefaultIntensity(TYPE_STYLE_MAKEUP, LITE_ASIA)), "tianmei"),
+                        new EffectButtonItem(TYPE_LOCAL_STYLE_MAKEUP_2D, R.drawable.icon_qingtou, R.string.style_makeup_qingtou, new ComposerNode("style_makeup/qingtou", new String[]{"Filter_ALL", "Makeup_ALL"}, getDefaultIntensity(TYPE_STYLE_MAKEUP, LITE_ASIA)), "qingtou"),
 //                        new EffectButtonItem(TYPE_STYLE_MAKEUP_2D, R.drawable.icon_yinglang, R.string.style_makeup_yinglang, new ComposerNode("style_makeup_local/yinglang", new String[]{"Filter_ALL", "Makeup_ALL"}, getDefaultIntensity(TYPE_STYLE_MAKEUP, LITE_ASIA)), "yinglang"),
 //                        new EffectButtonItem(TYPE_STYLE_MAKEUP_2D, R.drawable.icon_shaonian, R.string.style_makeup_shaonian, new ComposerNode("style_makeup_local/shaonian", new String[]{"Filter_ALL", "Makeup_ALL"}, getDefaultIntensity(TYPE_STYLE_MAKEUP, LITE_ASIA)), "shaonian"),
 //                        new EffectButtonItem(TYPE_STYLE_MAKEUP_2D, R.drawable.icon_danyan, R.string.style_makeup_danyan, new ComposerNode("style_makeup_local/danyan", new String[]{"Filter_ALL", "Makeup_ALL"}, getDefaultIntensity(TYPE_STYLE_MAKEUP, LITE_ASIA)), "danyan"),