1:修改转盘去掉了特效还又声音

2：修改巡乐会去掉跳过动画，
3：修改巡乐会结果页面，进行展示，不在关联抽奖

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;//主题的开关
 

BaseModule/src/main/java/com/xscm/moduleutil/dialog/giftLottery/XlhObtainDialog.java

@@ -72,7 +72,8 @@ public class XlhObtainDialog extends BaseDialog<DialogXlhObtainBinding> {
 
         mBinding.ivAgain.setOnClickListener(v -> {
             if (mListener != null) {
-                mListener.onPlayAgainClick();
+//                mListener.onPlayAgainClick();
+                mListener.onCloseClick();
             }
             dismiss();
         });

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",
+//            "tcp://yushengapi.qxyushen.top",
-           // "https://vespa.qxyushen.top/h5",
+            "tcp://vsyusheng.qxhs.xyz", //这是要进行正式服测试的地址
+            // "https://vespa.qxyushen.top/h5",
             "https://yushengapi.qxyushen.top/h5",
             0),
 

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);
+//        svgaSurface.setVisibility(View.VISIBLE);
-        try {
+//        try {
-            new SVGAParser(getContext()).parse(new URL(url), new SVGAParser.ParseCompletion() {
+//            new SVGAParser(getContext()).parse(new URL(url), new SVGAParser.ParseCompletion() {
-                @Override
+//                @Override
-                public void onComplete(SVGAVideoEntity videoItem) {
+//                public void onComplete(SVGAVideoEntity videoItem) {
-                    SVGADrawable drawable = new SVGADrawable(videoItem, new SVGADynamicEntity());
+//                    SVGADrawable drawable = new SVGADrawable(videoItem, new SVGADynamicEntity());
-                    svgaSurface.setImageDrawable(drawable);
+//                    svgaSurface.setImageDrawable(drawable);
-                    svgaSurface.setCallback(new SVGACallback() {
+//                    svgaSurface.setCallback(new SVGACallback() {
-
+//
-                        @Override
+//                        @Override
-                        public void onStep(int i, double v) {
+//                        public void onStep(int i, double v) {
-
+//
-                        }
+//                        }
-
+//
-                        @Override
+//                        @Override
-                        public void onRepeat() {
+//                        public void onRepeat() {
-
+//
-                        }
+//                        }
-
+//
-                        @Override
+//                        @Override
-                        public void onPause() {
+//                        public void onPause() {
-
+//
-                        }
+//                        }
-
+//
-                        @Override
+//                        @Override
-                        public void onFinished() {
+//                        public void onFinished() {
-                            isPlaying = false;
+//                            isPlaying = false;
-                        }
+//                        }
-                    });
+//                    });
-
+//
-                    svgaSurface.startAnimation();
+//                    svgaSurface.startAnimation();
-                }
+//                }
-
+//
-                @Override
+//                @Override
-                public void onError() {
+//                public void onError() {
-                    isPlaying = false;
+//                    isPlaying = false;
-                }
+//                }
-            });
+//            });
-        } catch (Exception e) {
+//        } catch (Exception e) {
-            e.printStackTrace();
+//            e.printStackTrace();
-        }
+//        }
     }
 
 

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"/>
 
         <View
             android:id="@+id/v_checkbox"
@@ -450,7 +451,8 @@
             android:focusable="false"
             app:layout_constraintBottom_toBottomOf="@+id/exchange_layout"
             app:layout_constraintEnd_toStartOf="@+id/tv_option"
-            app:layout_constraintTop_toTopOf="@+id/exchange_layout" />
+            app:layout_constraintTop_toTopOf="@+id/exchange_layout"
+            android:visibility="gone"/>
 
         <LinearLayout
             android:id="@+id/exchange_layout"

MainModule/src/main/java/com/xscm/modulemain/dialog/GiftLotteryDialog.java

@@ -698,7 +698,9 @@ public class GiftLotteryDialog extends BaseMvpDialogFragment<GiftLotteryPresente
                         MvpPre.giftSend(blind_box_turntable_id);
                         MvpPre.wallet();
                         isDrawing = false;
-                        playSound("xuanz.mp3");
+                        if (isOpenSound) {
+                            playSound("xuanz.mp3");
+                        }
                         stopFastAnimate();
                         return;
                     }