diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java b/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java index d312c4c2..ca0cd318 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java @@ -137,7 +137,7 @@ public class CommonAppContext extends MultiDexApplication implements Application @Getter public UnreadCountEvent unreadCountEvent; - public static int selectRelease = -1; + public static int selectRelease = 1; public int is_open = 0;//主题的开关 diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/dialog/giftLottery/XlhObtainDialog.java b/BaseModule/src/main/java/com/xscm/moduleutil/dialog/giftLottery/XlhObtainDialog.java index 9c5d8f31..2f868ee6 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/dialog/giftLottery/XlhObtainDialog.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/dialog/giftLottery/XlhObtainDialog.java @@ -72,7 +72,8 @@ public class XlhObtainDialog extends BaseDialog { mBinding.ivAgain.setOnClickListener(v -> { if (mListener != null) { - mListener.onPlayAgainClick(); +// mListener.onPlayAgainClick(); + mListener.onCloseClick(); } dismiss(); }); diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java b/BaseModule/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java index c2116de9..6d1389f2 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java @@ -4,7 +4,8 @@ public enum EnvironmentEnum { // "https://vespa.qxyushen.top/", PRODUCTION(//生产环境 //"https://vespa.qxyushen.top/", - "https://yushengapi.qxyushen.top/", + "https://vsyusheng.qxhs.xyz/", //这是要进行正式服测试的地址 +// "https://yushengapi.qxyushen.top/", "KvNmqZc+VMzO4CfGMd5zmG6w6OFwpFO/19TwXUWfHDOBgmnl9DgIuE+kbrjNNnxqhtP3pH7bBrnSaSeFtunr72q6sgpLsfuswcUroMvz2slaTBcNzCaLi+GSnM3gB/GdO47mwLdk+iYBTvPUOCIuT608Z29z09w+vPeUDoMCHJBGXu6uh7Nj6PtV1dfGoUvByk1ZF0WYVjIqKDcb3tXY4jonFh3XAWhzMy8xKwN6F2nuK2IcdIwaSPsvuMZmhatP6f9kOE+vnfweyCHS3RxiG474WIoZGJM8omrl3/pOVqE=", "https://oss-cn-beijing.aliyuncs.com/", "LTAI5tKgrfcFQxH46ZwWYgFW", @@ -12,12 +13,14 @@ public enum EnvironmentEnum { "midi01", "https://midi01.oss-cn-beijing.aliyuncs.com/", "wxc7681513be9f926b", - 1600096860, +// 1600096860, + 1600096890,//这是要进行正式服测试的地址 "3e8f3add448d4692bc1d04c75ffe801b", //"tcp://1.13.101.98", // "tcp://1.13.20.30", - "tcp://yushengapi.qxyushen.top", - // "https://vespa.qxyushen.top/h5", +// "tcp://yushengapi.qxyushen.top", + "tcp://vsyusheng.qxhs.xyz", //这是要进行正式服测试的地址 + // "https://vespa.qxyushen.top/h5", "https://yushengapi.qxyushen.top/h5", 0), diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/widget/AvatarFrameView.java b/BaseModule/src/main/java/com/xscm/moduleutil/widget/AvatarFrameView.java index 7bc03117..4027bbfe 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/widget/AvatarFrameView.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/widget/AvatarFrameView.java @@ -397,6 +397,7 @@ public class AvatarFrameView extends FrameLayout { if (cachedEntity != null) { // 使用缓存的实体 playCachedSVGA(cachedEntity); + return; } else { // 加载新的SVGA loadNewSVGA(url); @@ -406,47 +407,47 @@ public class AvatarFrameView extends FrameLayout { isPlaying = false; } - svgaSurface.setVisibility(View.VISIBLE); - try { - new SVGAParser(getContext()).parse(new URL(url), new SVGAParser.ParseCompletion() { - @Override - public void onComplete(SVGAVideoEntity videoItem) { - SVGADrawable drawable = new SVGADrawable(videoItem, new SVGADynamicEntity()); - svgaSurface.setImageDrawable(drawable); - svgaSurface.setCallback(new SVGACallback() { - - @Override - public void onStep(int i, double v) { - - } - - @Override - public void onRepeat() { - - } - - @Override - public void onPause() { - - } - - @Override - public void onFinished() { - isPlaying = false; - } - }); - - svgaSurface.startAnimation(); - } - - @Override - public void onError() { - isPlaying = false; - } - }); - } catch (Exception e) { - e.printStackTrace(); - } +// svgaSurface.setVisibility(View.VISIBLE); +// try { +// new SVGAParser(getContext()).parse(new URL(url), new SVGAParser.ParseCompletion() { +// @Override +// public void onComplete(SVGAVideoEntity videoItem) { +// SVGADrawable drawable = new SVGADrawable(videoItem, new SVGADynamicEntity()); +// svgaSurface.setImageDrawable(drawable); +// svgaSurface.setCallback(new SVGACallback() { +// +// @Override +// public void onStep(int i, double v) { +// +// } +// +// @Override +// public void onRepeat() { +// +// } +// +// @Override +// public void onPause() { +// +// } +// +// @Override +// public void onFinished() { +// isPlaying = false; +// } +// }); +// +// svgaSurface.startAnimation(); +// } +// +// @Override +// public void onError() { +// isPlaying = false; +// } +// }); +// } catch (Exception e) { +// e.printStackTrace(); +// } } diff --git a/BaseModule/src/main/res/layout/fragment_tour_club_dialog.xml b/BaseModule/src/main/res/layout/fragment_tour_club_dialog.xml index 5fbf14e9..f3b04708 100644 --- a/BaseModule/src/main/res/layout/fragment_tour_club_dialog.xml +++ b/BaseModule/src/main/res/layout/fragment_tour_club_dialog.xml @@ -439,7 +439,8 @@ android:textSize="@dimen/sp_10" app:layout_constraintBottom_toBottomOf="@+id/exchange_layout" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="@+id/exchange_layout" /> + app:layout_constraintTop_toTopOf="@+id/exchange_layout" + android:visibility="gone"/> + app:layout_constraintTop_toTopOf="@+id/exchange_layout" + android:visibility="gone"/>