diff --git a/app/src/main/assets/svga/box_notify.svga b/app/src/main/assets/svga/box_notify.svga index f67759210..62eb88f25 100644 Binary files a/app/src/main/assets/svga/box_notify.svga and b/app/src/main/assets/svga/box_notify.svga differ diff --git a/app/src/main/assets/vap/gold_box_open.mp4 b/app/src/main/assets/vap/gold_box_open.mp4 new file mode 100644 index 000000000..2c1d03f30 Binary files /dev/null and b/app/src/main/assets/vap/gold_box_open.mp4 differ diff --git a/app/src/main/java/com/mango/moshen/ui/webview/JSInterface.java b/app/src/main/java/com/mango/moshen/ui/webview/JSInterface.java index f5c3b43a1..655bd4e91 100644 --- a/app/src/main/java/com/mango/moshen/ui/webview/JSInterface.java +++ b/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")); } /** diff --git a/app/src/main/res/drawable-xhdpi/bg_box_notice.png b/app/src/main/res/drawable-xhdpi/bg_box_notice.png index 97ac7d72c..fb5ef283c 100644 Binary files a/app/src/main/res/drawable-xhdpi/bg_box_notice.png and b/app/src/main/res/drawable-xhdpi/bg_box_notice.png differ diff --git a/app/src/main/res/layout/layout_room_box_notify.xml b/app/src/main/res/layout/layout_room_box_notify.xml index d68eeb978..0cb3f781b 100644 --- a/app/src/main/res/layout/layout_room_box_notify.xml +++ b/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" diff --git a/app/src/main/res/layout/layout_room_effect.xml b/app/src/main/res/layout/layout_room_effect.xml index 194524b66..14a29cd3a 100644 --- a/app/src/main/res/layout/layout_room_effect.xml +++ b/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" /> - - - - - - - + app:layout_constraintStart_toStartOf="parent" />