From 6af4c994e6644ee4bd708b2e477a699c18ecae97 Mon Sep 17 00:00:00 2001
From: zu <jnu.seven@gmail.com>
Date: Fri, 2 Jul 2021 19:08:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A2=A6=E5=B9=BB=E8=AE=B8=E6=84=BF=E6=B1=A0?=
 =?UTF-8?q?=E6=9C=AA=E5=BC=80=E5=90=AF=E5=88=99=E7=9B=B4=E6=8E=A5=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E6=99=AE=E9=80=9A=E8=AE=B8=E6=84=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fragment/HomePartyRoomFragment.java       |  7 ++++-
 .../activity/TreasureBoxActivity.java         |  3 ++
 .../res/layout/activity_treasure_box.xml      | 30 +++++++++++++++++++
 3 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java b/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java
index 9fe45c0d5..dc1f4ed86 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java
@@ -1545,7 +1545,12 @@ public class HomePartyRoomFragment extends BaseMvpFragment<IHomePartyView, HomeP
      * 房间许愿池
      */
     public void onClickBox() {
-        if (getFragmentManager() != null) {
+
+        String openTime = GoldBoxHelper.getBoxOpenTime();
+        int startTime = Integer.parseInt(openTime.substring(0, openTime.indexOf("-")).replace(":", ""));
+        int endTime = Integer.parseInt(openTime.substring(openTime.indexOf("-") + 1).replace(":", ""));
+
+        if (getFragmentManager() != null && TimeUtils.getTimeLimit(startTime, endTime)) {
             ChooseTreasureBoxDialogFragment chooseTreasureBoxDialogFragment = new ChooseTreasureBoxDialogFragment(GoldBoxHelper.getBoxOpenTime());
             chooseTreasureBoxDialogFragment.setOnTreasureBoxChooseListener(type -> {
                 if (type == 0) {// 幸运许愿池（默认）
diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxActivity.java b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxActivity.java
index 969366a7c..12591e818 100644
--- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxActivity.java
+++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxActivity.java
@@ -144,6 +144,9 @@ public class TreasureBoxActivity extends BaseBindingActivity<ActivityTreasureBox
             case R.id.iv_title:
                 //do nothing
                 break;
+            case R.id.ll_get_key:
+                DialogWebViewActivity.start(this, UriProvider.getBoxKey());
+                break;
             default:
                 break;
         }
diff --git a/app/src/module_treasure_box/res/layout/activity_treasure_box.xml b/app/src/module_treasure_box/res/layout/activity_treasure_box.xml
index bc86bef38..0b573b4b4 100644
--- a/app/src/module_treasure_box/res/layout/activity_treasure_box.xml
+++ b/app/src/module_treasure_box/res/layout/activity_treasure_box.xml
@@ -244,6 +244,36 @@
             tools:background="@color/white"
             tools:visibility="gone" />
 
+        <LinearLayout
+            android:id="@+id/ll_get_key"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:orientation="horizontal"
+            android:onClick="@{click}"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/view_bg">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="参与活动获得"
+                android:textColor="#ffffffff"
+                android:textSize="13sp" />
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/treasure_box_meteor" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="流星>"
+                android:textColor="#ffffffff"
+                android:textSize="13sp" />
+        </LinearLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>