糖果树ui调整

app/src/main/res/drawable/bg_1affff_r8.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="8dp" />
+    <solid android:color="#1affffff" />
+</shape>

app/src/main/res/values/strings.xml

@@ -1698,7 +1698,7 @@
     <string name="avroom_widget_messageview_091">我</string>
     <string name="avroom_widget_messageview_092"> 愛心值為 </string>
     <string name="avroom_widget_messageview_093">厲害了 </string>
-    <string name="avroom_widget_messageview_094">摘</string>
+    <string name="avroom_widget_messageview_094">獲取</string>
     <string name="avroom_widget_messageview_095">獲得 </string>
     <string name="avroom_widget_messageview_096">(僅自己可見)</string>
     <string name="avroom_widget_messageview_097">厲害了 </string>
@@ -1778,10 +1778,10 @@
     <string name="avroom_widget_roomeffectview_06">中歐氣爆棚,開出了價值 </string>
     <string name="avroom_widget_roomeffectview_07">鉆的</string>
     <string name="avroom_widget_roomeffectview_08">厲害了! </string>
-    <string name="avroom_widget_roomeffectview_09">摘</string>
+    <string name="avroom_widget_roomeffectview_09">獲取</string>
     <string name="avroom_widget_roomeffectview_010">獲得 </string>
     <string name="avroom_widget_roomeffectview_011">厲害了! </string>
-    <string name="avroom_widget_roomeffectview_012">摘</string>
+    <string name="avroom_widget_roomeffectview_012">獲取</string>
     <string name="avroom_widget_roomeffectview_013">獲得 </string>
     <string name="avroom_widget_roomeffectview_014">厲害了! </string>
     <string name="avroom_widget_roomeffectview_015"> 獲得</string>
@@ -4839,10 +4839,10 @@
     <string name="erban_shipantics_radishrankingpresenter_02">已經到底啦</string>
     <string name="treasure_box_activity_boxrankingactivity_01">今日榜單</string>
     <string name="treasure_box_activity_boxrankingactivity_02">昨日榜單</string>
-    <string name="treasure_box_activity_treasureboxactivity_01">一次性最多只能摘200次</string>
+    <string name="treasure_box_activity_treasureboxactivity_01">一次只能選擇200次</string>
     <string name="treasure_box_activity_treasureboxactivity_02">消耗 </string>
     <string name="treasure_box_activity_treasureboxactivity_03">開啟數量不能為0!</string>
-    <string name="treasure_box_activity_treasureboxactivity_04">參與活動獲得糖果</string>
+    <string name="treasure_box_activity_treasureboxactivity_04">參與活動獲得信物</string>
     <string name="treasure_box_activity_treasureboxactivity_05">去參與</string>
     <string name="treasure_box_activity_treasureboxhonouractivity_01">消耗</string>
     <string name="treasure_box_activity_treasureboxhonouractivity_02">開啟數量不能為0!</string>
@@ -4868,12 +4868,12 @@
     <string name="layout_activity_treasure_box_02">消耗 1</string>
     <string name="layout_activity_treasure_box_03"> 糖果連續摘</string>
     <string name="layout_activity_treasure_box_04">參與活動獲得</string>
-    <string name="layout_activity_treasure_box_05">糖果></string>
+    <string name="layout_activity_treasure_box_05">信物></string>
     <string name="layout_activity_treasure_box_honour_01">排行榜</string>
     <string name="layout_activity_treasure_box_honour_02">消耗10</string>
     <string name="layout_activity_treasure_box_honour_03">連續開啟</string>
     <string name="layout_dialog_box_more_01">更多</string>
-    <string name="layout_dialog_box_more_02">參與活動獲得糖果</string>
+    <string name="layout_dialog_box_more_02">參與活動獲得信物</string>
     <string name="layout_dialog_box_more_03">獲獎記錄</string>
     <string name="layout_dialog_box_more_04">玩法規則</string>
     <string name="layout_dialog_box_more_05">允許中獎消息對外展示</string>

app/src/module_labour_union/res/layout/activity_vip_main.xml

@@ -104,27 +104,16 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tv_not_open" />
 
-            <View
-                android:id="@+id/view_per"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_marginTop="25dp"
-                android:background="@drawable/bg_vip_main_per"
-                app:layout_constraintDimensionRatio="624:48"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="@id/view_bottom" />
-
             <TextView
                 android:id="@+id/tv_auth_num"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
+                android:layout_marginTop="@dimen/dp_50"
                 android:textColor="#ffffe7cf"
-                android:textSize="14dp"
+                android:textSize="@dimen/sp_14"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/view_per"
+                app:layout_constraintTop_toTopOf="@+id/view_bottom"
                 tools:text="3/12" />
 
             <androidx.recyclerview.widget.RecyclerView

