修复混淆后greendao无法初始化的bug;

添加打卡今日与明日的显示

app/proguard-rules.pro

@@ -151,6 +151,7 @@
 -keep class com.kfzs.duanduan.bean.** { *; }
 -keep class com.kfzs.duanduan.proto.** { *; }
 -keep class com.sheep.gamegroup.model.** { *; }
+-keep class com.sheep.gamegroup.greendao.** { *; }
 -keep class com.jcodecraeer.** { *; }
 -keep class com.sheep.jiuyan.samllsheep.service.DownloadService { *; }
 

app/src/main/java/com/sheep/gamegroup/model/entity/PunchAndSign.java

@@ -2,6 +2,7 @@ package com.sheep.gamegroup.model.entity;
 
 import com.kfzs.duanduan.utils.NumberFormatUtils;
 
+import java.util.Calendar;
 import java.util.List;
 
 /**
@@ -12,10 +13,11 @@ import java.util.List;
 public class PunchAndSign {
     //        {"sign_up_count":3,"punch_count":1,total_award:1}
     private long countdown;
+    private long dataTimes;
     private String sign_up_count;
     private String punch_count;
     private String total_award;
-    private List<PunchUser> avatar ;
+    private List<PunchUser> avatar;
 
     public String getSign_up_count() {
         return sign_up_count;
@@ -57,10 +59,25 @@ public class PunchAndSign {
         this.countdown = countdown;
     }
 
+    public long getDataTimes() {
+        return dataTimes;
+    }
 
+    public void setDataTimes(long dataTimes) {
+        this.dataTimes = dataTimes;
+    }
 
 
+    //获取未打卡次数
     public String getNoPunch_count() {
         return Integer.toString(NumberFormatUtils.parseInteger(total_award) - NumberFormatUtils.parseInteger(punch_count));
     }
+
+    //获取今日或者昨日
+    public String getDayText() {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTimeInMillis(dataTimes * 1000);
+        int hour = calendar.get(Calendar.HOUR_OF_DAY);
+        return hour >= 0 && hour < 9 ? "昨日" : "今日";
+    }
 }

app/src/main/java/com/sheep/gamegroup/view/activity/ActSignCard.java

@@ -65,6 +65,10 @@ public class ActSignCard extends BaseActivity {
     TextView sign_card_award;
     @BindView(R.id.sign_card_join)
     TextView sign_card_join;
+    @BindView(R.id.sign_card_title1)
+    TextView sign_card_title1;
+    @BindView(R.id.sign_card_title2)
+    TextView sign_card_title2;
     @BindView(R.id.sign_card_users)
     RecyclerView sign_card_users;
     @BindView(R.id.sign_card_super_users)
@@ -250,6 +254,8 @@ public class ActSignCard extends BaseActivity {
                         ViewUtil.setText(sign_card_success_people, punchAndSign.getPunch_count());
                         ViewUtil.setText(sign_card_fail_people, punchAndSign.getNoPunch_count());
                         ViewUtil.setText(sign_card_award, punchAndSign.getTotal_award());
+                        ViewUtil.setText(sign_card_title1, String.format(Locale.CHINA, "%s战况", punchAndSign.getDayText()));
+                        ViewUtil.setText(sign_card_title2, String.format(Locale.CHINA, "%s之星", punchAndSign.getDayText()));
                         initBtnState();
                     }
 

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

@@ -99,6 +99,7 @@
             </RelativeLayout>
 
             <TextView
+                android:id="@+id/sign_card_title1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
@@ -184,6 +185,7 @@
                 android:orientation="horizontal">
 
                 <TextView
+                    android:id="@+id/sign_card_title2"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="1"