diff --git a/.idea/misc.xml b/.idea/misc.xml index 76827e6..8d13973 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -65,7 +65,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 76827e6..8d13973 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -65,7 +65,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/ui/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/ui/TrendAnalysisActivity.java index 18a314c..ff31d30 100644 --- a/app/src/main/java/com/casic/dcms/ui/TrendAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/TrendAnalysisActivity.java @@ -63,6 +63,14 @@ initBarChart(); //案卷核实率 bindProgressAnimation(viewBinding.verifyProgressBar, 50); + //案卷核查率 + bindProgressAnimation(viewBinding.checkProgressBar, 75); + //案卷处理率 + bindProgressAnimation(viewBinding.handleProgressBar, 80); + //案卷紧急率 + bindProgressAnimation(viewBinding.urgentProgressBar, 20); + //案卷超时率 + bindProgressAnimation(viewBinding.overtimeProgressBar, 10); } private void initLineChart() { @@ -134,7 +142,7 @@ viewBinding.barChart.getLegend().setEnabled(false); //TODO 这是模拟数据 for (int i = 0; i < 3; i++) { - barEntries.add(new BarEntry(i, new Random().nextInt(300))); + barEntries.add(new BarEntry(i, new Random().nextInt(150))); } XAxis xAxis = viewBinding.barChart.getXAxis(); xAxis.setTextColor(ContextCompat.getColor(context, R.color.textColor)); diff --git a/.idea/misc.xml b/.idea/misc.xml index 76827e6..8d13973 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -65,7 +65,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/ui/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/ui/TrendAnalysisActivity.java index 18a314c..ff31d30 100644 --- a/app/src/main/java/com/casic/dcms/ui/TrendAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/TrendAnalysisActivity.java @@ -63,6 +63,14 @@ initBarChart(); //案卷核实率 bindProgressAnimation(viewBinding.verifyProgressBar, 50); + //案卷核查率 + bindProgressAnimation(viewBinding.checkProgressBar, 75); + //案卷处理率 + bindProgressAnimation(viewBinding.handleProgressBar, 80); + //案卷紧急率 + bindProgressAnimation(viewBinding.urgentProgressBar, 20); + //案卷超时率 + bindProgressAnimation(viewBinding.overtimeProgressBar, 10); } private void initLineChart() { @@ -134,7 +142,7 @@ viewBinding.barChart.getLegend().setEnabled(false); //TODO 这是模拟数据 for (int i = 0; i < 3; i++) { - barEntries.add(new BarEntry(i, new Random().nextInt(300))); + barEntries.add(new BarEntry(i, new Random().nextInt(150))); } XAxis xAxis = viewBinding.barChart.getXAxis(); xAxis.setTextColor(ContextCompat.getColor(context, R.color.textColor)); diff --git a/app/src/main/java/com/casic/dcms/widgets/CircleProgressBar.java b/app/src/main/java/com/casic/dcms/widgets/CircleProgressBar.java index 0f516bc..c9f21a7 100644 --- a/app/src/main/java/com/casic/dcms/widgets/CircleProgressBar.java +++ b/app/src/main/java/com/casic/dcms/widgets/CircleProgressBar.java @@ -57,7 +57,7 @@ backgroundPaint = new Paint(); backgroundPaint.setColor(backgroundColor); backgroundPaint.setStyle(Paint.Style.STROKE); - backgroundPaint.setStrokeWidth(QMUIDisplayHelper.dp2px(context, 10)); + backgroundPaint.setStrokeWidth(QMUIDisplayHelper.dp2px(context, 12)); backgroundPaint.setStrokeCap(Paint.Cap.ROUND);//圆头 backgroundPaint.setAntiAlias(true); @@ -65,7 +65,7 @@ foregroundPaint = new Paint(); foregroundPaint.setColor(foregroundColor); foregroundPaint.setStyle(Paint.Style.STROKE); - foregroundPaint.setStrokeWidth(QMUIDisplayHelper.dp2px(context, 10)); + foregroundPaint.setStrokeWidth(QMUIDisplayHelper.dp2px(context, 12)); foregroundPaint.setStrokeCap(Paint.Cap.ROUND);//圆头 foregroundPaint.setAntiAlias(true); diff --git a/.idea/misc.xml b/.idea/misc.xml index 76827e6..8d13973 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -65,7 +65,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/ui/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/ui/TrendAnalysisActivity.java index 18a314c..ff31d30 100644 --- a/app/src/main/java/com/casic/dcms/ui/TrendAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/TrendAnalysisActivity.java @@ -63,6 +63,14 @@ initBarChart(); //案卷核实率 bindProgressAnimation(viewBinding.verifyProgressBar, 50); + //案卷核查率 + bindProgressAnimation(viewBinding.checkProgressBar, 75); + //案卷处理率 + bindProgressAnimation(viewBinding.handleProgressBar, 80); + //案卷紧急率 + bindProgressAnimation(viewBinding.urgentProgressBar, 20); + //案卷超时率 + bindProgressAnimation(viewBinding.overtimeProgressBar, 10); } private void initLineChart() { @@ -134,7 +142,7 @@ viewBinding.barChart.getLegend().setEnabled(false); //TODO 这是模拟数据 for (int i = 0; i < 3; i++) { - barEntries.add(new BarEntry(i, new Random().nextInt(300))); + barEntries.add(new BarEntry(i, new Random().nextInt(150))); } XAxis xAxis = viewBinding.barChart.getXAxis(); xAxis.setTextColor(ContextCompat.getColor(context, R.color.textColor)); diff --git a/app/src/main/java/com/casic/dcms/widgets/CircleProgressBar.java b/app/src/main/java/com/casic/dcms/widgets/CircleProgressBar.java index 0f516bc..c9f21a7 100644 --- a/app/src/main/java/com/casic/dcms/widgets/CircleProgressBar.java +++ b/app/src/main/java/com/casic/dcms/widgets/CircleProgressBar.java @@ -57,7 +57,7 @@ backgroundPaint = new Paint(); backgroundPaint.setColor(backgroundColor); backgroundPaint.setStyle(Paint.Style.STROKE); - backgroundPaint.setStrokeWidth(QMUIDisplayHelper.dp2px(context, 10)); + backgroundPaint.setStrokeWidth(QMUIDisplayHelper.dp2px(context, 12)); backgroundPaint.setStrokeCap(Paint.Cap.ROUND);//圆头 backgroundPaint.setAntiAlias(true); @@ -65,7 +65,7 @@ foregroundPaint = new Paint(); foregroundPaint.setColor(foregroundColor); foregroundPaint.setStyle(Paint.Style.STROKE); - foregroundPaint.setStrokeWidth(QMUIDisplayHelper.dp2px(context, 10)); + foregroundPaint.setStrokeWidth(QMUIDisplayHelper.dp2px(context, 12)); foregroundPaint.setStrokeCap(Paint.Cap.ROUND);//圆头 foregroundPaint.setAntiAlias(true); diff --git a/app/src/main/res/layout/activity_trend_analysis.xml b/app/src/main/res/layout/activity_trend_analysis.xml index cde61b5..0bf1512 100644 --- a/app/src/main/res/layout/activity_trend_analysis.xml +++ b/app/src/main/res/layout/activity_trend_analysis.xml @@ -227,6 +227,212 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file