diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/GiftEffectView.java b/app/src/main/java/com/yizhuan/erban/avroom/widget/GiftEffectView.java index d16a3a5b6..ba8bd76e3 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/GiftEffectView.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/GiftEffectView.java @@ -192,9 +192,6 @@ public class GiftEffectView extends RelativeLayout implements SVGACallback { if (!isHideCarEffect && initInfo != null && giftInfo.getGoldPrice() >= initInfo.getHideCarEffectGiftPrice()) { isHideCarEffect = true; IMNetEaseManager.get().noticeRoomEvent(null, RoomEvent.ROOM_CAR_EFFECT_HIDE); - } else if (isHideCarEffect) { - isHideCarEffect = false; - IMNetEaseManager.get().noticeRoomEvent(null, RoomEvent.ROOM_CAR_EFFECT_SHOW); } } } @@ -242,6 +239,10 @@ public class GiftEffectView extends RelativeLayout implements SVGACallback { @Override public void onAnimationEnd(Animator animation) { super.onAnimationEnd(animation); + if (isHideCarEffect) { + isHideCarEffect = false; + IMNetEaseManager.get().noticeRoomEvent(null, RoomEvent.ROOM_CAR_EFFECT_SHOW); + } if (giftEffectListener != null) { isAnim = false; giftEffectListener.onGiftEffectEnd(); diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java index a35c57a1c..4178e1e69 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java +++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java @@ -203,20 +203,15 @@ public class XChatConstants { public static final String LOGIN_ERBAN_ACCOUNT_URL = "/yinyou/modules/rule/login_tips.html"; public static final String ROOM_INTRODUCTION = "可点击房间话题查看本房间公告"; - public static final String DATING_TIPS_OPEN= "相亲玩法已开启,请点击主持人麦位选择主持人"; + public static final String DATING_TIPS_OPEN = "相亲玩法已开启,请点击主持人麦位选择主持人"; //仅开头提示文案,这个tips消息我们服务端发的 - public static final String DATING_TIPS_NEW= "新一轮的相亲已开启"; - public static final String DATING_TIPS_IN= "已进入心动选人环节"; - public static final String DATING_TIPS_PUBLIC= "公布心动对象"; + public static final String DATING_TIPS_NEW = "新一轮的相亲已开启"; + public static final String DATING_TIPS_IN = "已进入心动选人环节"; + public static final String DATING_TIPS_PUBLIC = "公布心动对象"; public static final String SHOW = "show"; public static final String HIDE = "hide"; - /** - * 网易七鱼客服系统key - */ - public static final String QI_YU_KF_KEY = BuildConfig.DEBUG ? "411661bd233f0805626044b6d65fa74a" : "411661bd233f0805626044b6d65fa74a"; - public static final String UPDATE_VERSION_TIPS = "版本过旧,请下载最新版本哦"; public static final String NET_ERROR = "网络错误"; @@ -282,24 +277,17 @@ public class XChatConstants { * Referer (RELEASE) */ public static final String KEY_REFERER_RELEASE = "https://api.lecheng163.com/"; - - public static int SELECT_ANIM_DURATION = 2500; - // 侧耳 -// public static final String QUICK_PASS_BUSINESS_ID = BuildConfig.DEBUG ? "cadbb4ed892549dab4d1adc9d62013bb" : "ba4a642810294561b9cd17034a448b49"; - public static final String APP_MARK = "yinyou"; - - public static long ZEGO_APP_ID = 1067458582L; - public static byte[] ZEGO_APP_SIGN = new byte[]{ - (byte)0x2b,(byte)0x86,(byte)0x24,(byte)0xef,(byte)0xd9,(byte)0x96,(byte)0xf1,(byte)0x1c,(byte)0x6b, - (byte)0xa2,(byte)0x28,(byte)0xc3,(byte)0xef,(byte)0x24,(byte)0xdd,(byte)0x64,(byte)0x2e,(byte)0xd7, - (byte)0x33,(byte)0x3f,(byte)0x33,(byte)0x90,(byte)0x07,(byte)0x53,(byte)0xeb,(byte)0xd2,(byte)0xd2, - (byte)0x4e,(byte)0xc5,(byte)0xed,(byte)0xfd,(byte)0x43 - }; /** * 聊天室文本消息易盾反垃圾业务id */ - public static final String CHAT_ROOM_ANTI_SPAM_CONFIG_ID = "244721766ba607056a32c8824a85c253"; - - + public static final String CHAT_ROOM_ANTI_SPAM_CONFIG_ID = BuildConfig.DEBUG ? "be58dfa4a664540006f0ed1f752d604a" : "244721766ba607056a32c8824a85c253"; + public static int SELECT_ANIM_DURATION = 2500; + public static long ZEGO_APP_ID = 1067458582L; + public static byte[] ZEGO_APP_SIGN = new byte[]{ + (byte) 0x2b, (byte) 0x86, (byte) 0x24, (byte) 0xef, (byte) 0xd9, (byte) 0x96, (byte) 0xf1, (byte) 0x1c, (byte) 0x6b, + (byte) 0xa2, (byte) 0x28, (byte) 0xc3, (byte) 0xef, (byte) 0x24, (byte) 0xdd, (byte) 0x64, (byte) 0x2e, (byte) 0xd7, + (byte) 0x33, (byte) 0x3f, (byte) 0x33, (byte) 0x90, (byte) 0x07, (byte) 0x53, (byte) 0xeb, (byte) 0xd2, (byte) 0xd2, + (byte) 0x4e, (byte) 0xc5, (byte) 0xed, (byte) 0xfd, (byte) 0x43 + }; }