糖果树UI调整

app/src/main/java/com/mango/moshen/ui/webview/JSInterface.java

@@ -23,6 +23,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.alibaba.security.realidentity.RPEventListener;
 import com.alibaba.security.realidentity.RPResult;
 import com.alibaba.security.realidentity.RPVerify;
+import com.mango.core.UriProvider;
 import com.mango.core.utils.LogUtils;
 import com.mango.moshen.BuildConfig;
 import com.mango.xchat_android_library.utils.file.JXFileUtils;
@@ -557,6 +558,7 @@ public class JSInterface {
                 "&app=" + XChatConstants.APP_MARK;
         req.miniprogramType = BuildConfig.DEBUG ? WXLaunchMiniProgram.Req.MINIPROGRAM_TYPE_TEST : WXLaunchMiniProgram.Req.MINIPTOGRAM_TYPE_RELEASE;// 可选打开 开发版，体验版和正式版
         api.sendReq(req);
+        TarotPayWebViewActivity.start(mActivity, UriProvider.JAVA_WEB_URL + "yinyou/modules/tarot/payment_result.html?chargeRecordId=" + jsonObject.getString("chargeRecordId"));
     }
 
     /**

app/src/main/res/layout/layout_room_box_notify.xml

@@ -8,10 +8,11 @@
     android:ellipsize="end"
     android:gravity="center"
     android:includeFontPadding="false"
-    android:maxLines="2"
     android:lineSpacingExtra="0dp"
     android:lineSpacingMultiplier="0.9"
+    android:maxLines="2"
     android:paddingStart="80dp"
+    android:paddingTop="12dp"
     android:paddingEnd="80dp"
     android:textSize="12sp"
     tools:layout_height="wrap_content"

app/src/main/res/layout/layout_room_effect.xml

@@ -74,7 +74,7 @@
                 android:id="@+id/fl_box_notify"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
-                app:layout_constraintDimensionRatio="75:11"
+                app:layout_constraintDimensionRatio="75:12"
                 app:layout_constraintTop_toTopOf="parent" />
 
             <FrameLayout

app/src/module_treasure_box/java/com/mango/moshen/treasure_box/activity/TreasureBoxActivity.java

@@ -18,6 +18,8 @@ import android.view.animation.AccelerateDecelerateInterpolator;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
 import com.mango.core.room.treasure_box.event.RefreshBoxRankingEvent;
@@ -25,6 +27,8 @@ import com.mango.core.statistic.StatisticManager;
 import com.mango.core.statistic.protocol.StatisticsProtocol;
 import com.mango.moshen.treasure_box.fragment.BoxRecordFragment;
 import com.mango.moshen.treasure_box.fragment.BoxRuleFragment;
+import com.mango.moshen.ui.utils.ImageLoadKt;
+import com.mango.moshen.ui.widget.SimpleAnimListener;
 import com.mango.treasure_box.event.MoreClickEvent;
 import com.netease.nim.uikit.StatusBarUtil;
 import com.netease.nim.uikit.common.util.sys.ScreenUtil;
@@ -49,11 +53,15 @@ import com.mango.xchat_android_library.annatation.ActLayoutRes;
 import com.mango.xchat_android_library.utils.FormatUtils;
 import com.mango.xchat_android_library.utils.SingleToastUtil;
 import com.mango.xchat_android_library.utils.TextWatcherWrapper;
+import com.tencent.qgame.animplayer.AnimConfig;
+import com.tencent.qgame.animplayer.inter.IAnimListener;
+import com.tencent.qgame.animplayer.util.ScaleType;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.concurrent.TimeUnit;
@@ -134,7 +142,9 @@ public class TreasureBoxActivity extends BaseBindingActivity<ActivityTreasureBox
                 }
             }
         });
-
+        mBinding.ivBox.startPlay(getAssets(), "vap/gold_box_open.mp4");
+        mBinding.ivBox.setLoop(999999);
+        mBinding.ivBox.setScaleType(ScaleType.CENTER_CROP);
         looperPrize();
         looperHintPrize();
     }
@@ -252,8 +262,6 @@ public class TreasureBoxActivity extends BaseBindingActivity<ActivityTreasureBox
         }
         boolean sendMessage = (sendMessageSwitchLevel != 0 && UserUtils.getExpLevel() < sendMessageSwitchLevel) || DemoCache.readNeedBoxMsg();
         mBinding.ivOpen.setEnabled(false);
-        mBinding.ivFirstBox.setVisibility(View.GONE);
-        mBinding.ivBoxOpen.startAnimation();
         long startTime = System.currentTimeMillis();
         BoxModel.get().openBox(boxType, count, sendMessage)
                 .compose(bindToLifecycle())

app/src/module_treasure_box/res/layout/activity_treasure_box.xml

@@ -53,7 +53,6 @@
             app:layout_constraintStart_toStartOf="@id/iv_more"
             app:layout_constraintTop_toBottomOf="@id/iv_more" />
 
-
         <TextView
             android:id="@+id/tv_diamond_num"
             android:layout_width="wrap_content"
@@ -95,18 +94,7 @@
             app:layout_constraintStart_toStartOf="@id/view_bg"
             app:layout_constraintTop_toTopOf="@id/view_bg" />
 
-        <ImageView
-            android:id="@+id/iv_first_box"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:scaleType="fitXY"
-            android:src="@drawable/ic_box_temp"
-            app:layout_constraintBottom_toBottomOf="@id/iv_box"
-            app:layout_constraintEnd_toEndOf="@id/iv_box"
-            app:layout_constraintStart_toStartOf="@id/iv_box"
-            app:layout_constraintTop_toTopOf="@id/iv_box" />
-
-        <com.opensource.svgaplayer.SVGAImageView
+        <com.tencent.qgame.animplayer.AnimView
             android:id="@+id/iv_box"
             android:layout_width="160dp"
             android:layout_height="190dp"
@@ -114,27 +102,9 @@
             android:layout_marginTop="52dp"
             android:layout_marginBottom="12dp"
             android:onClick="@{click}"
-            app:autoPlay="true"
             app:layout_constraintBottom_toTopOf="@id/iv_sub"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:loopCount="999999"
-            app:source="svga/gold_box_bg.svga" />
-
-        <com.opensource.svgaplayer.SVGAImageView
-            android:id="@+id/iv_box_open"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_gravity="center_horizontal"
-            app:autoPlay="false"
-            app:fillMode="Clear"
-            app:layout_constraintBottom_toBottomOf="@id/iv_box"
-            app:layout_constraintEnd_toEndOf="@id/iv_box"
-            app:layout_constraintStart_toStartOf="@id/iv_box"
-            app:layout_constraintTop_toTopOf="@id/iv_box"
-            app:loopCount="1"
-            app:source="svga/gold_box_open.svga" />
-
+            app:layout_constraintStart_toStartOf="parent" />
 
         <ImageView
             android:id="@+id/iv_gift_anim"