diff --git a/.idea/misc.xml b/.idea/misc.xml
index 10f2221..556ce81 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -14,6 +14,8 @@
+
+
@@ -61,6 +63,7 @@
+
@@ -89,6 +92,7 @@
+
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 10f2221..556ce81 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -14,6 +14,8 @@
+
+
@@ -61,6 +63,7 @@
+
@@ -89,6 +92,7 @@
+
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 33ad3a1..2c8ecf6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -63,6 +63,7 @@
+
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 10f2221..556ce81 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -14,6 +14,8 @@
+
+
@@ -61,6 +63,7 @@
+
@@ -89,6 +92,7 @@
+
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 33ad3a1..2c8ecf6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -63,6 +63,7 @@
+
diff --git a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java
index e88d60e..7b754b4 100644
--- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java
+++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java
@@ -37,7 +37,7 @@
@Override
protected void initData() {
AnalysisRecycleAdapter adapter = new AnalysisRecycleAdapter(this);
- viewBinding.analysisRecyclerView.setLayoutManager(new GridLayoutManager(this, 3));
+ viewBinding.analysisRecyclerView.setLayoutManager(new GridLayoutManager(this, 2));
viewBinding.analysisRecyclerView.setAdapter(adapter);
adapter.setOnGridItemClickListener(new AnalysisRecycleAdapter.OnGridItemClickListener() {
@Override
@@ -62,7 +62,8 @@
ToastHelper.showToast("处理统计", ToastHelper.INFO);
break;
case 5:
- ToastHelper.showToast("趋势分析", ToastHelper.INFO);
+ intent.setClass(context, TrendAnalysisActivity.class);
+ startActivity(intent);
break;
}
}
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 10f2221..556ce81 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -14,6 +14,8 @@
+
+
@@ -61,6 +63,7 @@
+
@@ -89,6 +92,7 @@
+
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 33ad3a1..2c8ecf6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -63,6 +63,7 @@
+
diff --git a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java
index e88d60e..7b754b4 100644
--- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java
+++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java
@@ -37,7 +37,7 @@
@Override
protected void initData() {
AnalysisRecycleAdapter adapter = new AnalysisRecycleAdapter(this);
- viewBinding.analysisRecyclerView.setLayoutManager(new GridLayoutManager(this, 3));
+ viewBinding.analysisRecyclerView.setLayoutManager(new GridLayoutManager(this, 2));
viewBinding.analysisRecyclerView.setAdapter(adapter);
adapter.setOnGridItemClickListener(new AnalysisRecycleAdapter.OnGridItemClickListener() {
@Override
@@ -62,7 +62,8 @@
ToastHelper.showToast("处理统计", ToastHelper.INFO);
break;
case 5:
- ToastHelper.showToast("趋势分析", ToastHelper.INFO);
+ intent.setClass(context, TrendAnalysisActivity.class);
+ startActivity(intent);
break;
}
}
diff --git a/app/src/main/java/com/casic/dcms/ui/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/ui/TrendAnalysisActivity.java
new file mode 100644
index 0000000..be93501
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/ui/TrendAnalysisActivity.java
@@ -0,0 +1,56 @@
+package com.casic.dcms.ui;
+
+import android.content.Context;
+import android.view.View;
+
+import androidx.core.content.ContextCompat;
+
+import com.casic.dcms.R;
+import com.casic.dcms.base.AndroidxBaseActivity;
+import com.casic.dcms.databinding.ActivityTrendAnalysisBinding;
+import com.casic.dcms.utils.Constant;
+import com.casic.dcms.utils.TimeOrDateUtil;
+import com.jzxiang.pickerview.TimePickerDialog;
+import com.jzxiang.pickerview.data.Type;
+import com.jzxiang.pickerview.listener.OnDateSetListener;
+
+public class TrendAnalysisActivity extends AndroidxBaseActivity {
+
+ private final Context context = TrendAnalysisActivity.this;
+
+ @Override
+ protected void setupTopBarLayout() {
+ viewBinding.titleBarLayout.titleView.setText("趋势分析");
+ viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish());
+ }
+
+ @Override
+ protected void initData() {
+ //默认显示当前月的分析数据
+ viewBinding.titleBarLayout.dateView.setText(TimeOrDateUtil.timestampToYearMonth(System.currentTimeMillis()));
+ }
+
+ @Override
+ protected void initEvent() {
+ viewBinding.titleBarLayout.rightImageView.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ new TimePickerDialog.Builder()
+ .setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor))
+ .setTitleStringId("选择日期")
+ .setWheelItemTextSize(16)
+ .setCyclic(false)
+ .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS)
+ .setMaxMillseconds(System.currentTimeMillis())
+ .setType(Type.YEAR_MONTH)
+ .setCallBack(new OnDateSetListener() {
+ @Override
+ public void onDateSet(TimePickerDialog timePickerView, long millSeconds) {
+ String date = TimeOrDateUtil.timestampToYearMonth(millSeconds);
+ viewBinding.titleBarLayout.dateView.setText(date);
+ }
+ }).build().show(getSupportFragmentManager(), "year_month");
+ }
+ });
+ }
+}
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 10f2221..556ce81 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -14,6 +14,8 @@
+
+
@@ -61,6 +63,7 @@
+
@@ -89,6 +92,7 @@
+
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 33ad3a1..2c8ecf6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -63,6 +63,7 @@
+
diff --git a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java
index e88d60e..7b754b4 100644
--- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java
+++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java
@@ -37,7 +37,7 @@
@Override
protected void initData() {
AnalysisRecycleAdapter adapter = new AnalysisRecycleAdapter(this);
- viewBinding.analysisRecyclerView.setLayoutManager(new GridLayoutManager(this, 3));
+ viewBinding.analysisRecyclerView.setLayoutManager(new GridLayoutManager(this, 2));
viewBinding.analysisRecyclerView.setAdapter(adapter);
adapter.setOnGridItemClickListener(new AnalysisRecycleAdapter.OnGridItemClickListener() {
@Override
@@ -62,7 +62,8 @@
ToastHelper.showToast("处理统计", ToastHelper.INFO);
break;
case 5:
- ToastHelper.showToast("趋势分析", ToastHelper.INFO);
+ intent.setClass(context, TrendAnalysisActivity.class);
+ startActivity(intent);
break;
}
}
diff --git a/app/src/main/java/com/casic/dcms/ui/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/ui/TrendAnalysisActivity.java
new file mode 100644
index 0000000..be93501
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/ui/TrendAnalysisActivity.java
@@ -0,0 +1,56 @@
+package com.casic.dcms.ui;
+
+import android.content.Context;
+import android.view.View;
+
+import androidx.core.content.ContextCompat;
+
+import com.casic.dcms.R;
+import com.casic.dcms.base.AndroidxBaseActivity;
+import com.casic.dcms.databinding.ActivityTrendAnalysisBinding;
+import com.casic.dcms.utils.Constant;
+import com.casic.dcms.utils.TimeOrDateUtil;
+import com.jzxiang.pickerview.TimePickerDialog;
+import com.jzxiang.pickerview.data.Type;
+import com.jzxiang.pickerview.listener.OnDateSetListener;
+
+public class TrendAnalysisActivity extends AndroidxBaseActivity {
+
+ private final Context context = TrendAnalysisActivity.this;
+
+ @Override
+ protected void setupTopBarLayout() {
+ viewBinding.titleBarLayout.titleView.setText("趋势分析");
+ viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish());
+ }
+
+ @Override
+ protected void initData() {
+ //默认显示当前月的分析数据
+ viewBinding.titleBarLayout.dateView.setText(TimeOrDateUtil.timestampToYearMonth(System.currentTimeMillis()));
+ }
+
+ @Override
+ protected void initEvent() {
+ viewBinding.titleBarLayout.rightImageView.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ new TimePickerDialog.Builder()
+ .setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor))
+ .setTitleStringId("选择日期")
+ .setWheelItemTextSize(16)
+ .setCyclic(false)
+ .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS)
+ .setMaxMillseconds(System.currentTimeMillis())
+ .setType(Type.YEAR_MONTH)
+ .setCallBack(new OnDateSetListener() {
+ @Override
+ public void onDateSet(TimePickerDialog timePickerView, long millSeconds) {
+ String date = TimeOrDateUtil.timestampToYearMonth(millSeconds);
+ viewBinding.titleBarLayout.dateView.setText(date);
+ }
+ }).build().show(getSupportFragmentManager(), "year_month");
+ }
+ });
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java
index cac9edf..9f42cde 100644
--- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java
+++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java
@@ -11,44 +11,53 @@
**/
public class TimeOrDateUtil {
private static final String TAG = "TimeOrDateUtil";
- private static final SimpleDateFormat allDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA);
- private static final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA);
- private static final SimpleDateFormat timeFormat = new SimpleDateFormat("HH:mm:ss", Locale.CHINA);
- private static final SimpleDateFormat minuteFormat = new SimpleDateFormat("HH:mm", Locale.CHINA);
- private static final SimpleDateFormat secondsFormat = new SimpleDateFormat("mm:ss", Locale.CHINA);
+ private static SimpleDateFormat dateFormat;
/**
- * 时间戳转完整日期时间
+ * 时间戳转年月日时分秒
*/
public static String timestampToCompleteDate(long millSeconds) {
- return allDateFormat.format(new Date(millSeconds));
- }
-
- /**
- * 时间戳转日期
- */
- public static String timestampToDate(long millSeconds) {
+ dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA);
return dateFormat.format(new Date(millSeconds));
}
/**
- * 时间戳转时间
+ * 时间戳转年月日
+ */
+ public static String timestampToDate(long millSeconds) {
+ dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA);
+ return dateFormat.format(new Date(millSeconds));
+ }
+
+ /**
+ * 时间戳转年月
+ */
+ public static String timestampToYearMonth(long millSeconds) {
+ dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA);
+ return dateFormat.format(new Date(millSeconds));
+ }
+
+ /**
+ * 时间戳转时分秒
*/
public static String timestampToTime(long millSeconds) {
- return timeFormat.format(new Date(millSeconds));
+ dateFormat = new SimpleDateFormat("HH:mm:ss", Locale.CHINA);
+ return dateFormat.format(new Date(millSeconds));
}
/**
* 时间戳转时分
*/
public static String minuteToTime(long millSeconds) {
- return minuteFormat.format(new Date(millSeconds));
+ dateFormat = new SimpleDateFormat("HH:mm", Locale.CHINA);
+ return dateFormat.format(new Date(millSeconds));
}
/**
* 时间戳转分秒
*/
public static String millsToTime(long millSeconds) {
- return secondsFormat.format(new Date(millSeconds));
+ dateFormat = new SimpleDateFormat("mm:ss", Locale.CHINA);
+ return dateFormat.format(new Date(millSeconds));
}
}
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 10f2221..556ce81 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -14,6 +14,8 @@
+
+
@@ -61,6 +63,7 @@
+
@@ -89,6 +92,7 @@
+
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 33ad3a1..2c8ecf6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -63,6 +63,7 @@
+
diff --git a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java
index e88d60e..7b754b4 100644
--- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java
+++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java
@@ -37,7 +37,7 @@
@Override
protected void initData() {
AnalysisRecycleAdapter adapter = new AnalysisRecycleAdapter(this);
- viewBinding.analysisRecyclerView.setLayoutManager(new GridLayoutManager(this, 3));
+ viewBinding.analysisRecyclerView.setLayoutManager(new GridLayoutManager(this, 2));
viewBinding.analysisRecyclerView.setAdapter(adapter);
adapter.setOnGridItemClickListener(new AnalysisRecycleAdapter.OnGridItemClickListener() {
@Override
@@ -62,7 +62,8 @@
ToastHelper.showToast("处理统计", ToastHelper.INFO);
break;
case 5:
- ToastHelper.showToast("趋势分析", ToastHelper.INFO);
+ intent.setClass(context, TrendAnalysisActivity.class);
+ startActivity(intent);
break;
}
}
diff --git a/app/src/main/java/com/casic/dcms/ui/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/ui/TrendAnalysisActivity.java
new file mode 100644
index 0000000..be93501
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/ui/TrendAnalysisActivity.java
@@ -0,0 +1,56 @@
+package com.casic.dcms.ui;
+
+import android.content.Context;
+import android.view.View;
+
+import androidx.core.content.ContextCompat;
+
+import com.casic.dcms.R;
+import com.casic.dcms.base.AndroidxBaseActivity;
+import com.casic.dcms.databinding.ActivityTrendAnalysisBinding;
+import com.casic.dcms.utils.Constant;
+import com.casic.dcms.utils.TimeOrDateUtil;
+import com.jzxiang.pickerview.TimePickerDialog;
+import com.jzxiang.pickerview.data.Type;
+import com.jzxiang.pickerview.listener.OnDateSetListener;
+
+public class TrendAnalysisActivity extends AndroidxBaseActivity {
+
+ private final Context context = TrendAnalysisActivity.this;
+
+ @Override
+ protected void setupTopBarLayout() {
+ viewBinding.titleBarLayout.titleView.setText("趋势分析");
+ viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish());
+ }
+
+ @Override
+ protected void initData() {
+ //默认显示当前月的分析数据
+ viewBinding.titleBarLayout.dateView.setText(TimeOrDateUtil.timestampToYearMonth(System.currentTimeMillis()));
+ }
+
+ @Override
+ protected void initEvent() {
+ viewBinding.titleBarLayout.rightImageView.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ new TimePickerDialog.Builder()
+ .setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor))
+ .setTitleStringId("选择日期")
+ .setWheelItemTextSize(16)
+ .setCyclic(false)
+ .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS)
+ .setMaxMillseconds(System.currentTimeMillis())
+ .setType(Type.YEAR_MONTH)
+ .setCallBack(new OnDateSetListener() {
+ @Override
+ public void onDateSet(TimePickerDialog timePickerView, long millSeconds) {
+ String date = TimeOrDateUtil.timestampToYearMonth(millSeconds);
+ viewBinding.titleBarLayout.dateView.setText(date);
+ }
+ }).build().show(getSupportFragmentManager(), "year_month");
+ }
+ });
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java
index cac9edf..9f42cde 100644
--- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java
+++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java
@@ -11,44 +11,53 @@
**/
public class TimeOrDateUtil {
private static final String TAG = "TimeOrDateUtil";
- private static final SimpleDateFormat allDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA);
- private static final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA);
- private static final SimpleDateFormat timeFormat = new SimpleDateFormat("HH:mm:ss", Locale.CHINA);
- private static final SimpleDateFormat minuteFormat = new SimpleDateFormat("HH:mm", Locale.CHINA);
- private static final SimpleDateFormat secondsFormat = new SimpleDateFormat("mm:ss", Locale.CHINA);
+ private static SimpleDateFormat dateFormat;
/**
- * 时间戳转完整日期时间
+ * 时间戳转年月日时分秒
*/
public static String timestampToCompleteDate(long millSeconds) {
- return allDateFormat.format(new Date(millSeconds));
- }
-
- /**
- * 时间戳转日期
- */
- public static String timestampToDate(long millSeconds) {
+ dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA);
return dateFormat.format(new Date(millSeconds));
}
/**
- * 时间戳转时间
+ * 时间戳转年月日
+ */
+ public static String timestampToDate(long millSeconds) {
+ dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA);
+ return dateFormat.format(new Date(millSeconds));
+ }
+
+ /**
+ * 时间戳转年月
+ */
+ public static String timestampToYearMonth(long millSeconds) {
+ dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA);
+ return dateFormat.format(new Date(millSeconds));
+ }
+
+ /**
+ * 时间戳转时分秒
*/
public static String timestampToTime(long millSeconds) {
- return timeFormat.format(new Date(millSeconds));
+ dateFormat = new SimpleDateFormat("HH:mm:ss", Locale.CHINA);
+ return dateFormat.format(new Date(millSeconds));
}
/**
* 时间戳转时分
*/
public static String minuteToTime(long millSeconds) {
- return minuteFormat.format(new Date(millSeconds));
+ dateFormat = new SimpleDateFormat("HH:mm", Locale.CHINA);
+ return dateFormat.format(new Date(millSeconds));
}
/**
* 时间戳转分秒
*/
public static String millsToTime(long millSeconds) {
- return secondsFormat.format(new Date(millSeconds));
+ dateFormat = new SimpleDateFormat("mm:ss", Locale.CHINA);
+ return dateFormat.format(new Date(millSeconds));
}
}
diff --git a/app/src/main/res/drawable/ic_calendar.xml b/app/src/main/res/drawable/ic_calendar.xml
index cf9e005..91cb19b 100644
--- a/app/src/main/res/drawable/ic_calendar.xml
+++ b/app/src/main/res/drawable/ic_calendar.xml
@@ -3,10 +3,8 @@
android:height="80px"
android:viewportWidth="1024"
android:viewportHeight="1024">
+
-
+ android:pathData="M234.67,213.33h57.71v63.98L234.67,277.33v106.67h554.67v-106.67h-55.23v-64L789.33,213.33a64,64 0,0 1,64 64v512a64,64 0,0 1,-64 64L234.67,853.33a64,64 0,0 1,-64 -64L170.67,277.33a64,64 0,0 1,64 -64zM789.33,448L234.67,448v341.33h554.67L789.33,448zM405.33,640v64h-106.67v-64h106.67zM565.33,640v64h-106.67v-64h106.67zM725.33,640v64h-106.67v-64h106.67zM405.33,512v64h-106.67v-64h106.67zM565.33,512v64h-106.67v-64h106.67zM725.33,512v64h-106.67v-64h106.67zM697.73,170.67v106.67h-64.02L633.71,170.67h64zM593.56,213.33v64l-160.62,-0.02L432.94,213.33h160.62zM396.54,170.67v106.67h-64L332.54,170.67h64z" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 10f2221..556ce81 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -14,6 +14,8 @@
+
+
@@ -61,6 +63,7 @@
+
@@ -89,6 +92,7 @@
+
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 33ad3a1..2c8ecf6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -63,6 +63,7 @@
+
diff --git a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java
index e88d60e..7b754b4 100644
--- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java
+++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java
@@ -37,7 +37,7 @@
@Override
protected void initData() {
AnalysisRecycleAdapter adapter = new AnalysisRecycleAdapter(this);
- viewBinding.analysisRecyclerView.setLayoutManager(new GridLayoutManager(this, 3));
+ viewBinding.analysisRecyclerView.setLayoutManager(new GridLayoutManager(this, 2));
viewBinding.analysisRecyclerView.setAdapter(adapter);
adapter.setOnGridItemClickListener(new AnalysisRecycleAdapter.OnGridItemClickListener() {
@Override
@@ -62,7 +62,8 @@
ToastHelper.showToast("处理统计", ToastHelper.INFO);
break;
case 5:
- ToastHelper.showToast("趋势分析", ToastHelper.INFO);
+ intent.setClass(context, TrendAnalysisActivity.class);
+ startActivity(intent);
break;
}
}
diff --git a/app/src/main/java/com/casic/dcms/ui/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/ui/TrendAnalysisActivity.java
new file mode 100644
index 0000000..be93501
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/ui/TrendAnalysisActivity.java
@@ -0,0 +1,56 @@
+package com.casic.dcms.ui;
+
+import android.content.Context;
+import android.view.View;
+
+import androidx.core.content.ContextCompat;
+
+import com.casic.dcms.R;
+import com.casic.dcms.base.AndroidxBaseActivity;
+import com.casic.dcms.databinding.ActivityTrendAnalysisBinding;
+import com.casic.dcms.utils.Constant;
+import com.casic.dcms.utils.TimeOrDateUtil;
+import com.jzxiang.pickerview.TimePickerDialog;
+import com.jzxiang.pickerview.data.Type;
+import com.jzxiang.pickerview.listener.OnDateSetListener;
+
+public class TrendAnalysisActivity extends AndroidxBaseActivity {
+
+ private final Context context = TrendAnalysisActivity.this;
+
+ @Override
+ protected void setupTopBarLayout() {
+ viewBinding.titleBarLayout.titleView.setText("趋势分析");
+ viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish());
+ }
+
+ @Override
+ protected void initData() {
+ //默认显示当前月的分析数据
+ viewBinding.titleBarLayout.dateView.setText(TimeOrDateUtil.timestampToYearMonth(System.currentTimeMillis()));
+ }
+
+ @Override
+ protected void initEvent() {
+ viewBinding.titleBarLayout.rightImageView.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ new TimePickerDialog.Builder()
+ .setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor))
+ .setTitleStringId("选择日期")
+ .setWheelItemTextSize(16)
+ .setCyclic(false)
+ .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS)
+ .setMaxMillseconds(System.currentTimeMillis())
+ .setType(Type.YEAR_MONTH)
+ .setCallBack(new OnDateSetListener() {
+ @Override
+ public void onDateSet(TimePickerDialog timePickerView, long millSeconds) {
+ String date = TimeOrDateUtil.timestampToYearMonth(millSeconds);
+ viewBinding.titleBarLayout.dateView.setText(date);
+ }
+ }).build().show(getSupportFragmentManager(), "year_month");
+ }
+ });
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java
index cac9edf..9f42cde 100644
--- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java
+++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java
@@ -11,44 +11,53 @@
**/
public class TimeOrDateUtil {
private static final String TAG = "TimeOrDateUtil";
- private static final SimpleDateFormat allDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA);
- private static final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA);
- private static final SimpleDateFormat timeFormat = new SimpleDateFormat("HH:mm:ss", Locale.CHINA);
- private static final SimpleDateFormat minuteFormat = new SimpleDateFormat("HH:mm", Locale.CHINA);
- private static final SimpleDateFormat secondsFormat = new SimpleDateFormat("mm:ss", Locale.CHINA);
+ private static SimpleDateFormat dateFormat;
/**
- * 时间戳转完整日期时间
+ * 时间戳转年月日时分秒
*/
public static String timestampToCompleteDate(long millSeconds) {
- return allDateFormat.format(new Date(millSeconds));
- }
-
- /**
- * 时间戳转日期
- */
- public static String timestampToDate(long millSeconds) {
+ dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA);
return dateFormat.format(new Date(millSeconds));
}
/**
- * 时间戳转时间
+ * 时间戳转年月日
+ */
+ public static String timestampToDate(long millSeconds) {
+ dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA);
+ return dateFormat.format(new Date(millSeconds));
+ }
+
+ /**
+ * 时间戳转年月
+ */
+ public static String timestampToYearMonth(long millSeconds) {
+ dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA);
+ return dateFormat.format(new Date(millSeconds));
+ }
+
+ /**
+ * 时间戳转时分秒
*/
public static String timestampToTime(long millSeconds) {
- return timeFormat.format(new Date(millSeconds));
+ dateFormat = new SimpleDateFormat("HH:mm:ss", Locale.CHINA);
+ return dateFormat.format(new Date(millSeconds));
}
/**
* 时间戳转时分
*/
public static String minuteToTime(long millSeconds) {
- return minuteFormat.format(new Date(millSeconds));
+ dateFormat = new SimpleDateFormat("HH:mm", Locale.CHINA);
+ return dateFormat.format(new Date(millSeconds));
}
/**
* 时间戳转分秒
*/
public static String millsToTime(long millSeconds) {
- return secondsFormat.format(new Date(millSeconds));
+ dateFormat = new SimpleDateFormat("mm:ss", Locale.CHINA);
+ return dateFormat.format(new Date(millSeconds));
}
}
diff --git a/app/src/main/res/drawable/ic_calendar.xml b/app/src/main/res/drawable/ic_calendar.xml
index cf9e005..91cb19b 100644
--- a/app/src/main/res/drawable/ic_calendar.xml
+++ b/app/src/main/res/drawable/ic_calendar.xml
@@ -3,10 +3,8 @@
android:height="80px"
android:viewportWidth="1024"
android:viewportHeight="1024">
+
-
+ android:pathData="M234.67,213.33h57.71v63.98L234.67,277.33v106.67h554.67v-106.67h-55.23v-64L789.33,213.33a64,64 0,0 1,64 64v512a64,64 0,0 1,-64 64L234.67,853.33a64,64 0,0 1,-64 -64L170.67,277.33a64,64 0,0 1,64 -64zM789.33,448L234.67,448v341.33h554.67L789.33,448zM405.33,640v64h-106.67v-64h106.67zM565.33,640v64h-106.67v-64h106.67zM725.33,640v64h-106.67v-64h106.67zM405.33,512v64h-106.67v-64h106.67zM565.33,512v64h-106.67v-64h106.67zM725.33,512v64h-106.67v-64h106.67zM697.73,170.67v106.67h-64.02L633.71,170.67h64zM593.56,213.33v64l-160.62,-0.02L432.94,213.33h160.62zM396.54,170.67v106.67h-64L332.54,170.67h64z" />
diff --git a/app/src/main/res/drawable/ic_calendar_white.xml b/app/src/main/res/drawable/ic_calendar_white.xml
new file mode 100644
index 0000000..93e5ea0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_calendar_white.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 10f2221..556ce81 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -14,6 +14,8 @@
+
+
@@ -61,6 +63,7 @@
+
@@ -89,6 +92,7 @@
+
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 33ad3a1..2c8ecf6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -63,6 +63,7 @@
+
diff --git a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java
index e88d60e..7b754b4 100644
--- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java
+++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java
@@ -37,7 +37,7 @@
@Override
protected void initData() {
AnalysisRecycleAdapter adapter = new AnalysisRecycleAdapter(this);
- viewBinding.analysisRecyclerView.setLayoutManager(new GridLayoutManager(this, 3));
+ viewBinding.analysisRecyclerView.setLayoutManager(new GridLayoutManager(this, 2));
viewBinding.analysisRecyclerView.setAdapter(adapter);
adapter.setOnGridItemClickListener(new AnalysisRecycleAdapter.OnGridItemClickListener() {
@Override
@@ -62,7 +62,8 @@
ToastHelper.showToast("处理统计", ToastHelper.INFO);
break;
case 5:
- ToastHelper.showToast("趋势分析", ToastHelper.INFO);
+ intent.setClass(context, TrendAnalysisActivity.class);
+ startActivity(intent);
break;
}
}
diff --git a/app/src/main/java/com/casic/dcms/ui/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/ui/TrendAnalysisActivity.java
new file mode 100644
index 0000000..be93501
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/ui/TrendAnalysisActivity.java
@@ -0,0 +1,56 @@
+package com.casic.dcms.ui;
+
+import android.content.Context;
+import android.view.View;
+
+import androidx.core.content.ContextCompat;
+
+import com.casic.dcms.R;
+import com.casic.dcms.base.AndroidxBaseActivity;
+import com.casic.dcms.databinding.ActivityTrendAnalysisBinding;
+import com.casic.dcms.utils.Constant;
+import com.casic.dcms.utils.TimeOrDateUtil;
+import com.jzxiang.pickerview.TimePickerDialog;
+import com.jzxiang.pickerview.data.Type;
+import com.jzxiang.pickerview.listener.OnDateSetListener;
+
+public class TrendAnalysisActivity extends AndroidxBaseActivity {
+
+ private final Context context = TrendAnalysisActivity.this;
+
+ @Override
+ protected void setupTopBarLayout() {
+ viewBinding.titleBarLayout.titleView.setText("趋势分析");
+ viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish());
+ }
+
+ @Override
+ protected void initData() {
+ //默认显示当前月的分析数据
+ viewBinding.titleBarLayout.dateView.setText(TimeOrDateUtil.timestampToYearMonth(System.currentTimeMillis()));
+ }
+
+ @Override
+ protected void initEvent() {
+ viewBinding.titleBarLayout.rightImageView.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ new TimePickerDialog.Builder()
+ .setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor))
+ .setTitleStringId("选择日期")
+ .setWheelItemTextSize(16)
+ .setCyclic(false)
+ .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS)
+ .setMaxMillseconds(System.currentTimeMillis())
+ .setType(Type.YEAR_MONTH)
+ .setCallBack(new OnDateSetListener() {
+ @Override
+ public void onDateSet(TimePickerDialog timePickerView, long millSeconds) {
+ String date = TimeOrDateUtil.timestampToYearMonth(millSeconds);
+ viewBinding.titleBarLayout.dateView.setText(date);
+ }
+ }).build().show(getSupportFragmentManager(), "year_month");
+ }
+ });
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java
index cac9edf..9f42cde 100644
--- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java
+++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java
@@ -11,44 +11,53 @@
**/
public class TimeOrDateUtil {
private static final String TAG = "TimeOrDateUtil";
- private static final SimpleDateFormat allDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA);
- private static final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA);
- private static final SimpleDateFormat timeFormat = new SimpleDateFormat("HH:mm:ss", Locale.CHINA);
- private static final SimpleDateFormat minuteFormat = new SimpleDateFormat("HH:mm", Locale.CHINA);
- private static final SimpleDateFormat secondsFormat = new SimpleDateFormat("mm:ss", Locale.CHINA);
+ private static SimpleDateFormat dateFormat;
/**
- * 时间戳转完整日期时间
+ * 时间戳转年月日时分秒
*/
public static String timestampToCompleteDate(long millSeconds) {
- return allDateFormat.format(new Date(millSeconds));
- }
-
- /**
- * 时间戳转日期
- */
- public static String timestampToDate(long millSeconds) {
+ dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA);
return dateFormat.format(new Date(millSeconds));
}
/**
- * 时间戳转时间
+ * 时间戳转年月日
+ */
+ public static String timestampToDate(long millSeconds) {
+ dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA);
+ return dateFormat.format(new Date(millSeconds));
+ }
+
+ /**
+ * 时间戳转年月
+ */
+ public static String timestampToYearMonth(long millSeconds) {
+ dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA);
+ return dateFormat.format(new Date(millSeconds));
+ }
+
+ /**
+ * 时间戳转时分秒
*/
public static String timestampToTime(long millSeconds) {
- return timeFormat.format(new Date(millSeconds));
+ dateFormat = new SimpleDateFormat("HH:mm:ss", Locale.CHINA);
+ return dateFormat.format(new Date(millSeconds));
}
/**
* 时间戳转时分
*/
public static String minuteToTime(long millSeconds) {
- return minuteFormat.format(new Date(millSeconds));
+ dateFormat = new SimpleDateFormat("HH:mm", Locale.CHINA);
+ return dateFormat.format(new Date(millSeconds));
}
/**
* 时间戳转分秒
*/
public static String millsToTime(long millSeconds) {
- return secondsFormat.format(new Date(millSeconds));
+ dateFormat = new SimpleDateFormat("mm:ss", Locale.CHINA);
+ return dateFormat.format(new Date(millSeconds));
}
}
diff --git a/app/src/main/res/drawable/ic_calendar.xml b/app/src/main/res/drawable/ic_calendar.xml
index cf9e005..91cb19b 100644
--- a/app/src/main/res/drawable/ic_calendar.xml
+++ b/app/src/main/res/drawable/ic_calendar.xml
@@ -3,10 +3,8 @@
android:height="80px"
android:viewportWidth="1024"
android:viewportHeight="1024">
+
-
+ android:pathData="M234.67,213.33h57.71v63.98L234.67,277.33v106.67h554.67v-106.67h-55.23v-64L789.33,213.33a64,64 0,0 1,64 64v512a64,64 0,0 1,-64 64L234.67,853.33a64,64 0,0 1,-64 -64L170.67,277.33a64,64 0,0 1,64 -64zM789.33,448L234.67,448v341.33h554.67L789.33,448zM405.33,640v64h-106.67v-64h106.67zM565.33,640v64h-106.67v-64h106.67zM725.33,640v64h-106.67v-64h106.67zM405.33,512v64h-106.67v-64h106.67zM565.33,512v64h-106.67v-64h106.67zM725.33,512v64h-106.67v-64h106.67zM697.73,170.67v106.67h-64.02L633.71,170.67h64zM593.56,213.33v64l-160.62,-0.02L432.94,213.33h160.62zM396.54,170.67v106.67h-64L332.54,170.67h64z" />
diff --git a/app/src/main/res/drawable/ic_calendar_white.xml b/app/src/main/res/drawable/ic_calendar_white.xml
new file mode 100644
index 0000000..93e5ea0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_calendar_white.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/layout/activity_trend_analysis.xml b/app/src/main/res/layout/activity_trend_analysis.xml
new file mode 100644
index 0000000..d114e82
--- /dev/null
+++ b/app/src/main/res/layout/activity_trend_analysis.xml
@@ -0,0 +1,133 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 10f2221..556ce81 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -14,6 +14,8 @@
+
+
@@ -61,6 +63,7 @@
+
@@ -89,6 +92,7 @@
+
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 33ad3a1..2c8ecf6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -63,6 +63,7 @@
+
diff --git a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java
index e88d60e..7b754b4 100644
--- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java
+++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java
@@ -37,7 +37,7 @@
@Override
protected void initData() {
AnalysisRecycleAdapter adapter = new AnalysisRecycleAdapter(this);
- viewBinding.analysisRecyclerView.setLayoutManager(new GridLayoutManager(this, 3));
+ viewBinding.analysisRecyclerView.setLayoutManager(new GridLayoutManager(this, 2));
viewBinding.analysisRecyclerView.setAdapter(adapter);
adapter.setOnGridItemClickListener(new AnalysisRecycleAdapter.OnGridItemClickListener() {
@Override
@@ -62,7 +62,8 @@
ToastHelper.showToast("处理统计", ToastHelper.INFO);
break;
case 5:
- ToastHelper.showToast("趋势分析", ToastHelper.INFO);
+ intent.setClass(context, TrendAnalysisActivity.class);
+ startActivity(intent);
break;
}
}
diff --git a/app/src/main/java/com/casic/dcms/ui/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/ui/TrendAnalysisActivity.java
new file mode 100644
index 0000000..be93501
--- /dev/null
+++ b/app/src/main/java/com/casic/dcms/ui/TrendAnalysisActivity.java
@@ -0,0 +1,56 @@
+package com.casic.dcms.ui;
+
+import android.content.Context;
+import android.view.View;
+
+import androidx.core.content.ContextCompat;
+
+import com.casic.dcms.R;
+import com.casic.dcms.base.AndroidxBaseActivity;
+import com.casic.dcms.databinding.ActivityTrendAnalysisBinding;
+import com.casic.dcms.utils.Constant;
+import com.casic.dcms.utils.TimeOrDateUtil;
+import com.jzxiang.pickerview.TimePickerDialog;
+import com.jzxiang.pickerview.data.Type;
+import com.jzxiang.pickerview.listener.OnDateSetListener;
+
+public class TrendAnalysisActivity extends AndroidxBaseActivity {
+
+ private final Context context = TrendAnalysisActivity.this;
+
+ @Override
+ protected void setupTopBarLayout() {
+ viewBinding.titleBarLayout.titleView.setText("趋势分析");
+ viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish());
+ }
+
+ @Override
+ protected void initData() {
+ //默认显示当前月的分析数据
+ viewBinding.titleBarLayout.dateView.setText(TimeOrDateUtil.timestampToYearMonth(System.currentTimeMillis()));
+ }
+
+ @Override
+ protected void initEvent() {
+ viewBinding.titleBarLayout.rightImageView.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ new TimePickerDialog.Builder()
+ .setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor))
+ .setTitleStringId("选择日期")
+ .setWheelItemTextSize(16)
+ .setCyclic(false)
+ .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS)
+ .setMaxMillseconds(System.currentTimeMillis())
+ .setType(Type.YEAR_MONTH)
+ .setCallBack(new OnDateSetListener() {
+ @Override
+ public void onDateSet(TimePickerDialog timePickerView, long millSeconds) {
+ String date = TimeOrDateUtil.timestampToYearMonth(millSeconds);
+ viewBinding.titleBarLayout.dateView.setText(date);
+ }
+ }).build().show(getSupportFragmentManager(), "year_month");
+ }
+ });
+ }
+}
diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java
index cac9edf..9f42cde 100644
--- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java
+++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java
@@ -11,44 +11,53 @@
**/
public class TimeOrDateUtil {
private static final String TAG = "TimeOrDateUtil";
- private static final SimpleDateFormat allDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA);
- private static final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA);
- private static final SimpleDateFormat timeFormat = new SimpleDateFormat("HH:mm:ss", Locale.CHINA);
- private static final SimpleDateFormat minuteFormat = new SimpleDateFormat("HH:mm", Locale.CHINA);
- private static final SimpleDateFormat secondsFormat = new SimpleDateFormat("mm:ss", Locale.CHINA);
+ private static SimpleDateFormat dateFormat;
/**
- * 时间戳转完整日期时间
+ * 时间戳转年月日时分秒
*/
public static String timestampToCompleteDate(long millSeconds) {
- return allDateFormat.format(new Date(millSeconds));
- }
-
- /**
- * 时间戳转日期
- */
- public static String timestampToDate(long millSeconds) {
+ dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA);
return dateFormat.format(new Date(millSeconds));
}
/**
- * 时间戳转时间
+ * 时间戳转年月日
+ */
+ public static String timestampToDate(long millSeconds) {
+ dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA);
+ return dateFormat.format(new Date(millSeconds));
+ }
+
+ /**
+ * 时间戳转年月
+ */
+ public static String timestampToYearMonth(long millSeconds) {
+ dateFormat = new SimpleDateFormat("yyyy年MM月", Locale.CHINA);
+ return dateFormat.format(new Date(millSeconds));
+ }
+
+ /**
+ * 时间戳转时分秒
*/
public static String timestampToTime(long millSeconds) {
- return timeFormat.format(new Date(millSeconds));
+ dateFormat = new SimpleDateFormat("HH:mm:ss", Locale.CHINA);
+ return dateFormat.format(new Date(millSeconds));
}
/**
* 时间戳转时分
*/
public static String minuteToTime(long millSeconds) {
- return minuteFormat.format(new Date(millSeconds));
+ dateFormat = new SimpleDateFormat("HH:mm", Locale.CHINA);
+ return dateFormat.format(new Date(millSeconds));
}
/**
* 时间戳转分秒
*/
public static String millsToTime(long millSeconds) {
- return secondsFormat.format(new Date(millSeconds));
+ dateFormat = new SimpleDateFormat("mm:ss", Locale.CHINA);
+ return dateFormat.format(new Date(millSeconds));
}
}
diff --git a/app/src/main/res/drawable/ic_calendar.xml b/app/src/main/res/drawable/ic_calendar.xml
index cf9e005..91cb19b 100644
--- a/app/src/main/res/drawable/ic_calendar.xml
+++ b/app/src/main/res/drawable/ic_calendar.xml
@@ -3,10 +3,8 @@
android:height="80px"
android:viewportWidth="1024"
android:viewportHeight="1024">
+
-
+ android:pathData="M234.67,213.33h57.71v63.98L234.67,277.33v106.67h554.67v-106.67h-55.23v-64L789.33,213.33a64,64 0,0 1,64 64v512a64,64 0,0 1,-64 64L234.67,853.33a64,64 0,0 1,-64 -64L170.67,277.33a64,64 0,0 1,64 -64zM789.33,448L234.67,448v341.33h554.67L789.33,448zM405.33,640v64h-106.67v-64h106.67zM565.33,640v64h-106.67v-64h106.67zM725.33,640v64h-106.67v-64h106.67zM405.33,512v64h-106.67v-64h106.67zM565.33,512v64h-106.67v-64h106.67zM725.33,512v64h-106.67v-64h106.67zM697.73,170.67v106.67h-64.02L633.71,170.67h64zM593.56,213.33v64l-160.62,-0.02L432.94,213.33h160.62zM396.54,170.67v106.67h-64L332.54,170.67h64z" />
diff --git a/app/src/main/res/drawable/ic_calendar_white.xml b/app/src/main/res/drawable/ic_calendar_white.xml
new file mode 100644
index 0000000..93e5ea0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_calendar_white.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/layout/activity_trend_analysis.xml b/app/src/main/res/layout/activity_trend_analysis.xml
new file mode 100644
index 0000000..d114e82
--- /dev/null
+++ b/app/src/main/res/layout/activity_trend_analysis.xml
@@ -0,0 +1,133 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/include_option_plus_title.xml b/app/src/main/res/layout/include_option_plus_title.xml
new file mode 100644
index 0000000..d7b28b4
--- /dev/null
+++ b/app/src/main/res/layout/include_option_plus_title.xml
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file