app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxActivity.java

@@ -106,8 +106,6 @@ public class TreasureBoxActivity extends BaseBindingActivity<ActivityTreasureBox
                     mBinding.editNum.setText("200");
                     mBinding.editNum.setSelection(3);
                     SingleToastUtil.showToast(ResUtil.getString(R.string.treasure_box_activity_treasureboxactivity_01));
-                } else {
-                    mBinding.tvContinuousNum.setText(ResUtil.getString(R.string.treasure_box_activity_treasureboxactivity_02) + num);
                 }
             }
         });
@@ -155,9 +153,6 @@ 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;
         }
@@ -190,7 +185,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)

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

@@ -29,32 +29,44 @@
             app:layout_constraintTop_toTopOf="parent" />
 
         <ImageView
-            android:id="@+id/iv_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:onClick="@{click}"
-            android:src="@drawable/treasure_box_title_normal"
-            app:layout_constraintBottom_toTopOf="@id/view_bg"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/view_bg" />
-
-        <TextView
             android:id="@+id/tv_rank"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="15dp"
             android:layout_marginTop="35dp"
-            android:drawableStart="@drawable/treasure_box_rank"
+            android:src="@drawable/treasure_box_rank"
-            android:drawablePadding="5dp"
-            android:gravity="center"
             android:onClick="@{click}"
-            android:text="@string/layout_activity_treasure_box_01"
-            android:textColor="@color/white"
-            android:textSize="13sp"
             app:layout_constraintStart_toStartOf="@id/view_bg"
             app:layout_constraintTop_toTopOf="@id/view_bg" />
 
+        <ImageView
+            android:id="@+id/iv_box_meteor"
+            android:src="@drawable/treasure_box_meteor"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="35dp"
+            app:layout_constraintStart_toStartOf="@+id/view_bg"
+            app:layout_constraintEnd_toEndOf="@+id/view_bg"
+            app:layout_constraintTop_toTopOf="@+id/view_bg"/>
+
+        <TextView
+            android:id="@+id/tv_key_num"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:textColor="@color/white"
+            android:textSize="@dimen/sp_12"
+            android:background="@drawable/bg_1affff_r8"
+            android:layout_marginTop="-6dp"
+            android:paddingStart="@dimen/dp_8"
+            android:paddingEnd="@dimen/dp_8"
+            android:paddingTop="@dimen/dp_2"
+            android:paddingBottom="@dimen/dp_2"
+            app:layout_constraintEnd_toEndOf="@id/view_bg"
+            app:layout_constraintStart_toStartOf="@id/view_bg"
+            app:layout_constraintTop_toBottomOf="@+id/iv_box_meteor"
+            tools:text="200" />
+
         <ImageView
             android:id="@+id/iv_more"
             android:layout_width="wrap_content"
@@ -82,30 +94,16 @@
             app:layout_constraintTop_toBottomOf="@id/iv_more"
             tools:text="200" />
 
-        <TextView
-            android:id="@+id/tv_key_num"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:drawableTop="@drawable/treasure_box_meteor"
-            android:gravity="center"
-            android:textColor="@color/white"
-            android:textSize="11sp"
-            app:layout_constraintEnd_toEndOf="@id/iv_more"
-            app:layout_constraintStart_toStartOf="@id/iv_more"
-            app:layout_constraintTop_toBottomOf="@id/tv_diamond_num"
-            tools:text="200" />
-
         <ImageView
             android:id="@+id/iv_first_box"
-            android:layout_width="0dp"
+            android:layout_width="285dp"
             android:layout_height="0dp"
             android:scaleType="fitXY"
             android:src="@drawable/ic_box_temp"
-            app:layout_constraintBottom_toBottomOf="@id/iv_box"
+            app:layout_constraintBottom_toBottomOf="@+id/view_bg"
-            app:layout_constraintEnd_toEndOf="@id/iv_box"
+            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@id/iv_box"
+            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/iv_box" />
+            app:layout_constraintTop_toBottomOf="@+id/tv_rank" />
 
         <com.opensource.svgaplayer.SVGAImageView
             android:id="@+id/iv_box"
@@ -115,6 +113,7 @@
             android:layout_marginTop="52dp"
             android:onClick="@{click}"
             app:autoPlay="true"
+            android:visibility="invisible"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/view_bg"
@@ -145,48 +144,27 @@
             app:layout_constraintStart_toStartOf="@id/iv_box"
             app:layout_constraintTop_toTopOf="@id/iv_box" />
 
