diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 265bb70e0..b0a25da19 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -622,6 +622,7 @@
ID:%d
%1$s月%2$s日
%s年
+ %s月
房间公告
请设置公告标题
diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ClanIncomeActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ClanIncomeActivity.java
index 6389d5877..8cc6fa96e 100644
--- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ClanIncomeActivity.java
+++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ClanIncomeActivity.java
@@ -25,8 +25,11 @@ import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.Commo
import com.yizhuan.xchat_android_core.statistic.StatisticManager;
import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
+import com.yizhuan.xchat_android_library.utils.CommonUtils;
+import com.yizhuan.xchat_android_library.utils.TimeUtils;
import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;
@@ -45,6 +48,7 @@ public class ClanIncomeActivity extends BaseMvpActivity tagList = new ArrayList<>();
tagList.add("每日统计");
tagList.add("每周统计");
-
+ tagList.add("每月统计");
StatisticsIndicatorAdapter adapter = new StatisticsIndicatorAdapter(tagList, 5);
adapter.setOnItemSelectListener(position -> viewPager.setCurrentItem(position));
CommonNavigator navigator = new CommonNavigator(this);
@@ -144,9 +152,11 @@ public class ClanIncomeActivity extends BaseMvpActivity tagList = new ArrayList<>();
tagList.add("每日统计");
tagList.add("每周统计");
-
+ tagList.add("每月统计");
StatisticsIndicatorAdapter adapter = new StatisticsIndicatorAdapter(tagList, 5);
adapter.setOnItemSelectListener(position -> viewPager.setCurrentItem(position));
CommonNavigator navigator = new CommonNavigator(this);
@@ -155,10 +163,14 @@ public class IncomeStatisticsActivity extends BaseMvpActivity {
private String mStartTimeStr;
private String mEndTimeStr;
+
+ private String weekFirstDay;
+ private String weekLastDay;
/**
* 周范围内选中的日期
*/
@@ -39,9 +43,11 @@ public class ClanIncomePresenter extends BaseMvpPresenter
}
//周日
long lastDayTime = firstDayTime + (TimeUtils.MILLIS_OF_A_DAY * 6);
-
- mStartTimeStr = TimeUtils.getDateTimeString(firstDayTime, TimeUtils.DATE_FORMAT);
- mEndTimeStr = TimeUtils.getDateTimeString(lastDayTime, TimeUtils.DATE_FORMAT);
+ weekFirstDay = TimeUtils.getDateTimeString(firstDayTime, TimeUtils.DATE_FORMAT);
+ weekLastDay = TimeUtils.getDateTimeString(lastDayTime, TimeUtils.DATE_FORMAT);
+ String ym = new SimpleDateFormat("yyyy-MM").format(mDay);
+ mStartTimeStr = TimeUtils.getFirstDayOfMonth(ym);
+ mEndTimeStr = TimeUtils.getLastDayOfMonth(ym);
}
public SpannableString setTotal(double total) {
@@ -108,4 +114,19 @@ public class ClanIncomePresenter extends BaseMvpPresenter
return TimeUtils.getDateTimeString(mWeekChooseDay, TimeUtils.DATE_FORMAT);
}
+ public String getWeekFirstDay() {
+ return weekFirstDay;
+ }
+
+ public void setWeekFirstDay(String weekFirstDay) {
+ this.weekFirstDay = weekFirstDay;
+ }
+
+ public String getWeekLastDay() {
+ return weekLastDay;
+ }
+
+ public void setWeekLastDay(String weekLastDay) {
+ this.weekLastDay = weekLastDay;
+ }
}
diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/IncomeStatisticsPresenter.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/IncomeStatisticsPresenter.java
index a63547bf3..870376146 100644
--- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/IncomeStatisticsPresenter.java
+++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/IncomeStatisticsPresenter.java
@@ -9,6 +9,7 @@ import com.yizhuan.xchat_android_library.utils.TimeUtils;
import java.math.BigDecimal;
import java.math.RoundingMode;
+import java.text.SimpleDateFormat;
import java.util.Calendar;
public class IncomeStatisticsPresenter extends BaseMvpPresenter {
@@ -20,6 +21,9 @@ public class IncomeStatisticsPresenter extends BaseMvpPresenter