Merge remote-tracking branch 'origin/develop_ddcy_1.0.3' into develop_ddcy_1.0.3

app/src/main/java/com/ym/game/module/HomeInfoEntity.java

@@ -25,6 +25,24 @@ public class HomeInfoEntity {
     private int acceleratorsNum;
     private String imgUrl;
     private int plantBoxNum;
+    private int currentClockNum;//当前打卡数量
+    private int maxClockNum;//所需打卡数量
+
+    public int getCurrentClockNum() {
+        return currentClockNum;
+    }
+
+    public void setCurrentClockNum(int currentClockNum) {
+        this.currentClockNum = currentClockNum;
+    }
+
+    public int getMaxClockNum() {
+        return maxClockNum;
+    }
+
+    public void setMaxClockNum(int maxClockNum) {
+        this.maxClockNum = maxClockNum;
+    }
 
     public int getPlantBoxNum() {
         return plantBoxNum;

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

@@ -51,11 +51,10 @@
                 android:id="@+id/layout_drops_title"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="120dp"
-                android:layout_marginBottom="20dp"
                 android:gravity="center_horizontal"
                 android:orientation="vertical"
-                android:visibility="visible">
+                android:visibility="gone"
+                >
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -108,20 +107,53 @@
 
             </LinearLayout>
 
-            <FrameLayout
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/layout_drops_title"
-                android:layout_alignParentBottom="true"
+                android:layout_marginTop="120dp"
+                android:layout_marginBottom="20dp"
                 android:paddingLeft="15dp"
-                android:paddingRight="15dp">
+                android:paddingRight="15dp"
+                android:orientation="vertical">
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="明日登录可获得"
+                        android:textColor="#642D2D"
+                        android:textSize="20sp"
+                        android:textStyle="bold" />
 
+                    <TextView
+                        android:id="@+id/id_tv_reward_coin"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="100"
+                        android:textColor="#E85740"
+                        android:textSize="22sp"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="金币"
+                        android:textColor="#642D2D"
+                        android:textSize="20sp"
+                        android:textStyle="bold"
+                        />
+                </LinearLayout>
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/recycler_popup_watering"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-            </FrameLayout>
+            </LinearLayout>
 
         </RelativeLayout>