-        <TextView
+        <LinearLayout
-            android:id="@+id/tv_continuous_num"
+            android:orientation="horizontal"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="@dimen/dp_30"
-            android:gravity="center"
+            android:layout_marginTop="5dp"
-            android:text="@string/layout_activity_treasure_box_02"
+            android:gravity="center_vertical"
-            android:textColor="@color/white"
+            android:background="@drawable/ic_add_num_bg"
-            android:textSize="11sp"
+            app:layout_constraintStart_toStartOf="@+id/view_bg"
-            app:layout_constraintBottom_toBottomOf="@id/tv_continuous_open"
+            app:layout_constraintEnd_toEndOf="@+id/view_bg"
-            app:layout_constraintEnd_toStartOf="@id/tv_continuous_open"
+            app:layout_constraintTop_toBottomOf="@id/iv_box">
-            app:layout_constraintHorizontal_chainStyle="packed"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/tv_continuous_open" />
-
-        <TextView
-            android:id="@+id/tv_continuous_open"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
-            android:gravity="center"
-            android:text="@string/layout_activity_treasure_box_03"
-            android:textColor="@color/white"
-            android:textSize="11sp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/tv_continuous_num"
-            app:layout_constraintTop_toBottomOf="@id/iv_box" />
 
             <ImageView
                 android:id="@+id/iv_sub"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
                 android:onClick="@{click}"
-            android:src="@drawable/treasure_box_sub_normal"
+                android:src="@drawable/treasure_box_sub_normal" />
-            app:layout_constraintEnd_toStartOf="@id/edit_num"
-            app:layout_constraintHorizontal_chainStyle="packed"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_continuous_open" />
 
             <EditText
                 android:id="@+id/edit_num"
-            android:layout_width="wrap_content"
+                android:layout_width="62dp"
                 android:layout_height="23dp"
                 android:background="@null"
                 android:gravity="center"
@@ -195,21 +173,16 @@
                 android:minWidth="40dp"
                 android:text="1"
                 android:textColor="@color/white"
-            android:textSize="13sp"
+                android:textSize="@dimen/sp_12" />
-            app:layout_constraintBottom_toBottomOf="@id/iv_sub"
-            app:layout_constraintEnd_toStartOf="@id/iv_add"
-            app:layout_constraintStart_toEndOf="@id/iv_sub"
-            app:layout_constraintTop_toTopOf="@id/iv_sub" />
 
             <ImageView
                 android:id="@+id/iv_add"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:onClick="@{click}"
-            android:src="@drawable/treasure_box_add_normal"
+                android:src="@drawable/treasure_box_add_normal" />
-            app:layout_constraintEnd_toEndOf="parent"
+
-            app:layout_constraintStart_toEndOf="@id/edit_num"
+        </LinearLayout>
-            app:layout_constraintTop_toTopOf="@id/iv_sub" />
 
         <ImageView
             android:id="@+id/iv_open"
@@ -232,7 +205,7 @@
             android:layout_marginStart="7dp"
             android:gravity="bottom"
             android:orientation="vertical"
-            app:layout_constraintBottom_toTopOf="@id/tv_continuous_num"
+            app:layout_constraintTop_toBottomOf="@id/iv_box"
             app:layout_constraintStart_toStartOf="@id/view_bg" />
 
         <com.opensource.svgaplayer.SVGAImageView
@@ -251,36 +224,5 @@
             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:onClick="@{click}"
-            android:orientation="horizontal"
-            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="@string/layout_activity_treasure_box_04"
-                android:textColor="#ffffffff"
-                android:textSize="13sp" />
-
-            <ImageView
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                android:src="@drawable/treasure_box_meteor" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/layout_activity_treasure_box_05"
-                android:textColor="@color/white"
-                android:textSize="13sp" />
-        </LinearLayout>
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>

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

@@ -33,14 +33,14 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
-            <ImageView
+<!--            <ImageView-->
-                android:id="@+id/iv_title"
+<!--                android:id="@+id/iv_title"-->
-                android:layout_width="100dp"
+<!--                android:layout_width="100dp"-->
-                android:layout_height="27dp"
+<!--                android:layout_height="27dp"-->
-                android:src="@drawable/treasure_box_title_normal"
+<!--                android:src="@drawable/treasure_box_title_normal"-->
-                app:layout_constraintEnd_toEndOf="parent"
+<!--                app:layout_constraintEnd_toEndOf="parent"-->
-                app:layout_constraintStart_toStartOf="parent"
+<!--                app:layout_constraintStart_toStartOf="parent"-->
-                app:layout_constraintTop_toTopOf="parent" />
+<!--                app:layout_constraintTop_toTopOf="parent" />-->
 
             <com.opensource.svgaplayer.SVGAImageView
                 android:layout_width="0dp"
@@ -52,7 +52,7 @@
                 app:layout_constraintDimensionRatio="1:1"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/iv_title" />
+                app:layout_constraintTop_toTopOf="parent" />
 
             <TextView
                 android:id="@+id/iv_open"