diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 96d26db..e5d77e8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -70,7 +70,10 @@
-
+
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 96d26db..e5d77e8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -70,7 +70,10 @@
-
+
diff --git a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java
index 77b503e..09dfc2b 100644
--- a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java
+++ b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java
@@ -2,7 +2,6 @@
import android.content.Context;
import android.view.View;
-import android.widget.ProgressBar;
import android.widget.RadioGroup;
import androidx.lifecycle.Observer;
@@ -12,19 +11,13 @@
import com.casic.dcms.databinding.ActivityTrendAnalysisBinding;
import com.casic.dcms.model.CaseTendencyBean;
import com.casic.dcms.utils.ChartViewHelper;
-import com.casic.dcms.utils.ColorHub;
import com.casic.dcms.utils.DialogHub;
-import com.casic.dcms.utils.LocaleConstant;
import com.casic.dcms.utils.TimeOrDateUtil;
import com.casic.dcms.vm.DataAnalysisViewModel;
import com.casic.dcms.widgets.RangeDateActionSheet;
import com.github.mikephil.charting.data.Entry;
import com.gyf.immersionbar.ImmersionBar;
-import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter;
-import com.pengxh.androidx.lite.adapter.ViewHolder;
import com.pengxh.androidx.lite.base.AndroidxBaseActivity;
-import com.pengxh.androidx.lite.divider.ItemDecoration;
-import com.pengxh.androidx.lite.hub.FloatHub;
import com.pengxh.androidx.lite.hub.IntHub;
import com.pengxh.androidx.lite.hub.LongHub;
import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager;
@@ -44,8 +37,12 @@
ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white));
ImmersionBar.with(this).statusBarDarkFont(true).init();
- viewBinding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(5));
- viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish());
+ viewBinding.leftBackView.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ finish();
+ }
+ });
}
@Override
@@ -70,7 +67,6 @@
public void onChanged(CaseTendencyBean caseTendencyBean) {
if (caseTendencyBean.getCode() == 200) {
List dataModels = caseTendencyBean.getData();
- int caseCount = 0;
List dates = new ArrayList<>();
List registeredEntries = new ArrayList<>();
List distributeEntries = new ArrayList<>();
@@ -79,38 +75,14 @@
for (int i = 0; i < dataModels.size(); i++) {
CaseTendencyBean.DataModel dataModel = dataModels.get(i);
- caseCount += Integer.parseInt(dataModel.getRegisteredNum());
-
dates.add(dataModel.getStatisticsTime());
registeredEntries.add(new Entry(i, Float.parseFloat(dataModel.getRegisteredNum()), "Registered"));
distributeEntries.add(new Entry(i, Float.parseFloat(dataModel.getDistributeNum()), "Distribute"));
processEntries.add(new Entry(i, Float.parseFloat(dataModel.getProcessNum()), "Process"));
closedEntries.add(new Entry(i, Float.parseFloat(dataModel.getClosedNum()), "Closed"));
}
- viewBinding.caseCountView.setText("立案数:" + caseCount);
ChartViewHelper.setLineChartData(viewBinding.lineChart, dates, registeredEntries, distributeEntries, processEntries, closedEntries);
-
- NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_alanysis_rv_l, dataModels) {
-
- @Override
- public void convertView(ViewHolder viewHolder, int position, CaseTendencyBean.DataModel item) {
- //设置随机颜色
- int[] color = ColorHub.generateColor(context);
-
- viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1))
- .setBackgroundColor(R.id.numberTagView, color[0])
- .setTextColor(R.id.numberTagView, color[1])
- .setText(R.id.caseSourceView, item.getStatisticsTime())
- .setText(R.id.caseNumView, item.getRegisteredNum());
-
- ProgressBar progressBar = viewHolder.getView(R.id.frequencyProgressBar);
- float v = Float.parseFloat(item.getClosedNum()) / Integer.parseInt(item.getRegisteredNum());
- progressBar.setProgress((int) (v * 100));
- }
- };
- viewBinding.trendAnalysisView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15)));
- viewBinding.trendAnalysisView.setAdapter(recyclerAdapter);
}
}
});
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 96d26db..e5d77e8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -70,7 +70,10 @@
-
+
diff --git a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java
index 77b503e..09dfc2b 100644
--- a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java
+++ b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java
@@ -2,7 +2,6 @@
import android.content.Context;
import android.view.View;
-import android.widget.ProgressBar;
import android.widget.RadioGroup;
import androidx.lifecycle.Observer;
@@ -12,19 +11,13 @@
import com.casic.dcms.databinding.ActivityTrendAnalysisBinding;
import com.casic.dcms.model.CaseTendencyBean;
import com.casic.dcms.utils.ChartViewHelper;
-import com.casic.dcms.utils.ColorHub;
import com.casic.dcms.utils.DialogHub;
-import com.casic.dcms.utils.LocaleConstant;
import com.casic.dcms.utils.TimeOrDateUtil;
import com.casic.dcms.vm.DataAnalysisViewModel;
import com.casic.dcms.widgets.RangeDateActionSheet;
import com.github.mikephil.charting.data.Entry;
import com.gyf.immersionbar.ImmersionBar;
-import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter;
-import com.pengxh.androidx.lite.adapter.ViewHolder;
import com.pengxh.androidx.lite.base.AndroidxBaseActivity;
-import com.pengxh.androidx.lite.divider.ItemDecoration;
-import com.pengxh.androidx.lite.hub.FloatHub;
import com.pengxh.androidx.lite.hub.IntHub;
import com.pengxh.androidx.lite.hub.LongHub;
import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager;
@@ -44,8 +37,12 @@
ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white));
ImmersionBar.with(this).statusBarDarkFont(true).init();
- viewBinding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(5));
- viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish());
+ viewBinding.leftBackView.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ finish();
+ }
+ });
}
@Override
@@ -70,7 +67,6 @@
public void onChanged(CaseTendencyBean caseTendencyBean) {
if (caseTendencyBean.getCode() == 200) {
List dataModels = caseTendencyBean.getData();
- int caseCount = 0;
List dates = new ArrayList<>();
List registeredEntries = new ArrayList<>();
List distributeEntries = new ArrayList<>();
@@ -79,38 +75,14 @@
for (int i = 0; i < dataModels.size(); i++) {
CaseTendencyBean.DataModel dataModel = dataModels.get(i);
- caseCount += Integer.parseInt(dataModel.getRegisteredNum());
-
dates.add(dataModel.getStatisticsTime());
registeredEntries.add(new Entry(i, Float.parseFloat(dataModel.getRegisteredNum()), "Registered"));
distributeEntries.add(new Entry(i, Float.parseFloat(dataModel.getDistributeNum()), "Distribute"));
processEntries.add(new Entry(i, Float.parseFloat(dataModel.getProcessNum()), "Process"));
closedEntries.add(new Entry(i, Float.parseFloat(dataModel.getClosedNum()), "Closed"));
}
- viewBinding.caseCountView.setText("立案数:" + caseCount);
ChartViewHelper.setLineChartData(viewBinding.lineChart, dates, registeredEntries, distributeEntries, processEntries, closedEntries);
-
- NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_alanysis_rv_l, dataModels) {
-
- @Override
- public void convertView(ViewHolder viewHolder, int position, CaseTendencyBean.DataModel item) {
- //设置随机颜色
- int[] color = ColorHub.generateColor(context);
-
- viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1))
- .setBackgroundColor(R.id.numberTagView, color[0])
- .setTextColor(R.id.numberTagView, color[1])
- .setText(R.id.caseSourceView, item.getStatisticsTime())
- .setText(R.id.caseNumView, item.getRegisteredNum());
-
- ProgressBar progressBar = viewHolder.getView(R.id.frequencyProgressBar);
- float v = Float.parseFloat(item.getClosedNum()) / Integer.parseInt(item.getRegisteredNum());
- progressBar.setProgress((int) (v * 100));
- }
- };
- viewBinding.trendAnalysisView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15)));
- viewBinding.trendAnalysisView.setAdapter(recyclerAdapter);
}
}
});
diff --git a/app/src/main/res/layout/activity_trend_analysis.xml b/app/src/main/res/layout/activity_trend_analysis.xml
index 53fd8c7..d5a1a4b 100644
--- a/app/src/main/res/layout/activity_trend_analysis.xml
+++ b/app/src/main/res/layout/activity_trend_analysis.xml
@@ -3,12 +3,9 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="@color/white"
android:orientation="vertical">
-
-
+
+
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 96d26db..e5d77e8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -70,7 +70,10 @@
-
+
diff --git a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java
index 77b503e..09dfc2b 100644
--- a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java
+++ b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java
@@ -2,7 +2,6 @@
import android.content.Context;
import android.view.View;
-import android.widget.ProgressBar;
import android.widget.RadioGroup;
import androidx.lifecycle.Observer;
@@ -12,19 +11,13 @@
import com.casic.dcms.databinding.ActivityTrendAnalysisBinding;
import com.casic.dcms.model.CaseTendencyBean;
import com.casic.dcms.utils.ChartViewHelper;
-import com.casic.dcms.utils.ColorHub;
import com.casic.dcms.utils.DialogHub;
-import com.casic.dcms.utils.LocaleConstant;
import com.casic.dcms.utils.TimeOrDateUtil;
import com.casic.dcms.vm.DataAnalysisViewModel;
import com.casic.dcms.widgets.RangeDateActionSheet;
import com.github.mikephil.charting.data.Entry;
import com.gyf.immersionbar.ImmersionBar;
-import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter;
-import com.pengxh.androidx.lite.adapter.ViewHolder;
import com.pengxh.androidx.lite.base.AndroidxBaseActivity;
-import com.pengxh.androidx.lite.divider.ItemDecoration;
-import com.pengxh.androidx.lite.hub.FloatHub;
import com.pengxh.androidx.lite.hub.IntHub;
import com.pengxh.androidx.lite.hub.LongHub;
import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager;
@@ -44,8 +37,12 @@
ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white));
ImmersionBar.with(this).statusBarDarkFont(true).init();
- viewBinding.titleBarLayout.titleView.setText(LocaleConstant.ANALYSIS_ITEMS.get(5));
- viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish());
+ viewBinding.leftBackView.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ finish();
+ }
+ });
}
@Override
@@ -70,7 +67,6 @@
public void onChanged(CaseTendencyBean caseTendencyBean) {
if (caseTendencyBean.getCode() == 200) {
List dataModels = caseTendencyBean.getData();
- int caseCount = 0;
List dates = new ArrayList<>();
List registeredEntries = new ArrayList<>();
List distributeEntries = new ArrayList<>();
@@ -79,38 +75,14 @@
for (int i = 0; i < dataModels.size(); i++) {
CaseTendencyBean.DataModel dataModel = dataModels.get(i);
- caseCount += Integer.parseInt(dataModel.getRegisteredNum());
-
dates.add(dataModel.getStatisticsTime());
registeredEntries.add(new Entry(i, Float.parseFloat(dataModel.getRegisteredNum()), "Registered"));
distributeEntries.add(new Entry(i, Float.parseFloat(dataModel.getDistributeNum()), "Distribute"));
processEntries.add(new Entry(i, Float.parseFloat(dataModel.getProcessNum()), "Process"));
closedEntries.add(new Entry(i, Float.parseFloat(dataModel.getClosedNum()), "Closed"));
}
- viewBinding.caseCountView.setText("立案数:" + caseCount);
ChartViewHelper.setLineChartData(viewBinding.lineChart, dates, registeredEntries, distributeEntries, processEntries, closedEntries);
-
- NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_alanysis_rv_l, dataModels) {
-
- @Override
- public void convertView(ViewHolder viewHolder, int position, CaseTendencyBean.DataModel item) {
- //设置随机颜色
- int[] color = ColorHub.generateColor(context);
-
- viewHolder.setText(R.id.numberTagView, String.valueOf(position + 1))
- .setBackgroundColor(R.id.numberTagView, color[0])
- .setTextColor(R.id.numberTagView, color[1])
- .setText(R.id.caseSourceView, item.getStatisticsTime())
- .setText(R.id.caseNumView, item.getRegisteredNum());
-
- ProgressBar progressBar = viewHolder.getView(R.id.frequencyProgressBar);
- float v = Float.parseFloat(item.getClosedNum()) / Integer.parseInt(item.getRegisteredNum());
- progressBar.setProgress((int) (v * 100));
- }
- };
- viewBinding.trendAnalysisView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15)));
- viewBinding.trendAnalysisView.setAdapter(recyclerAdapter);
}
}
});
diff --git a/app/src/main/res/layout/activity_trend_analysis.xml b/app/src/main/res/layout/activity_trend_analysis.xml
index 53fd8c7..d5a1a4b 100644
--- a/app/src/main/res/layout/activity_trend_analysis.xml
+++ b/app/src/main/res/layout/activity_trend_analysis.xml
@@ -3,12 +3,9 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="@color/white"
android:orientation="vertical">
-
-
+
+
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_alanysis_rv_l.xml b/app/src/main/res/layout/item_alanysis_rv_l.xml
deleted file mode 100644
index 9b82664..0000000
--- a/app/src/main/res/layout/item_alanysis_rv_l.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file