From 1feda0e047e53918c3e276c7c44d2b59f1cd2946 Mon Sep 17 00:00:00 2001 From: huangjian Date: Tue, 21 Mar 2023 14:11:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=98=9F=E9=99=85=E6=8E=A2=E9=99=A9UI=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webview/RadishDialogWebViewActivity.java | 2 +- .../app/shipantics/RadishBuyKeyDialog.kt | 4 +- .../pull_radish_result_ic_close.png | Bin 4419 -> 4076 bytes .../res/layout/activity_pull_radish.xml | 56 +++++++++--------- .../res/layout/dialog_radish_buy_key.xml | 14 ++--- .../res/layout/dialog_radish_result.xml | 4 +- 6 files changed, 41 insertions(+), 39 deletions(-) diff --git a/app/src/main/java/com/nnbc123/app/ui/webview/RadishDialogWebViewActivity.java b/app/src/main/java/com/nnbc123/app/ui/webview/RadishDialogWebViewActivity.java index f0c43de1a..c9b07398c 100644 --- a/app/src/main/java/com/nnbc123/app/ui/webview/RadishDialogWebViewActivity.java +++ b/app/src/main/java/com/nnbc123/app/ui/webview/RadishDialogWebViewActivity.java @@ -27,7 +27,7 @@ public class RadishDialogWebViewActivity extends CommonWebViewActivity { getWindow().setGravity(Gravity.BOTTOM); View layoutRoot = findViewById(R.id.ll_root); FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) layoutRoot.getLayoutParams(); - layoutParams.height = ScreenUtil.screenWidth * 515 / 375; + layoutParams.height = ScreenUtil.screenWidth * 1030 / 750; layoutParams.width = FrameLayout.LayoutParams.MATCH_PARENT; layoutRoot.setLayoutParams(layoutParams); layoutTitleBar.setVisibility(View.GONE); diff --git a/app/src/module_treasure_box/java/com/nnbc123/app/shipantics/RadishBuyKeyDialog.kt b/app/src/module_treasure_box/java/com/nnbc123/app/shipantics/RadishBuyKeyDialog.kt index 26a29eaa0..c75bf72da 100644 --- a/app/src/module_treasure_box/java/com/nnbc123/app/shipantics/RadishBuyKeyDialog.kt +++ b/app/src/module_treasure_box/java/com/nnbc123/app/shipantics/RadishBuyKeyDialog.kt @@ -1,5 +1,6 @@ package com.nnbc123.app.shipantics +import com.netease.nim.uikit.common.util.sys.ScreenUtil import com.nnbc123.app.base.BaseDialog import com.nnbc123.app.databinding.DialogRadishBuyKeyBinding import com.nnbc123.app.ui.webview.DialogWebViewActivity @@ -13,7 +14,8 @@ class RadishBuyKeyDialog : return RadishBuyKeyDialog() } } - + override var width: Int = ScreenUtil.dip2px(290f) + override var height: Int =ScreenUtil.dip2px(226f) override fun init() { binding.ivCancel.setOnClickListener { dismissAllowingStateLoss() } diff --git a/app/src/module_treasure_box/res/drawable-xhdpi/pull_radish_result_ic_close.png b/app/src/module_treasure_box/res/drawable-xhdpi/pull_radish_result_ic_close.png index 0f4164c7c7ee0dfa4654c5214ad682b6e3d8afbe..ac9b1c1608f6227c116674b6b7247f73c073af97 100644 GIT binary patch literal 4076 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 JPDHLkV1g<1MtcAN diff --git a/app/src/module_treasure_box/res/layout/activity_pull_radish.xml b/app/src/module_treasure_box/res/layout/activity_pull_radish.xml index 9c9da4feb..c38542abb 100644 --- a/app/src/module_treasure_box/res/layout/activity_pull_radish.xml +++ b/app/src/module_treasure_box/res/layout/activity_pull_radish.xml @@ -20,14 +20,28 @@ android:id="@+id/iv_ship" android:layout_width="0dp" android:layout_height="0dp" + android:layout_marginTop="8dp" android:onClick="@{click}" android:src="@drawable/pull_radish_bg_ship" - app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintDimensionRatio="750:725" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintVertical_bias="0.7" /> + app:layout_constraintTop_toTopOf="@id/view_bg" /> + + - + app:layout_constraintVertical_bias="0.74" /> + app:layout_constraintStart_toStartOf="@id/view_bg" + app:layout_constraintWidth_percent="0.96"> + />