1.优化打卡功能

app/build.gradle

@@ -24,8 +24,8 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled true
         multiDexKeepProguard file("multidexKeep.pro")//腾讯bugly的类放到主Dex
-        versionCode 343
-        versionName "3.4.3"
+        versionCode 344
+        versionName "3.4.4"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         flavorDimensions "versionCode"
         ndk {

app/src/main/java/com/tongyu/luck/happywork/bean/ClockDayDataBean.java

@@ -6,6 +6,7 @@ public class ClockDayDataBean {
 
     private String nextMoney;
     private String currentDuration;
+    private String clockCount;
     private List<ClockDayBean> punckClockList;
 
     public String getNextMoney() {
@@ -24,6 +25,14 @@ public class ClockDayDataBean {
         this.currentDuration = currentDuration;
     }
 
+    public String getClockCount() {
+        return clockCount;
+    }
+
+    public void setClockCount(String clockCount) {
+        this.clockCount = clockCount;
+    }
+
     public List<ClockDayBean> getPunckClockList() {
         return punckClockList;
     }

app/src/main/java/com/tongyu/luck/happywork/ui/activity/cclient/clock/ClockMonthStatisticsActivity.java

@@ -125,6 +125,7 @@ public class ClockMonthStatisticsActivity extends BaseActivity<ClockMonthStatist
      */
     @Override
     public void onMonthClockData(List<ClockMonthClockDataBean> data, ClockMonthDataBean clockMonthDataBean, boolean isLastMonth) {
+        cvClockDate.clearSchemeDate();
         for (int day = 0; day < data.size(); day++) {
             ClockMonthClockDataBean item = data.get(day);
             if (!TextUtils.isEmpty(item.getStartPunchClock())) {//上班卡已打
@@ -133,7 +134,7 @@ public class ClockMonthStatisticsActivity extends BaseActivity<ClockMonthStatist
                 calendar.setMonth(clockMonthDataBean.getMonth() - (isLastMonth ? 1 : 0));
                 calendar.setDay(day + 1);
                 if (!TextUtils.isEmpty(item.getEndPunchClock())) {
-                    calendar.setSchemeColor(getResources().getColor(R.color.text_gray_bc));
+                    calendar.setSchemeColor(getResources().getColor(R.color.blue_01));
                 } else {
                     calendar.setSchemeColor(getResources().getColor(R.color.text_orange_fd));
                 }
@@ -149,7 +150,7 @@ public class ClockMonthStatisticsActivity extends BaseActivity<ClockMonthStatist
      */
     @Override
     public void onDayClockData(ClockDayDataBean data) {
-        tvRules.setText("今日打卡" + (data.getPunckClockList() == null ? 0 : data.getPunckClockList().size()) + "次，工时" + data.getCurrentDuration() + "小时");
+        tvRules.setText("今日打卡" + (TextUtils.isEmpty(data.getClockCount()) ? "0" : data.getClockCount()) + "次，工时" + data.getCurrentDuration() + "小时");
         tvMoney.setText(data.getNextMoney());
         if (data.getPunckClockList() != null && !data.getPunckClockList().isEmpty()) {//存在打卡记录
             tvNoRecord.setVisibility(View.GONE);

app/src/main/java/com/tongyu/luck/happywork/ui/activity/cclient/clock/ClockResultActivity.java

@@ -93,9 +93,11 @@ public class ClockResultActivity extends BaseActivity<ClockResultPresenter> impl
                 llClockOut.setVisibility(View.VISIBLE);
                 tvHour.setText(bean.getDuration());
                 tvDayRepay.setText(bean.getTodayMoney());
+                llMoney.setVisibility(View.VISIBLE);
             } else {//上班卡
                 tvResult.setText(R.string.clock_in_success);
                 tvTime.setText("打卡时间 " + DateUtils.getFormatStrToHHmm(bean.getStartPunchClock()));
+                llMoney.setVisibility(View.GONE);
                 tvClockIn.setVisibility(View.VISIBLE);
                 llClockOut.setVisibility(View.GONE);
             }